Skip to content

Commit 2a55529

Browse files
committed
Merge aarch64.yml to Build.yml
1 parent 1db6245 commit 2a55529

File tree

2 files changed

+18
-93
lines changed

2 files changed

+18
-93
lines changed

.github/workflows/Build.yml

Lines changed: 18 additions & 10 deletions
Original file line numberDiff line numberDiff line change
@@ -3,17 +3,25 @@ on:
33
branches:
44
- 'build/*'
55
tags: [ 'v*' ]
6+
pull_request:
7+
types: [ opened, synchronize, reopened, labeled ]
68
workflow_dispatch:
79

8-
name: Build x86_64
10+
name: Build
911

1012
jobs:
1113
build:
12-
name: Build
13-
runs-on: macos-11
14+
name: Build ${{ matrix.os.arch }}
15+
if: ${{ github.event_name != 'pull_request' || contains(github.event.pull_request.labels.*.name, 'CI-build') }}
16+
runs-on: ${{ matrix.os.name }}
1417
strategy:
1518
fail-fast: false
1619
matrix:
20+
os:
21+
- name: macos-11
22+
arch: x86_64
23+
- name: macos-14
24+
arch: aarch64
1725
target:
1826
- x86_64-unknown-linux-gnu
1927
- x86_64-unknown-linux-musl
@@ -56,21 +64,21 @@ jobs:
5664
run: |
5765
set -ex
5866
cd /Volumes/tools
59-
tar czf ${{ matrix.target }}-x86_64-darwin.tar.gz ${{ matrix.target }}
67+
tar czf ${{ matrix.target }}-${{ matrix.os.arch }}-darwin.tar.gz ${{ matrix.target }}
6068
cd -
61-
mv /Volumes/tools/${{ matrix.target }}-x86_64-darwin.tar.gz .
62-
sha256sum ${{ matrix.target }}-x86_64-darwin.tar.gz | tee ${{ matrix.target }}-x86_64-darwin.tar.gz.sha256
69+
mv /Volumes/tools/${{ matrix.target }}-${{ matrix.os.arch }}-darwin.tar.gz .
70+
sha256sum ${{ matrix.target }}-${{ matrix.os.arch }}-darwin.tar.gz | tee ${{ matrix.target }}-${{ matrix.os.arch }}-darwin.tar.gz.sha256
6371
- name: Upload Toolchain
64-
uses: actions/upload-artifact@v3
72+
uses: actions/upload-artifact@v4
6573
with:
66-
name: toolchains
67-
path: ${{ matrix.target }}-x86_64-darwin.tar.gz
74+
name: toolchain-${{ matrix.target }}-${{ matrix.os.arch }}-darwin
75+
path: ${{ matrix.target }}-${{ matrix.os.arch }}-darwin.tar.gz
6876
if-no-files-found: error
6977
- name: Upload Toolchain to GitHub Release
7078
uses: svenstaro/upload-release-action@v2
7179
if: "startsWith(github.ref, 'refs/tags/')"
7280
with:
7381
repo_token: ${{ secrets.GITHUB_TOKEN }}
74-
file: ${{ matrix.target }}-x86_64-darwin.tar.gz*
82+
file: ${{ matrix.target }}-${{ matrix.os.arch }}-darwin.tar.gz*
7583
file_glob: true
7684
tag: ${{ github.ref }}

.github/workflows/aarch64.yml

Lines changed: 0 additions & 83 deletions
This file was deleted.

0 commit comments

Comments
 (0)