diff options
| author | Martin Nordholts <enselic@gmail.com> | 2021-01-11 20:30:19 +0100 |
|---|---|---|
| committer | David Peter <sharkdp@users.noreply.github.com> | 2021-01-11 22:18:49 +0100 |
| commit | d36b091fd7c9050c80078c0fe286d09dbab0f45a (patch) | |
| tree | 0a53812159104a55444ab1c9b746b7c1573f6dc5 /.github | |
| parent | 3dcf02549e373adcb12a0b031e8d17bddd9e204b (diff) | |
CICD: Build: Move PKG_* vars to 'Package' step
For improved modularization of CICD script.
For #1474
Diffstat (limited to '.github')
| -rw-r--r-- | .github/workflows/CICD.yml | 24 |
1 files changed, 12 insertions, 12 deletions
diff --git a/.github/workflows/CICD.yml b/.github/workflows/CICD.yml index c1dfe088..c76653d8 100644 --- a/.github/workflows/CICD.yml +++ b/.github/workflows/CICD.yml @@ -119,12 +119,6 @@ jobs: # determine EXE suffix EXE_suffix="" ; case ${{ matrix.job.target }} in *-pc-windows-*) EXE_suffix=".exe" ;; esac; echo ::set-output name=EXE_suffix::${EXE_suffix} - # package name - PKG_suffix=".tar.gz" ; case ${{ matrix.job.target }} in *-pc-windows-*) PKG_suffix=".zip" ;; esac; - PKG_BASENAME=${PROJECT_NAME}-v${PROJECT_VERSION}-${{ matrix.job.target }} - PKG_NAME=${PKG_BASENAME}${PKG_suffix} - echo ::set-output name=PKG_BASENAME::${PKG_BASENAME} - echo ::set-output name=PKG_NAME::${PKG_NAME} unset IS_RELEASE ; if [[ $GITHUB_REF =~ ^refs/tags/v[0-9].* ]]; then IS_RELEASE='true' ; fi echo ::set-output name=IS_RELEASE::${IS_RELEASE} # target-specific options @@ -200,9 +194,15 @@ jobs: command: check args: --target=${{ matrix.job.target }} --verbose --lib --no-default-features --features regex-onig,git,paging - name: Package + id: package shell: bash run: | - ARCHIVE_DIR='${{ steps.vars.outputs.STAGING }}/${{ steps.vars.outputs.PKG_BASENAME }}/' + PKG_suffix=".tar.gz" ; case ${{ matrix.job.target }} in *-pc-windows-*) PKG_suffix=".zip" ;; esac; + PKG_BASENAME=${PROJECT_NAME}-v${PROJECT_VERSION}-${{ matrix.job.target }} + PKG_NAME=${PKG_BASENAME}${PKG_suffix} + echo ::set-output name=PKG_NAME::${PKG_NAME} + + ARCHIVE_DIR="${{ steps.vars.outputs.STAGING }}/${PKG_BASENAME}/" mkdir -p "${ARCHIVE_DIR}" mkdir -p "${ARCHIVE_DIR}/autocomplete" @@ -225,8 +225,8 @@ jobs: # base compressed package pushd '${{ steps.vars.outputs.STAGING }}/' >/dev/null case ${{ matrix.job.target }} in - *-pc-windows-*) 7z -y a '${{ steps.vars.outputs.PKG_NAME }}' '${{ steps.vars.outputs.PKG_BASENAME }}'/* | tail -2 ;; - *) tar czf '${{ steps.vars.outputs.PKG_NAME }}' '${{ steps.vars.outputs.PKG_BASENAME }}'/* ;; + *-pc-windows-*) 7z -y a "${PKG_NAME}" "${PKG_BASENAME}"/* | tail -2 ;; + *) tar czf "${PKG_NAME}" "${PKG_BASENAME}"/* ;; esac; popd >/dev/null - name: Debian package @@ -336,8 +336,8 @@ jobs: - name: Upload package artifact uses: actions/upload-artifact@master with: - name: ${{ steps.vars.outputs.PKG_NAME }} - path: ${{ steps.vars.outputs.STAGING }}/${{ steps.vars.outputs.PKG_NAME }} + name: ${{ steps.package.outputs.PKG_NAME }} + path: ${{ steps.vars.outputs.STAGING }}/${{ steps.package.outputs.PKG_NAME }} - name: Upload Debian package artifact uses: actions/upload-artifact@master if: steps.debian-package.outputs.DPKG_NAME @@ -349,7 +349,7 @@ jobs: if: steps.vars.outputs.IS_RELEASE with: files: | - ${{ steps.vars.outputs.STAGING }}/${{ steps.vars.outputs.PKG_NAME }} + ${{ steps.vars.outputs.STAGING }}/${{ steps.package.outputs.PKG_NAME }} ${{ steps.vars.outputs.STAGING }}/${{ steps.debian-package.outputs.DPKG_NAME }} env: GITHUB_TOKEN: ${{ secrets.GITHUB_TOKEN }} |