From fba66655d30b9acda9ce5f06e9e80be9734203e3 Mon Sep 17 00:00:00 2001 From: Jose Quintana Date: Sat, 3 Jun 2023 01:12:43 +0200 Subject: [PATCH] fix: checksums ci workflow --- .github/workflows/release.checksums.yml | 2 +- scripts/ci/generate_checksums.sh | 7 ++++--- scripts/installer.sh | 2 +- 3 files changed, 6 insertions(+), 5 deletions(-) diff --git a/.github/workflows/release.checksums.yml b/.github/workflows/release.checksums.yml index ece1509..03305a2 100644 --- a/.github/workflows/release.checksums.yml +++ b/.github/workflows/release.checksums.yml @@ -16,7 +16,7 @@ jobs: - name: Prepare shell: bash run: | - echo "SERVER_VERSION=${GITHUB_REF##*/v}" >> $GITHUB_ENV + echo "SERVER_VERSION=${GITHUB_REF}" >> $GITHUB_ENV echo "version is: ${{ env.SERVER_VERSION }}" - name: Generate and upload diff --git a/scripts/ci/generate_checksums.sh b/scripts/ci/generate_checksums.sh index d1a4c3e..7e2aa4f 100755 --- a/scripts/ci/generate_checksums.sh +++ b/scripts/ci/generate_checksums.sh @@ -18,15 +18,17 @@ rm -rf $release_dir mkdir -p $release_dir cd $release_dir +server_version_num=$(echo $SERVER_VERSION | sed "s/v//") + # Download precompiled binary assets while read -r file_url; do curl -LO --progress-bar $file_url done < <(cat $release_json | jq -r ".assets[] | .browser_download_url") echo "Downloading source code assets..." -curl -Lo static-web-server-$SERVER_VERSION.zip --progress-bar \ +curl -Lo static-web-server-$server_version_num.zip --progress-bar \ https://github.com/static-web-server/static-web-server/archive/refs/tags/$SERVER_VERSION.zip -curl -Lo static-web-server-$SERVER_VERSION.tar.gz --progress-bar \ +curl -Lo static-web-server-$server_version_num.tar.gz --progress-bar \ https://github.com/static-web-server/static-web-server/archive/refs/tags/$SERVER_VERSION.tar.gz # Compose checksum file name @@ -52,7 +54,6 @@ echo "Updating $SERVER_VERSION checksums for 'Download and Install' page..." cd $cwd release_date=$(date +%Y-%m-%d) -server_version_num=$(echo $SERVER_VERSION | sed "s/v//") filename_version="static-web-server-$SERVER_VERSION" filename_version_num="static-web-server-$server_version_num" diff --git a/scripts/installer.sh b/scripts/installer.sh index 97da96c..4e0cca1 100755 --- a/scripts/installer.sh +++ b/scripts/installer.sh @@ -23,7 +23,7 @@ fi set -u # SWS latest version -version="2.15.0" +version="2.17.0" # Default directory where SWS will be installed local_bin="/usr/local/bin" -- libgit2 1.7.2