Skip to content

feat(ci): add macos universal2 build #2628

New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Merged
shamardy merged 14 commits into from
Oct 7, 2025
Merged

feat(ci): add macos universal2 build #2628

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
14 commits
Select commit Hold shift + click to select a range
24e333c
feat(ci): add universal macos build
Sep 25, 2025
ebb0b34
fix OUT_DIR creation
Sep 25, 2025
9906fd4
fix(ci): add upload/download macos build
Sep 25, 2025
90468a3
fix(ci): download path
Sep 25, 2025
765ed19
fix out dir
Sep 25, 2025
bdb9bad
fix clippy
Sep 25, 2025
e48e81c
fix clippy
Sep 25, 2025
ee8b3e8
fix(ci): add missed py imports
Sep 25, 2025
24d4373
add macos universal job for main branch as well
Sep 25, 2025
cba15fa
fix(ci): add x86 target
Sep 25, 2025
8aaae02
fix add target (really)
Sep 26, 2025
8ac9313
fix(ci): add missed uploads
Sep 26, 2025
3023cc6
fix compilation/clippy/fmt to nightly-2023-06-01 of staging branch
shamardy Oct 7, 2025
98a9c79
post merge fix
shamardy Oct 7, 2025
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
76 changes: 76 additions & 0 deletions .github/workflows/dev-build.yml
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -115,6 +115,12 @@ jobs:
- name: Build
run: cargo build --release --target x86_64-apple-darwin

- name: Upload build for next job
uses: actions/upload-artifact@v4
with:
name: x86_64-apple-darwin-release-kdf
path: target/x86_64-apple-darwin/release/kdf

- name: Compress kdf build output
env:
AVAILABLE: ${{ secrets.FILE_SERVER_KEY }}
Expand Down Expand Up @@ -167,6 +173,12 @@ jobs:
- name: Build
run: cargo build --release --target aarch64-apple-darwin

- name: Upload build for next job
uses: actions/upload-artifact@v4
with:
name: aarch64-apple-darwin-release-kdf
path: target/aarch64-apple-darwin/release/kdf

- name: Compress kdf build output
env:
AVAILABLE: ${{ secrets.FILE_SERVER_KEY }}
Expand All @@ -189,6 +201,70 @@ jobs:
SAFE_BRANCH_NAME=$(echo "$BRANCH_NAME" | tr '/' '-')
python3 ./scripts/ci/upload_artifact.py "$SAFE_BRANCH_NAME" "/uploads/$SAFE_BRANCH_NAME"

mac-universal:
timeout-minutes: 60
runs-on: macos-latest
needs: [mac-x86-64, mac-arm64]
steps:
- uses: actions/checkout@v3

- name: Install build deps
uses: ./.github/actions/deps-install
with:
deps: ('protoc', 'python3', 'paramiko')

- name: Calculate build tag (commit hash) for PR commit
if: github.event_name == 'pull_request'
run: echo "KDF_BUILD_TAG=$(git rev-parse --short=7 ${{ github.event.pull_request.head.sha }})" >> $GITHUB_ENV

- name: Calculate build tag (commit hash) for merge commit
if: github.event_name != 'pull_request'
run: echo "KDF_BUILD_TAG=$(git rev-parse --short=7 HEAD)" >> $GITHUB_ENV

- name: Download macos x86_64 build
uses: actions/download-artifact@v5
with:
name: x86_64-apple-darwin-release-kdf
path: target/x86_64-apple-darwin/release

- name: Download macos aarch64 build
uses: actions/download-artifact@v5
with:
name: aarch64-apple-darwin-release-kdf
path: target/aarch64-apple-darwin/release

- name: Make universal kdf build output
run: |
AARCH64_BIN="target/aarch64-apple-darwin/release/kdf"
X86_64_BIN="target/x86_64-apple-darwin/release/kdf"
OUT_DIR="target/universal-apple-darwin/release"
OUT_BIN="$OUT_DIR/kdf"
mkdir -p "$OUT_DIR"
lipo -create "$AARCH64_BIN" "$X86_64_BIN" -output "$OUT_BIN"
lipo -info "$OUT_BIN"

- name: Compress kdf build output
env:
AVAILABLE: ${{ secrets.FILE_SERVER_KEY }}
if: ${{ env.AVAILABLE != '' }}
run: |
NAME="kdf_$KDF_BUILD_TAG-mac-universal.zip"
zip $NAME target/universal-apple-darwin/release/kdf -j
SAFE_DIR_NAME=$(echo "$BRANCH_NAME" | tr '/' '-')
mkdir $SAFE_DIR_NAME
mv $NAME ./$SAFE_DIR_NAME/

