Skip to content

Commit

Permalink
Fix upload of zip file in release github action
Browse files Browse the repository at this point in the history
Earlier we used to have tar.gz for windows release. jaegertracing#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 <ashmita.bohara@logz.io>
  • Loading branch information
Ashmita152 committed Aug 5, 2022
1 parent a17aa35 commit f0adb40
Show file tree
Hide file tree
Showing 2 changed files with 6 additions and 7 deletions.
2 changes: 1 addition & 1 deletion .github/workflows/ci-release.yml
Expand Up @@ -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 }}
Expand Down
11 changes: 5 additions & 6 deletions scripts/package-deploy.sh
Expand Up @@ -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"
Expand Down Expand Up @@ -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

0 comments on commit f0adb40

Please sign in to comment.