Skip to content

Commit ccb90b5

Browse files
committed
[CI] Add mac build step
1 parent fa6b547 commit ccb90b5

File tree

2 files changed

+70
-14
lines changed

2 files changed

+70
-14
lines changed
Lines changed: 28 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,28 @@
1+
name: vcpkg-export
2+
inputs:
3+
export-type:
4+
description: 'Either raw or 7zip'
5+
required: true
6+
output-name:
7+
required: true
8+
runs:
9+
using: 'composite'
10+
steps:
11+
- name: Export installed vcpkg packages
12+
run: >
13+
vcpkg export
14+
--x-all-installed
15+
--raw
16+
--output-dir ./
17+
--output ${{ inputs.output-name }}
18+
if: ${{ inputs.export-type == 'raw' }}
19+
shell: bash
20+
- name: Export installed vcpkg packages
21+
run: >
22+
vcpkg export
23+
--x-all-installed
24+
--7zip
25+
--output-dir ./
26+
--output ${{ inputs.output-name }}
27+
if: ${{ inputs.export-type == '7zip' }}
28+
shell: bash

.github/workflows/build.yaml

Lines changed: 42 additions & 14 deletions
Original file line numberDiff line numberDiff line change
@@ -9,6 +9,32 @@ env:
99
VCPKG_REVISION: 137197a8f85e6c6cf1843ef024af7d9c28bb0bde
1010

1111
jobs:
12+
macos:
13+
runs-on: macos-latest
14+
env:
15+
triplet: arm64-osx
16+
steps:
17+
- uses: actions/checkout@v4
18+
- name: Export GitHub Actions cache environment variables
19+
uses: actions/github-script@v6
20+
with:
21+
script: |
22+
core.exportVariable('ACTIONS_CACHE_URL', process.env.ACTIONS_CACHE_URL || '');
23+
core.exportVariable('ACTIONS_RUNTIME_TOKEN', process.env.ACTIONS_RUNTIME_TOKEN || '');
24+
- uses: ./.github/actions/vcpkg-setup
25+
- name: Install vcpkg packages
26+
run: vcpkg install --overlay-ports=ports --overlay-triplets=triplets --triplet ${{ env.triplet }}
27+
- uses: ./.github/actions/vcpkg-export
28+
with:
29+
output-name: vcpkg-${{ env.triplet }}-${{ github.sha }}
30+
export-type: 7zip
31+
32+
- name: Store exported vcpkg packages
33+
uses: actions/upload-artifact@v4
34+
with:
35+
name: vcpkg-${{ env.triplet }}-${{ github.sha }}
36+
path: ${{ github.workspace }}/vcpkg-${{ env.triplet }}-${{ github.sha }}.7z
37+
1238
static-windows:
1339
strategy:
1440
fail-fast: true
@@ -39,13 +65,10 @@ jobs:
3965
run: >
4066
vcpkg install --overlay-ports=ports --overlay-triplets=triplets --host-triplet ${{ matrix.msvc_version.triplet }} --triplet ${{ matrix.msvc_version.triplet }}
4167
42-
- name: Export installed vcpkg packages
43-
run: >
44-
vcpkg export
45-
--x-all-installed
46-
--raw
47-
--output-dir ${{ github.workspace }}
48-
--output intermediate
68+
- uses: ./.github/actions/vcpkg-export
69+
with:
70+
output-name: intermediate
71+
export-type: raw
4972

5073
- name: Move pdb files
5174
working-directory: '${{ github.workspace }}/intermediate'
@@ -105,13 +128,10 @@ jobs:
105128
run: >
106129
vcpkg install --overlay-ports=ports --overlay-triplets=triplets --host-triplet ${{ matrix.msvc_version.triplet }} --triplet ${{ matrix.msvc_version.triplet }}
107130
108-
- name: Export installed vcpkg packages
109-
run: >
110-
vcpkg export
111-
--x-all-installed
112-
--raw
113-
--output-dir ${{ github.workspace }}
114-
--output intermediate
131+
- uses: ./.github/actions/vcpkg-export
132+
with:
133+
output-name: intermediate
134+
export-type: raw
115135

116136
- name: Move pdb files
117137
working-directory: '${{ github.workspace }}/intermediate'
@@ -160,6 +180,7 @@ jobs:
160180
upload-deps:
161181
needs:
162182
- dynamic-windows
183+
- macos
163184

164185
runs-on: ubuntu-latest
165186

@@ -188,6 +209,7 @@ jobs:
188209
mv vcpkg-x64-*-${{ github.sha }}/vcpkg-x64-windows-2022-${{ github.sha }}.7z vcpkg-x64-windows-2022-${{ env.file }}.7z
189210
mv vcpkg-x64-*-${{ github.sha }}/vcpkg-x64-windows-2019-pdb-${{ github.sha }}.7z vcpkg-x64-windows-2019-pdb-${{ env.file }}.7z
190211
mv vcpkg-x64-*-${{ github.sha }}/vcpkg-x64-windows-2022-pdb-${{ github.sha }}.7z vcpkg-x64-windows-2022-pdb-${{ env.file }}.7z
212+
mv vcpkg-arm64-osx-${{ github.sha }}/vcpkg-arm64-osx-${{ github.sha }}.7z vcpkg-arm64-osx-${{ env.file }}.7z
191213
192214
- name: Release
193215
if: startsWith(github.ref, 'refs/tags/')
@@ -254,6 +276,11 @@ jobs:
254276
file-pattern: vcpkg-x64-windows-*-${{ env.file }}
255277
subdirectory: windows
256278

279+
- uses: ./.github/actions/manifest-setup
280+
with:
281+
file-pattern: vcpkg-arm64-osx-*-${{ env.file }}
282+
subdirectory: macos
283+
257284
- name: Generate commit message
258285
env:
259286
GH_TOKEN: ${{ github.token }}
@@ -271,6 +298,7 @@ jobs:
271298
run: |
272299
git checkout -b vcpkg-${{ github.sha }}
273300
git add windows/vcpkg-*-manifest.txt
301+
git add macos/vcpkg-*-manifest.txt
274302
git commit -F commit_message.txt
275303
276304
- name: Verify commit to openmw-deps repository

0 commit comments

Comments
 (0)