Skip to content

Commit 077102c

Browse files
committed
aarch64: use bash as login shell
1 parent ec308ba commit 077102c

File tree

1 file changed

+9
-10
lines changed

1 file changed

+9
-10
lines changed

.github/workflows/aarch64.yml

Lines changed: 9 additions & 10 deletions
Original file line numberDiff line numberDiff line change
@@ -8,7 +8,10 @@ name: Build aarch64
88
jobs:
99
build:
1010
name: Build
11-
runs-on: self-hosted
11+
runs-on: [self-hosted, macOS, arm64]
12+
defaults:
13+
run:
14+
shell: "/usr/bin/arch -arch arm64e /bin/bash -l {0}"
1215
strategy:
1316
matrix:
1417
target:
@@ -18,10 +21,6 @@ jobs:
1821
- armv7-unknown-linux-gnueabihf
1922
steps:
2023
- uses: actions/checkout@v2
21-
- name: Setup homebrew
22-
run: |
23-
echo "/opt/homebrew/bin" >> "${GITHUB_PATH}"
24-
echo "/opt/homebrew/sbin" >> "${GITHUB_PATH}"
2524
- name: Install crosstool-ng
2625
run: |
2726
brew install coreutils
@@ -31,8 +30,8 @@ jobs:
3130
hdiutil create -type SPARSE -fs 'Case-sensitive Journaled HFS+' -size 16g -volname build build.dmg
3231
hdiutil create -type SPARSE -fs 'Case-sensitive Journaled HFS+' -size 1g -volname tools tools.dmg
3332
# Detach old if exists
34-
hdiutil detach /Volumes/build | true
35-
hdiutil detach /Volumes/tools | true
33+
hdiutil detach /Volumes/build -force | true
34+
hdiutil detach /Volumes/tools -force | true
3635
# Attach new
3736
hdiutil attach build.dmg.sparseimage
3837
hdiutil attach tools.dmg.sparseimage
@@ -41,7 +40,7 @@ jobs:
4140
run: |
4241
mkdir /Volumes/build/src
4342
cd ${{ matrix.target }}
44-
arch -arm64 ct-ng build
43+
ct-ng build
4544
- name: Archive Toolchain
4645
run: |
4746
cd /Volumes/tools
@@ -52,8 +51,8 @@ jobs:
5251
- name: Remove volumes
5352
if: ${{ always() }}
5453
run: |
55-
hdiutil detach /Volumes/build | true
56-
hdiutil detach /Volumes/tools | true
54+
hdiutil detach /Volumes/build -force | true
55+
hdiutil detach /Volumes/tools -force | true
5756
- name: Upload Toolchain
5857
uses: actions/upload-artifact@v2
5958
with:

0 commit comments

Comments
 (0)