Skip to content

Commit

Permalink
Fix installer downloads for specific releases (#1976)
Browse files Browse the repository at this point in the history
* Fix installer downloads for specific releases

Github download urls for a specific release uses the pattern `../releases/download/[RELEASE]/..`, which differs from the latest release URL which uses `../releases/latest/download/..`.

For convenience, if `BINSTALL_VERSION` is set but doesn't start with `v`, the v is prefixed.

* ci: Set BINSTALL_VERSION in install script tests

When running the install-script workflow in Github Actions, add matrix
options for not setting the variable, setting it to the latest release
with the `v` prefix, and setting it to the latest release without the
`v` prefix.
  • Loading branch information
mjpieters authored Nov 20, 2024
1 parent 2417642 commit 266e627
Show file tree
Hide file tree
Showing 3 changed files with 65 additions and 5 deletions.
41 changes: 41 additions & 0 deletions .github/workflows/install-script.yml
Original file line number Diff line number Diff line change
Expand Up @@ -31,6 +31,7 @@ jobs:
matrix:
os: [macos-latest, ubuntu-latest]
set_cargo_home: [t, f]
set_binstall_version: ['no', 'with-v', 'without-v']

runs-on: ${{ matrix.os }}

Expand All @@ -44,6 +45,18 @@ jobs:
mkdir -p "${CARGO_HOME}/bin"
echo "CARGO_HOME=$CARGO_HOME" >> "$GITHUB_ENV"
- name: Set `BINSTALL_VERSION`
if: matrix.set_binstall_version != 'no'
env:
STRIP_V: ${{ matrix.set_cargo_home }}
GH_TOKEN: ${{ github.token }}
run: |
# fetch most recent release tag.
BINSTALL_VERSION="$(gh release list --json name --jq '[.[] | select(.name | startswith("v")) | .name] | first')"
if [[ $STRIP_V == 'without-v' ]]; then BINSTALL_VERSION="${BINSTALL_VERSION#v*}"; fi
echo "Setting BINSTALL_VERSION=$BINSTALL_VERSION"
echo "BINSTALL_VERSION=$BINSTALL_VERSION" >> "$GITHUB_ENV"
- name: Install `cargo-binstall` using scripts
run: ./install-from-binstall-release.sh
env:
Expand All @@ -59,6 +72,7 @@ jobs:
fail-fast: false
matrix:
set_cargo_home: [t, f]
set_binstall_version: ['no', 'with-v', 'without-v']

runs-on: windows-latest

Expand All @@ -73,6 +87,19 @@ jobs:
mkdir -p "${CARGO_HOME}/bin"
echo "CARGO_HOME=$CARGO_HOME" >> "$GITHUB_ENV"
- name: Set `BINSTALL_VERSION`
if: matrix.set_binstall_version != 'no'
shell: bash
env:
GH_TOKEN: ${{ github.token }}
STRIP_V: ${{ matrix.set_cargo_home }}
run: |
# fetch most recent release name.
BINSTALL_VERSION="$(gh release list --json name --jq '[.[] | select(.name | startswith("v")) | .name] | first')"
if [[ $STRIP_V == 'without-v' ]]; then BINSTALL_VERSION="${BINSTALL_VERSION#v*}"; fi
echo "Setting BINSTALL_VERSION=$BINSTALL_VERSION"
echo "BINSTALL_VERSION=$BINSTALL_VERSION" >> "$GITHUB_ENV"
- name: Install `cargo-binstall` using scripts
run: ./install-from-binstall-release.ps1
env:
Expand All @@ -86,6 +113,7 @@ jobs:
fail-fast: false
matrix:
set_cargo_home: [t, f]
set_binstall_version: ['no', 'with-v', 'without-v']

runs-on: windows-latest

Expand All @@ -100,6 +128,19 @@ jobs:
mkdir -p "${CARGO_HOME}/bin"
echo "CARGO_HOME=$CARGO_HOME" >> "$GITHUB_ENV"
- name: Set `BINSTALL_VERSION`
if: matrix.set_binstall_version != 'no'
shell: bash
env:
GH_TOKEN: ${{ github.token }}
STRIP_V: ${{ matrix.set_cargo_home }}
run: |
# fetch most recent release name.
BINSTALL_VERSION="$(gh release list --json name --jq '[.[] | select(.name | startswith("v")) | .name] | first')"
if [[ $STRIP_V == 'without-v' ]]; then BINSTALL_VERSION="${BINSTALL_VERSION#v*}"; fi
echo "Setting BINSTALL_VERSION=$BINSTALL_VERSION"
echo "BINSTALL_VERSION=$BINSTALL_VERSION" >> "$GITHUB_ENV"
- name: Install `cargo-binstall` using scripts
shell: bash
run: ./install-from-binstall-release.sh
Expand Down
15 changes: 12 additions & 3 deletions install-from-binstall-release.ps1
Original file line number Diff line number Diff line change
Expand Up @@ -2,10 +2,19 @@ $ErrorActionPreference = "Stop"
Set-PSDebug -Trace 1
$tmpdir = $Env:TEMP
$BINSTALL_VERSION = $Env:BINSTALL_VERSION
if (-not $BINSTALL_VERSION) {
$BINSTALL_VERSION = 'latest'
if ($BINSTALL_VERSION -and $BINSTALL_VERSION -notlike 'v*') {
# prefix version with v
$BINSTALL_VERSION = "v$BINSTALL_VERSION"
}
$base_url = "https://github.com/cargo-bins/cargo-binstall/releases/$BINSTALL_VERSION/download/cargo-binstall-"
# Fetch binaries from `[..]/releases/latest/download/[..]` if _no_ version is
# given, otherwise from `[..]/releases/download/VERSION/[..]`. Note the shifted
# location of '/download'.
$base_url = if (-not $BINSTALL_VERSION) {
"https://github.com/cargo-bins/cargo-binstall/releases/latest/download/cargo-binstall-"
} else {
"https://github.com/cargo-bins/cargo-binstall/releases/download/$BINSTALL_VERSION/cargo-binstall-"
}

$proc_arch = [Environment]::GetEnvironmentVariable("PROCESSOR_ARCHITECTURE", [EnvironmentVariableTarget]::Machine)
if ($proc_arch -eq "AMD64") {
$arch = "x86_64"
Expand Down
14 changes: 12 additions & 2 deletions install-from-binstall-release.sh
Original file line number Diff line number Diff line change
Expand Up @@ -2,11 +2,21 @@

set -euxo pipefail

BINSTALL_VERSION="${BINSTALL_VERSION:-latest}"
if [[ -n "${BINSTALL_VERSION:-}" && "$BINSTALL_VERSION" != v* ]]; then
# prefix version with v
BINSTALL_VERSION="v$BINSTALL_VERSION"
fi

cd "$(mktemp -d)"

base_url="https://github.com/cargo-bins/cargo-binstall/releases/${BINSTALL_VERSION}/download/cargo-binstall-"
# Fetch binaries from `[..]/releases/latest/download/[..]` if _no_ version is
# given, otherwise from `[..]/releases/download/VERSION/[..]`. Note the shifted
# location of '/download'.
if [[ -z "${BINSTALL_VERSION:-}" ]]; then
base_url="https://github.com/cargo-bins/cargo-binstall/releases/latest/download/cargo-binstall-"
else
base_url="https://github.com/cargo-bins/cargo-binstall/releases/download/${BINSTALL_VERSION}/cargo-binstall-"
fi

os="$(uname -s)"
if [ "$os" == "Darwin" ]; then
Expand Down

0 comments on commit 266e627

Please sign in to comment.