Skip to content

Commit b4071d1

Browse files
fix setup-php-extension for mac
Signed-off-by: James Xin <[email protected]>
1 parent f1dbbf3 commit b4071d1

File tree

2 files changed

+18
-14
lines changed

2 files changed

+18
-14
lines changed

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

Lines changed: 17 additions & 14 deletions
Original file line numberDiff line numberDiff line change
@@ -22,13 +22,22 @@ inputs:
2222
- aarch64-apple-darwin
2323
- aarch64-unknown-linux-musl
2424
- x86_64-unknown-linux-musl
25+
os:
26+
description: "The current operating system"
27+
required: true
28+
type: string
29+
options:
30+
- amazon-linux
31+
- macos
32+
- ubuntu
2533

2634
runs:
2735
using: composite
2836
steps:
2937
- name: Install shared dependencies
3038
uses: ./.github/workflows/install-shared-dependencies
3139
with:
40+
os: ${{ inputs.os }}
3241
target: ${{ inputs.target }}
3342
github-token: ${{ github.token }}
3443
engine-version: "7.2.5"
@@ -40,7 +49,8 @@ runs:
4049
extensions: none
4150
tools: pie, jq
4251

43-
- name: Install system dependencies
52+
- name: Install system dependencies for Ubuntu
53+
if: inputs.os == 'ubuntu'
4454
shell: bash
4555
env:
4656
PHP_VERSION: ${{ inputs.php-version }}
@@ -51,20 +61,13 @@ runs:
5161
"php${PHP_VERSION}-curl" \
5262
"php${PHP_VERSION}-xml" \
5363
build-essential \
54-
autoconf \
55-
automake \
56-
libtool \
57-
pkg-config \
58-
libssl-dev \
59-
clang-format \
60-
protobuf-c-compiler \
61-
libprotobuf-c-dev \
62-
libprotobuf-c1
64+
clang-format
6365
64-
- name: Install Rust and protoc
65-
uses: ./.github/workflows/install-rust-and-protoc
66-
with:
67-
github-token: ${{ github.token }}
66+
- name: Install system dependencies for macOS
67+
if: inputs.os == 'macos'
68+
shell: bash
69+
run: |
70+
brew install clang-format
6871
6972
- name: Install cbindgen
7073
shell: bash

.github/workflows/test-pie.yml

Lines changed: 1 addition & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -59,6 +59,7 @@ jobs:
5959
php-version: ${{ matrix.php }}
6060
install-composer-deps: "true"
6161
target: ${{ matrix.host.TARGET }}
62+
os: ${{ matrix.host.OS }}
6263

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

0 commit comments

Comments
 (0)