From fb9380bfd3c9b0f5b72cb92fe4ab293d7db8ffcf Mon Sep 17 00:00:00 2001 From: yukang Date: Sat, 28 Mar 2026 22:12:55 +0800 Subject: [PATCH 1/3] feat: update macOS build configuration for portability --- .github/workflows/release.yml | 19 ++++++++++++++----- 1 file changed, 14 insertions(+), 5 deletions(-) diff --git a/.github/workflows/release.yml b/.github/workflows/release.yml index b14891471..412d72609 100644 --- a/.github/workflows/release.yml +++ b/.github/workflows/release.yml @@ -48,7 +48,7 @@ jobs: runs-on: ${{ matrix.os }} strategy: matrix: - os: [ ubuntu-22.04, ubuntu-24.04, ubuntu-22.04-arm, macos-15-intel, windows-2022 ] + os: [ ubuntu-22.04, ubuntu-24.04, ubuntu-22.04-arm, macos-15, macos-15-intel, windows-2022 ] include: - os: ubuntu-22.04 bin_suffix: @@ -59,9 +59,12 @@ jobs: - os: ubuntu-22.04-arm bin_suffix: pkg_suffix: aarch64-linux-portable + - os: macos-15 + bin_suffix: + pkg_suffix: aarch64-apple-darwin-portable - os: macos-15-intel bin_suffix: - pkg_suffix: x86_64-darwin-portable + pkg_suffix: x86_64-apple-darwin-portable - os: windows-2022 bin_suffix: .exe pkg_suffix: x86_64-windows @@ -115,11 +118,17 @@ jobs: - if: matrix.os == 'ubuntu-24.04' name: Build linux run: cargo build --release --locked && cd migrate && cargo build --release --locked && cd .. - - if: matrix.os == 'macos-15-intel' + - if: matrix.os == 'macos-15' + name: Setup Homebrew PATH + run: | + echo /opt/homebrew/bin >> $GITHUB_PATH + echo /opt/homebrew/sbin >> $GITHUB_PATH + - if: startsWith(matrix.os, 'macos-15') name: Build macos portable run: | - export OPENSSL_LIB_DIR=/usr/local/opt/openssl@1.1/lib - export OPENSSL_INCLUDE_DIR=/usr/local/opt/openssl@1.1/include + export OPENSSL_PREFIX="$(brew --prefix openssl@1.1)" + export OPENSSL_LIB_DIR="${OPENSSL_PREFIX}/lib" + export OPENSSL_INCLUDE_DIR="${OPENSSL_PREFIX}/include" export OPENSSL_STATIC=1 cargo build --release --locked --features portable && cd migrate && cargo build --release --locked && cd .. - if: matrix.os == 'windows-2022' From 7681c7d8691046049cd16bc11f6d390f13b39be4 Mon Sep 17 00:00:00 2001 From: yukang Date: Thu, 9 Apr 2026 11:31:19 +0800 Subject: [PATCH 2/3] refactor: simplify macOS build steps by removing Homebrew setup --- .github/workflows/release.yml | 12 +----------- 1 file changed, 1 insertion(+), 11 deletions(-) diff --git a/.github/workflows/release.yml b/.github/workflows/release.yml index 412d72609..ea31319f6 100644 --- a/.github/workflows/release.yml +++ b/.github/workflows/release.yml @@ -118,19 +118,9 @@ jobs: - if: matrix.os == 'ubuntu-24.04' name: Build linux run: cargo build --release --locked && cd migrate && cargo build --release --locked && cd .. - - if: matrix.os == 'macos-15' - name: Setup Homebrew PATH - run: | - echo /opt/homebrew/bin >> $GITHUB_PATH - echo /opt/homebrew/sbin >> $GITHUB_PATH - if: startsWith(matrix.os, 'macos-15') name: Build macos portable - run: | - export OPENSSL_PREFIX="$(brew --prefix openssl@1.1)" - export OPENSSL_LIB_DIR="${OPENSSL_PREFIX}/lib" - export OPENSSL_INCLUDE_DIR="${OPENSSL_PREFIX}/include" - export OPENSSL_STATIC=1 - cargo build --release --locked --features portable && cd migrate && cargo build --release --locked && cd .. + run: cargo build --release --locked --features portable && cd migrate && cargo build --release --locked && cd .. - if: matrix.os == 'windows-2022' name: Build windows run: cargo build --release --locked && cd migrate && cargo build --release --locked && cd .. From e0272075655ccb3f40c70c84d12f52967648972c Mon Sep 17 00:00:00 2001 From: yukang Date: Thu, 9 Apr 2026 11:44:11 +0800 Subject: [PATCH 3/3] renaming for keep portable --- .github/workflows/release.yml | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/.github/workflows/release.yml b/.github/workflows/release.yml index ea31319f6..98d8761ed 100644 --- a/.github/workflows/release.yml +++ b/.github/workflows/release.yml @@ -61,10 +61,10 @@ jobs: pkg_suffix: aarch64-linux-portable - os: macos-15 bin_suffix: - pkg_suffix: aarch64-apple-darwin-portable + pkg_suffix: aarch64-darwin-portable - os: macos-15-intel bin_suffix: - pkg_suffix: x86_64-apple-darwin-portable + pkg_suffix: x86_64-darwin-portable - os: windows-2022 bin_suffix: .exe pkg_suffix: x86_64-windows