diff --git a/.github/workflows/release.yaml b/.github/workflows/release.yaml index 00a5a6bf..8b90d00d 100644 --- a/.github/workflows/release.yaml +++ b/.github/workflows/release.yaml @@ -16,23 +16,12 @@ jobs: include: ## Linux builds # Glibc 2.31 - - os: ubuntu-latest + - os: ubuntu-20.04 target: x86_64-unknown-linux-gnu artifact_name: target/x86_64-unknown-linux-gnu/release/libblink_cmp_fuzzy.so - - os: ubuntu-latest + - os: ubuntu-20.04 target: aarch64-unknown-linux-gnu artifact_name: target/aarch64-unknown-linux-gnu/release/libblink_cmp_fuzzy.so - # Glibc 2.17 - - os: ubuntu-latest - target: x86_64-unknown-linux-gnu - target_name: x86_64-unknown-linux-gnu-legacy - legacy: true - artifact_name: target/x86_64-unknown-linux-gnu/release/libblink_cmp_fuzzy.so - - os: ubuntu-latest - target: aarch64-unknown-linux-gnu - target_name: aarch64-unknown-linux-gnu-legacy - legacy: true - artifact_name: target/aarch64-unknown-linux-gnu/release/libblink_cmp_fuzzy.so # Musl 1.2.3 - os: ubuntu-latest target: x86_64-unknown-linux-musl @@ -64,22 +53,12 @@ jobs: rustup target add ${{ matrix.target }} - name: Build for Linux - if: contains(matrix.os, 'ubuntu') && !matrix.legacy + if: contains(matrix.os, 'ubuntu') run: | cargo install cross --git https://github.com/cross-rs/cross cross build --release --target ${{ matrix.target }} mv "${{ matrix.artifact_name }}" "${{ matrix.target }}.so" - - name: Build for Linux (legacy) - if: contains(matrix.os, 'ubuntu') && matrix.legacy - run: | - echo "[target.aarch64-unknown-linux-gnu]" >> Cross.toml - echo "image = \"ghcr.io/cross-rs/${{ matrix.target }}:main-centos\"" >> Cross.toml - - cargo install cross --git https://github.com/cross-rs/cross - cross build --release --target ${{ matrix.target }} - mv "${{ matrix.artifact_name }}" "${{ matrix.target_name || matrix.target }}.so" - - name: Build for macOS if: contains(matrix.os, 'macos') run: | @@ -96,8 +75,8 @@ jobs: - name: Upload artifacts uses: actions/upload-artifact@v4 with: - name: ${{ matrix.target_name || matrix.target }} - path: ${{ matrix.target_name || matrix.target }}.* + name: ${{ matrix.target }} + path: ${{ matrix.target }}.* release: name: Release diff --git a/README.md b/README.md index 008f8e28..19107adc 100644 --- a/README.md +++ b/README.md @@ -269,7 +269,6 @@ MiniDeps.add({ force_version = nil, -- When downloading a prebuilt binary, force the downloader to use this system triple. If this is unset -- then the downloader will attempt to infer the system triple from `jit.os` and `jit.arch`. - -- For old glibc (>= 2.17), set this to `x86_64-unknown-linux-gnu-legacy` or `aarch64-unknown-linux-gnu-legacy` -- Check the latest release for all available system triples -- -- Beware that if the FFI ABI changes while tracking main then this may result in blink breaking.