- name: Upload build artifact
env:
FILE_SERVER_HOST: ${{ secrets.FILE_SERVER_HOST }}
FILE_SERVER_USERNAME: ${{ secrets.FILE_SERVER_USERNAME }}
FILE_SERVER_PORT: ${{ secrets.FILE_SERVER_PORT }}
FILE_SERVER_KEY: ${{ secrets.FILE_SERVER_KEY }}
if: ${{ env.FILE_SERVER_KEY != '' }}
run: |
SAFE_BRANCH_NAME=$(echo "$BRANCH_NAME" | tr '/' '-')
python3 ./scripts/ci/upload_artifact.py "$SAFE_BRANCH_NAME" "/uploads/$SAFE_BRANCH_NAME"

win-x86-64:
timeout-minutes: 60
runs-on: windows-latest
Expand Down
77 changes: 77 additions & 0 deletions .github/workflows/release-build.yml
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -89,6 +89,7 @@ jobs:
run: |
rustup toolchain install nightly-2023-06-01 --no-self-update --profile=minimal
rustup default nightly-2023-06-01
rustup target add x86_64-apple-darwin

- name: Install build deps
uses: ./.github/actions/deps-install
Expand All @@ -109,6 +110,12 @@ jobs:
- name: Build
run: cargo build --release --target x86_64-apple-darwin

- name: Upload build for next job
uses: actions/upload-artifact@v4
with:
name: x86_64-apple-darwin-release-kdf
path: target/x86_64-apple-darwin/release/kdf

- name: Compress kdf build output
run: |
NAME="kdf_$KDF_BUILD_TAG-mac-x86-64.zip"
Expand Down Expand Up @@ -158,6 +165,12 @@ jobs:
- name: Build
run: cargo build --release --target aarch64-apple-darwin

- name: Upload build for next job
uses: actions/upload-artifact@v4
with:
name: aarch64-apple-darwin-release-kdf
path: target/aarch64-apple-darwin/release/kdf

- name: Compress kdf build output
run: |
NAME="kdf_$KDF_BUILD_TAG-mac-arm64.zip"
Expand All @@ -177,6 +190,70 @@ jobs:
SAFE_BRANCH_NAME=$(echo "$BRANCH_NAME" | tr '/' '-')
python3 ./scripts/ci/upload_artifact.py "$SAFE_BRANCH_NAME" "/uploads/$SAFE_BRANCH_NAME"

mac-universal:
timeout-minutes: 60
runs-on: macos-latest
needs: [mac-x86-64, mac-arm64]
steps:
- uses: actions/checkout@v3

- name: Install build deps
uses: ./.github/actions/deps-install
with:
deps: ('protoc', 'python3', 'paramiko')

- name: Calculate build tag (commit hash) for PR commit
if: github.event_name == 'pull_request'
run: echo "KDF_BUILD_TAG=$(git rev-parse --short=7 ${{ github.event.pull_request.head.sha }})" >> $GITHUB_ENV

- name: Calculate build tag (commit hash) for merge commit
if: github.event_name != 'pull_request'
run: echo "KDF_BUILD_TAG=$(git rev-parse --short=7 HEAD)" >> $GITHUB_ENV

- name: Download macos x86_64 build
uses: actions/download-artifact@v5
with:
name: x86_64-apple-darwin-release-kdf
path: target/x86_64-apple-darwin/release

- name: Download macos aarch64 build
uses: actions/download-artifact@v5
with:
name: aarch64-apple-darwin-release-kdf
path: target/aarch64-apple-darwin/release

- name: Make universal kdf build output
run: |
AARCH64_BIN="target/aarch64-apple-darwin/release/kdf"
X86_64_BIN="target/x86_64-apple-darwin/release/kdf"
OUT_DIR="target/universal-apple-darwin/release"
OUT_BIN="$OUT_DIR/kdf"
mkdir -p "$OUT_DIR"
lipo -create "$AARCH64_BIN" "$X86_64_BIN" -output "$OUT_BIN"
lipo -info "$OUT_BIN"

- name: Compress kdf build output
env:
AVAILABLE: ${{ secrets.FILE_SERVER_KEY }}
if: ${{ env.AVAILABLE != '' }}
run: |
NAME="kdf_$KDF_BUILD_TAG-mac-universal.zip"
zip $NAME target/universal-apple-darwin/release/kdf -j
SAFE_DIR_NAME=$(echo "$BRANCH_NAME" | tr '/' '-')
mkdir $SAFE_DIR_NAME
mv $NAME ./$SAFE_DIR_NAME/

- name: Upload build artifact
env:
FILE_SERVER_HOST: ${{ secrets.FILE_SERVER_HOST }}
FILE_SERVER_USERNAME: ${{ secrets.FILE_SERVER_USERNAME }}
FILE_SERVER_PORT: ${{ secrets.FILE_SERVER_PORT }}
FILE_SERVER_KEY: ${{ secrets.FILE_SERVER_KEY }}
if: ${{ env.FILE_SERVER_KEY != '' }}
run: |
SAFE_BRANCH_NAME=$(echo "$BRANCH_NAME" | tr '/' '-')
python3 ./scripts/ci/upload_artifact.py "$SAFE_BRANCH_NAME" "/uploads/$SAFE_BRANCH_NAME"

win-x86-64:
timeout-minutes: 60
runs-on: windows-latest
Expand Down
Loading