Skip to content

Commit f93373d

Browse files
committed
ci: Tweaking build scripts
1 parent 7f3da17 commit f93373d

File tree

10 files changed

+186
-174
lines changed

10 files changed

+186
-174
lines changed

.github/workflows/build_rust_binaries.yml

Lines changed: 6 additions & 6 deletions
Original file line numberDiff line numberDiff line change
@@ -1,4 +1,4 @@
1-
name: Build Rust binaries
1+
name: "Build"
22

33
on:
44
workflow_call:
@@ -18,14 +18,14 @@ on:
1818

1919
jobs:
2020
buildRustBinaries:
21-
name: "Build libpact_ffi binaries"
22-
runs-on: macos-14
21+
name: "🏗️ Build libpact_ffi.a"
22+
runs-on: macos-latest
2323
timeout-minutes: 60
2424
strategy:
2525
fail-fast: true
2626

2727
concurrency:
28-
group: build-macos14-binaries-${{ github.ref }}
28+
group: build-latest-binaries-${{ github.ref }}
2929
cancel-in-progress: true
3030

3131
steps:
@@ -44,7 +44,7 @@ jobs:
4444
restore-keys: |
4545
${{ inputs.cache-restore-key }}-${{ runner.os }}
4646
47-
- name: "🔍 Check if binaries exist in ${{ inputs.binaries-path }}"
47+
- name: "🔍 Check binaries in ${{ inputs.binaries-path }}"
4848
id: check_files
4949
uses: andstor/file-existence-action@v3
5050
with:
@@ -57,4 +57,4 @@ jobs:
5757
- name: "🎁 Build FFI binaries (skipping if cached)"
5858
if: steps.check_files.outputs.files_exists == 'false'
5959
run: |
60-
Support/build_rust_dependencies
60+
sh Support/build_rust_dependencies

.github/workflows/build_test.yml

Lines changed: 5 additions & 5 deletions
Original file line numberDiff line numberDiff line change
@@ -26,7 +26,7 @@ env:
2626

2727
jobs:
2828
sharedInputs:
29-
name: "Shared envs"
29+
name: "🔣 Shared envs"
3030
runs-on: ubuntu-latest
3131
outputs:
3232
rust-target-path: ${{ env.RUST_TARGET_PATH }}
@@ -38,7 +38,7 @@ jobs:
3838
- run: echo "Just a hacky workaround for passing envs to jobs expecting them... ¯\_(ツ)_/¯"
3939

4040
buildFFI:
41-
name: "Build FFI binaries"
41+
name: "📦 Dependencies"
4242
needs: [sharedInputs]
4343
uses: ./.github/workflows/build_rust_binaries.yml
4444
with:
@@ -48,17 +48,17 @@ jobs:
4848
cache-restore-key: ${{ needs.sharedInputs.outputs.cache-restore-key }}
4949

5050
testMacOS14:
51-
name: "Test on macOS 14"
51+
name: "🤖 Unit tests"
5252
needs: [sharedInputs, buildFFI]
53-
uses: ./.github/workflows/test_macos14_x86_64.yml
53+
uses: ./.github/workflows/test_macos14_arm64.yml
5454
with:
5555
rust-target-path: ${{ needs.sharedInputs.outputs.rust-target-path }}
5656
binaries-path: ${{ needs.sharedInputs.outputs.binaries-path }}
5757
cache-key: ${{ needs.sharedInputs.outputs.cache-key }}
5858
cache-restore-key: ${{ needs.sharedInputs.outputs.cache-restore-key }}
5959

6060
testMacOS13:
61-
name: "Test on macOS 13"
61+
name: "🤖 Unit tests"
6262
needs: [sharedInputs, buildFFI]
6363
uses: ./.github/workflows/test_macos13_x86_64.yml
6464
with:

.github/workflows/test_macos13_x86_64.yml

Lines changed: 3 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -1,4 +1,4 @@
1-
name: Test on macOS 13 (intel)
1+
name: "On macOS 13 (intel)"
22

33
on:
44
workflow_call:
@@ -18,7 +18,7 @@ on:
1818

1919
jobs:
2020
testMacOS13:
21-
name: "Testing on macOS 13 (x86_64)"
21+
name: "⚗️ macOS 13"
2222
runs-on: macos-13
2323

2424
strategy:
@@ -61,6 +61,6 @@ jobs:
6161
run: |
6262
sh Support/prepare_build_tools
6363
64-
- name: "⚗️ Run tests (Xcode)"
64+
- name: "⚗️ Run tests"
6565
run: |
6666
sh Support/build_test

.github/workflows/test_macos14_arm64.yml

Lines changed: 9 additions & 5 deletions
Original file line numberDiff line numberDiff line change
@@ -1,4 +1,4 @@
1-
name: Test on macOS 14 (silicon)
1+
name: "On macOS 14 (latest)"
22

33
on:
44
workflow_call:
@@ -18,8 +18,8 @@ on:
1818

1919
jobs:
2020
testMacOS14:
21-
name: "Testing on macOS 14 (arm64)"
22-
runs-on: macos-14-arm64
21+
name: "⚗️ macOS 14 (latest)"
22+
runs-on: macos-latest
2323

2424
strategy:
2525
fail-fast: true
@@ -35,7 +35,7 @@ jobs:
3535
DESTINATION: ${{ matrix.destination }}
3636

3737
concurrency:
38-
group: test-macos14_arm64-${{ github.ref }}-${{ matrix.scheme }}
38+
group: test-macos14-latest-${{ github.ref }}-${{ matrix.scheme }}
3939
cancel-in-progress: true
4040

4141
steps:
@@ -61,6 +61,10 @@ jobs:
6161
run: |
6262
sh Support/prepare_build_tools
6363
64-
- name: "⚗️ Run tests (Xcode)"
64+
- name: "⚗️ Run tests"
6565
run: |
6666
sh Support/build_test
67+
68+
- name: "⬆️ Upload code coverage"
69+
run: |
70+
bash <(curl -s https://codecov.io/bash) -J 'PactSwiftMockServer'

.github/workflows/test_macos14_x86_64.yml

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

0 commit comments

Comments
 (0)