Skip to content

Commit 9b57880

Browse files
Correct the name of the GitHub Actions jobs and make sure to test all static/shared combinations (#216)
* ci: Rename Linux jobs correctly. The shared job should not disable pkg-config usage and should be the one that does a Harfbuzz build. The static job should disable pkg-config and should not do its own Harfbuzz build outside of the `harfbuzz-sys` build scripts. This is a precursor to making sure things are actually set up correctly and clearly doing the appropriate thing. * ci: macOS-shared: Use harfbuzz from homebrew. This is an experiment to see if we're able to pick it up from pkg-config.
1 parent 4720a85 commit 9b57880

File tree

1 file changed

+32
-4
lines changed

1 file changed

+32
-4
lines changed

.github/workflows/main.yml

Lines changed: 32 additions & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -10,11 +10,9 @@ on:
1010

1111

1212
jobs:
13-
linux-ci-static:
13+
linux-ci-shared:
1414
name: stable, Linux, shared library
1515
runs-on: ubuntu-latest
16-
env:
17-
HARFBUZZ_SYS_NO_PKG_CONFIG: 1
1816
steps:
1917
- uses: actions/checkout@v3
2018

@@ -47,7 +45,7 @@ jobs:
4745
env:
4846
RUST_BACKTRACE: 1
4947

50-
linux-ci-shared:
48+
linux-ci-static:
5149
name: stable, Linux, static linking, no pkg-config
5250
runs-on: ubuntu-latest
5351
env:
@@ -76,6 +74,35 @@ jobs:
7674
name: stable, macOS, shared library
7775
runs-on: macos-latest
7876

77+
steps:
78+
- uses: actions/checkout@v3
79+
80+
- name: install harfbuzz from homebrew
81+
run: |
82+
brew install harfbuzz
83+
84+
- name: Install stable toolchain
85+
uses: dtolnay/rust-toolchain@stable
86+
with:
87+
components: rustfmt
88+
89+
- name: Cargo fmt
90+
run: cargo fmt --all -- --check
91+
92+
- name: Cargo build
93+
run: cargo build --workspace
94+
95+
- name: Cargo test
96+
run: cargo test --workspace
97+
env:
98+
RUST_BACKTRACE: 1
99+
100+
mac-ci-static:
101+
name: stable, macOS, static library
102+
runs-on: macos-latest
103+
env:
104+
HARFBUZZ_SYS_NO_PKG_CONFIG: 1
105+
79106
steps:
80107
- uses: actions/checkout@v3
81108

@@ -120,6 +147,7 @@ jobs:
120147
- "linux-ci-static"
121148
- "linux-ci-shared"
122149
- "mac-ci-shared"
150+
- "mac-ci-static"
123151
- "windows-ci"
124152

125153
steps:

0 commit comments

Comments
 (0)