Skip to content

Commit f1dbbf3

Browse files
CI: test-pie CI on mac 2nd fix
Signed-off-by: James Xin <[email protected]>
1 parent 0f6de97 commit f1dbbf3

File tree

3 files changed

+16
-2
lines changed

3 files changed

+16
-2
lines changed

.github/workflows/php.yml

Lines changed: 2 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -219,7 +219,8 @@ jobs:
219219
- name: Install shared dependencies
220220
uses: ./.github/workflows/install-shared-dependencies
221221
with:
222-
target: x86_64-apple-darwin
222+
# "macos-latest" is actually an ARM runner, hence using the ARM target for mac here
223+
target: aarch64-apple-darwin
223224
github-token: ${{ secrets.GITHUB_TOKEN }}
224225
engine-version: ${{ matrix.engine.version }}
225226

.github/workflows/setup-php-extension/action.yml

Lines changed: 13 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -10,14 +10,26 @@ inputs:
1010
description: Whether to install composer dependencies
1111
required: false
1212
default: "true"
13+
target:
14+
description: "Specified target for rust toolchain, ex. x86_64-apple-darwin"
15+
type: string
16+
required: false
17+
defalt: "x86_64-unknown-linux-gnu"
18+
options:
19+
- x86_64-unknown-linux-gnu
20+
- aarch64-unknown-linux-gnu
21+
- x86_64-apple-darwin
22+
- aarch64-apple-darwin
23+
- aarch64-unknown-linux-musl
24+
- x86_64-unknown-linux-musl
1325

1426
runs:
1527
using: composite
1628
steps:
1729
- name: Install shared dependencies
1830
uses: ./.github/workflows/install-shared-dependencies
1931
with:
20-
target: x86_64-unknown-linux-gnu
32+
target: ${{ inputs.target }}
2133
github-token: ${{ github.token }}
2234
engine-version: "7.2.5"
2335

.github/workflows/test-pie.yml

Lines changed: 1 addition & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -58,6 +58,7 @@ jobs:
5858
with:
5959
php-version: ${{ matrix.php }}
6060
install-composer-deps: "true"
61+
target: ${{ matrix.host.TARGET }}
6162

6263
- name: Create manual Composer repository
6364
run: |

0 commit comments

Comments
 (0)