Skip to content

Commit 9440e61

Browse files
authored
Update CI, adding MacOS ARM
1 parent 0b5b97a commit 9440e61

File tree

1 file changed

+28
-18
lines changed

1 file changed

+28
-18
lines changed

.github/workflows/compilation.yml

Lines changed: 28 additions & 18 deletions
Original file line numberDiff line numberDiff line change
@@ -6,13 +6,18 @@ on:
66

77
jobs:
88
build:
9-
runs-on: ${{ matrix.os }}
9+
runs-on: ${{ matrix.os[0] }}
1010
strategy:
1111
matrix:
12-
os: [macos-latest, ubuntu-latest]
12+
os: [
13+
[macos-latest, arm64],
14+
[macos-13, x86_64],
15+
[ubuntu-latest, x86_64],
16+
[windows-latest, x86_64]
17+
]
1318

1419
steps:
15-
- uses: actions/checkout@v2
20+
- uses: actions/checkout@v4
1621

1722
- name: Compile native versions
1823
run: |
@@ -23,11 +28,11 @@ jobs:
2328
run: echo "::set-output name=sha8::$(echo ${GITHUB_SHA} | cut -c1-8)"
2429

2530
- name: Create tar archive (keep executable bit)
26-
run: tar -zcvf ps2client-${{ steps.slug.outputs.sha8 }}-${{matrix.os}}.tar.gz bin
31+
run: tar -zcvf ps2client-${{ steps.slug.outputs.sha8 }}-${{ matrix.os[0] }}-${{ matrix.os[1] }}.tar.gz bin
2732

28-
- uses: actions/upload-artifact@v2
33+
- uses: actions/upload-artifact@v4
2934
with:
30-
name: ps2client-${{ steps.slug.outputs.sha8 }}-${{matrix.os}}
35+
name: ps2client-${{ steps.slug.outputs.sha8 }}-${{ matrix.os[0] }}-${{ matrix.os[1] }}
3136
path: |
3237
*tar.gz
3338
@@ -36,7 +41,7 @@ jobs:
3641
container: dockcross/windows-static-x86:latest
3742

3843
steps:
39-
- uses: actions/checkout@v2
44+
- uses: actions/checkout@v4
4045

4146
- name: Compile windows version with cross-compilator
4247
run: |
@@ -47,11 +52,11 @@ jobs:
4752
run: echo "::set-output name=sha8::$(echo ${GITHUB_SHA} | cut -c1-8)"
4853

4954
- name: Create tar archive
50-
run: tar -zcvf ps2client-${{ steps.slug.outputs.sha8 }}-windows-latest.tar.gz bin
55+
run: tar -zcvf ps2client-${{ steps.slug.outputs.sha8 }}-windows-latest-x86_64.tar.gz bin
5156

52-
- uses: actions/upload-artifact@v2
57+
- uses: actions/upload-artifact@v4
5358
with:
54-
name: ps2client-${{ steps.slug.outputs.sha8 }}-windows-latest
59+
name: ps2client-${{ steps.slug.outputs.sha8 }}-windows-latest-x86_64
5560
path: |
5661
*tar.gz
5762
@@ -60,26 +65,31 @@ jobs:
6065
runs-on: ubuntu-latest
6166
if: startsWith(github.ref, 'refs/tags/v') || github.ref == 'refs/heads/master'
6267
steps:
63-
- uses: actions/checkout@v2
68+
- uses: actions/checkout@v4
6469

6570
- name: Get short SHA
6671
id: slug
6772
run: echo "::set-output name=sha8::$(echo ${GITHUB_SHA} | cut -c1-8)"
6873

69-
- name: Download Mac artifact
70-
uses: actions/download-artifact@v2
74+
- name: Download Mac x86_64 artifact
75+
uses: actions/download-artifact@v4
7176
with:
72-
name: ps2client-${{ steps.slug.outputs.sha8 }}-macos-latest
77+
name: ps2client-${{ steps.slug.outputs.sha8 }}-macos-13-x86_64
78+
79+
- name: Download Mac arm64 artifact
80+
uses: actions/download-artifact@v4
81+
with:
82+
name: ps2client-${{ steps.slug.outputs.sha8 }}-macos-latest-arm64
7383

7484
- name: Download Ubuntu artifact
75-
uses: actions/download-artifact@v2
85+
uses: actions/download-artifact@v4
7686
with:
77-
name: ps2client-${{ steps.slug.outputs.sha8 }}-ubuntu-latest
87+
name: ps2client-${{ steps.slug.outputs.sha8 }}-ubuntu-latest-x86_64
7888

7989
- name: Download Windows artifact
80-
uses: actions/download-artifact@v2
90+
uses: actions/download-artifact@v4
8191
with:
82-
name: ps2client-${{ steps.slug.outputs.sha8 }}-windows-latest
92+
name: ps2client-${{ steps.slug.outputs.sha8 }}-windows-latest-x86_64
8393

8494
- name: Create pre-release
8595
if: github.ref == 'refs/heads/master'

0 commit comments

Comments
 (0)