From f0adb4071b6212b70ff1fee3e802dbc243c32ecc Mon Sep 17 00:00:00 2001 From: Ashmita152 Date: Fri, 5 Aug 2022 15:59:29 +1000 Subject: [PATCH] Fix upload of zip file in release github action Earlier we used to have tar.gz for windows release. https://github.com/jaegertracing/jaeger/pull/3817 changed the windows release from tar.gz to zip format. This PR also restores that i.e. now we have both tar.gz and zip for windows release. Signed-off-by: Ashmita152 --- .github/workflows/ci-release.yml | 2 +- scripts/package-deploy.sh | 11 +++++------ 2 files changed, 6 insertions(+), 7 deletions(-) diff --git a/.github/workflows/ci-release.yml b/.github/workflows/ci-release.yml index 1865d2bbac3..86cd131c8f3 100644 --- a/.github/workflows/ci-release.yml +++ b/.github/workflows/ci-release.yml @@ -44,7 +44,7 @@ jobs: - name: Upload binaries uses: svenstaro/upload-release-action@2.3.0 with: - file: deploy/*.tar.gz + file: '{deploy/*.tar.gz,deploy/*.zip}' file_glob: true tag: ${{ github.ref }} repo_token: ${{ secrets.GITHUB_TOKEN }} diff --git a/scripts/package-deploy.sh b/scripts/package-deploy.sh index 55de936719e..c97344fb8b9 100755 --- a/scripts/package-deploy.sh +++ b/scripts/package-deploy.sh @@ -28,19 +28,17 @@ function stage-platform-files { stage-file ./examples/hotrod/hotrod-$PLATFORM $PACKAGE_STAGING_DIR/example-hotrod$FILE_EXTENSION } -# package pulls built files for the platform ($1). If you pass in a file -# extension ($2) it will be used on the binaries +# package pulls built files for the platform ($2) and compresses it using the compression ($1). +# If you pass in a file extension ($3) it will be look for binaries with that extension. function package { - local COMPRESSION=$1 local PLATFORM=$2 local FILE_EXTENSION=$3 - # script start local PACKAGE_STAGING_DIR=jaeger-$VERSION-$PLATFORM mkdir $PACKAGE_STAGING_DIR - stage-platform-files $PLATFORM $PACKAGE_STAGING_DIR $FILE_EXTENSION + if [ "$COMPRESSION" == "zip" ] then local ARCHIVE_NAME="$PACKAGE_STAGING_DIR.zip" @@ -68,7 +66,8 @@ mkdir $DEPLOY_STAGING_DIR package tar linux-amd64 package tar darwin-amd64 package tar darwin-arm64 -package zip windows-amd64 .exe +package tar windows-amd64 .exe +package zip windows-amd64 .exe package tar linux-s390x package tar linux-arm64 package tar linux-ppc64le