diff --git a/.github/workflows/publish.yaml b/.github/workflows/publish.yaml index b6cb8e06be..1912cea33d 100644 --- a/.github/workflows/publish.yaml +++ b/.github/workflows/publish.yaml @@ -100,6 +100,10 @@ jobs: target: '' - platform: ubuntu-24.04-arm # [linux, ARM64] target: '' + - platform: ubuntu-22.04 # [linux, x64] + target: '' + - platform: ubuntu-22.04-arm # [linux, ARM64] + target: '' - platform: windows-latest # [windows, x64] target: '' @@ -141,7 +145,7 @@ jobs: - name: Rust Cache ${{ matrix.target }} uses: Swatinem/rust-cache@v2.8.1 with: - shared-key: app-release-build-${{ github.event.inputs.channel || 'nightly' }}${{ matrix.target }} + shared-key: app-release-build-${{ github.event.inputs.channel || 'nightly' }}${{ matrix.target }}${{ matrix.platform }} - name: Init Node Environment uses: ./.github/actions/init-env-node @@ -352,6 +356,10 @@ jobs: target: '' - platform: ubuntu-24.04-arm # [linux, ARM64] target: '' + - platform: ubuntu-22.04 # [linux, x64] + target: '' + - platform: ubuntu-22.04-arm # [linux, ARM64] + target: '' - platform: windows-latest # [windows, x64] target: '' steps: diff --git a/scripts/release.sh b/scripts/release.sh index 5f53c3ae85..a98f637632 100755 --- a/scripts/release.sh +++ b/scripts/release.sh @@ -219,7 +219,15 @@ else BUNDLE_DIR=$(readlink -f "$PWD/../target/release/bundle") fi +# The release dir determines a (significant portion of) the final S3 object key. RELEASE_DIR="$DIST/$OS/$ARCH" +if [ "$OS" = "linux" ]; then + # We build for multiple linux distros and need distinct keys for them. + RELEASE_DIR="$DIST/$OS/$(lsb_release -cs)/$ARCH" +fi + +echo "Resolved RELEASE_DIR=$RELEASE_DIR" + mkdir -p "$RELEASE_DIR" if [ "$OS" = "macos" ]; then