Skip to content

Commit 97c2ace

Browse files
committed
add workflows for arm and intel
1 parent 216f89e commit 97c2ace

1 file changed

Lines changed: 20 additions & 20 deletions

File tree

.github/workflows/build_osx.yml

Lines changed: 20 additions & 20 deletions
Original file line numberDiff line numberDiff line change
@@ -1,19 +1,3 @@
1-
# Copyright (C) 2022 André Pedersen
2-
# Copyright (C) 2022 Abraham George Smith
3-
4-
#This program is free software: you can redistribute it and/or modify
5-
#it under the terms of the GNU General Public License as published by
6-
#the Free Software Foundation, either version 3 of the License, or
7-
#(at your option) any later version.
8-
9-
#This program is distributed in the hope that it will be useful,
10-
#but WITHOUT ANY WARRANTY; without even the implied warranty of
11-
#MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the
12-
#GNU General Public License for more details.
13-
14-
#You should have received a copy of the GNU General Public License
15-
#along with this program. If not, see <https://www.gnu.org/licenses/>.
16-
171
name: Build OSX
182

193
on:
@@ -26,12 +10,22 @@ on:
2610

2711
jobs:
2812
build:
29-
runs-on: macos-14
13+
strategy:
14+
fail-fast: false
15+
matrix:
16+
include:
17+
- os: macos-14
18+
arch: arm64
19+
- os: macos-15-intel
20+
arch: x86_64
21+
22+
runs-on: ${{ matrix.os }}
3023

3124
steps:
3225
- uses: actions/checkout@v4
26+
3327
- name: Set up Python '3.11'
34-
uses: actions/setup-python@v4
28+
uses: actions/setup-python@v5
3529
with:
3630
python-version: '3.11'
3731

@@ -56,9 +50,15 @@ jobs:
5650
cd painter
5751
pkgbuild --component dist/RootPainter.app --install-location /Applications dist/RootPainter.pkg
5852
53+
- name: Rename package with arch
54+
run: |
55+
cd painter/dist
56+
mv RootPainter.pkg RootPainter-${{ matrix.arch }}.pkg
57+
5958
- name: Upload package
6059
uses: actions/upload-artifact@v4
6160
with:
62-
name: Package
63-
path: ${{github.workspace}}/painter/dist/RootPainter.pkg
61+
name: Package-${{ matrix.arch }}
62+
path: ${{github.workspace}}/painter/dist/RootPainter-${{ matrix.arch }}.pkg
6463
if-no-files-found: error
64+

0 commit comments

Comments
 (0)