@@ -119,12 +119,6 @@ jobs:
119119 # determine EXE suffix
120120 EXE_suffix="" ; case ${{ matrix.job.target }} in *-pc-windows-*) EXE_suffix=".exe" ;; esac;
121121 echo ::set-output name=EXE_suffix::${EXE_suffix}
122− # package name
123− PKG_suffix=".tar.gz" ; case ${{ matrix.job.target }} in *-pc-windows-*) PKG_suffix=".zip" ;; esac;
124− PKG_BASENAME=${PROJECT_NAME}-v${PROJECT_VERSION}-${{ matrix.job.target }}
125− PKG_NAME=${PKG_BASENAME}${PKG_suffix}
126− echo ::set-output name=PKG_BASENAME::${PKG_BASENAME}
127− echo ::set-output name=PKG_NAME::${PKG_NAME}
128122 unset IS_RELEASE ; if [[ $GITHUB_REF =~ ^refs/tags/v[0-9].* ]]; then IS_RELEASE='true' ; fi
129123 echo ::set-output name=IS_RELEASE::${IS_RELEASE}
130124 # target-specific options
@@ -200,9 +194,15 @@ jobs:
200194 command: check
201195 args: --target=${{ matrix.job.target }} --verbose --lib --no-default-features --features regex-onig,git,paging
202196 - name: Package
197+ id: package
203198 shell: bash
204199 run: |
205− ARCHIVE_DIR='${{ steps.vars.outputs.STAGING }}/${{ steps.vars.outputs.PKG_BASENAME }}/'
200+ PKG_suffix=".tar.gz" ; case ${{ matrix.job.target }} in *-pc-windows-*) PKG_suffix=".zip" ;; esac;
201+ PKG_BASENAME=${PROJECT_NAME}-v${PROJECT_VERSION}-${{ matrix.job.target }}
202+ PKG_NAME=${PKG_BASENAME}${PKG_suffix}
203+ echo ::set-output name=PKG_NAME::${PKG_NAME}
204+
205+ ARCHIVE_DIR="${{ steps.vars.outputs.STAGING }}/${PKG_BASENAME}/"
206206 mkdir -p "${ARCHIVE_DIR}"
207207 mkdir -p "${ARCHIVE_DIR}/autocomplete"
208208
@@ -225,8 +225,8 @@ jobs:
225225 # base compressed package
226226 pushd '${{ steps.vars.outputs.STAGING }}/' >/dev/null
227227 case ${{ matrix.job.target }} in
228− *-pc-windows-*) 7z -y a '${{ steps.vars.outputs.PKG_NAME }}' '${{ steps.vars.outputs.PKG_BASENAME }}'/* | tail -2 ;;
229− *) tar czf '${{ steps.vars.outputs.PKG_NAME }}' '${{ steps.vars.outputs.PKG_BASENAME }}'/* ;;
228+ *-pc-windows-*) 7z -y a "${PKG_NAME}" "${PKG_BASENAME}"/* | tail -2 ;;
229+ *) tar czf "${PKG_NAME}" "${PKG_BASENAME}"/* ;;
230230 esac;
231231 popd >/dev/null
232232 - name: Debian package
@@ -336,8 +336,8 @@ jobs:
336336 - name: Upload package artifact
337337 uses: actions/upload-artifact@master
338338 with:
339− name: ${{ steps.vars.outputs.PKG_NAME }}
340− path: ${{ steps.vars.outputs.STAGING }}/${{ steps.vars.outputs.PKG_NAME }}
339+ name: ${{ steps.package.outputs.PKG_NAME }}
340+ path: ${{ steps.vars.outputs.STAGING }}/${{ steps.package.outputs.PKG_NAME }}
341341 - name: Upload Debian package artifact
342342 uses: actions/upload-artifact@master
343343 if: steps.debian-package.outputs.DPKG_NAME
@@ -349,7 +349,7 @@ jobs:
349349 if: steps.vars.outputs.IS_RELEASE
350350 with:
351351 files: |
352− ${{ steps.vars.outputs.STAGING }}/${{ steps.vars.outputs.PKG_NAME }}
352+ ${{ steps.vars.outputs.STAGING }}/${{ steps.package.outputs.PKG_NAME }}
353353 ${{ steps.vars.outputs.STAGING }}/${{ steps.debian-package.outputs.DPKG_NAME }}
354354 env:
355355 GITHUB_TOKEN: ${{ secrets.GITHUB_TOKEN }}