Skip to content

Commit c3abf60

Browse files
committed
Update macos action versions
1 parent c30e206 commit c3abf60

File tree

1 file changed

+26
-30
lines changed

1 file changed

+26
-30
lines changed

.github/workflows/build.yml

Lines changed: 26 additions & 30 deletions
Original file line numberDiff line numberDiff line change
@@ -45,65 +45,61 @@ jobs:
4545
binary: Simba-Linux
4646
#test: Simba-Linux MatchTemplateMask test fails, investigate later
4747

48-
- name: Mac
49-
runs-on: macos-13
50-
binary: Simba-Mac.dmg
51-
5248
- name: Mac Arm
5349
runs-on: macos-14
5450
binary: Simba-Mac-Arm.dmg
5551
#test: Simba MatchTemplateMask test fails, investigate later
52+
53+
# GitHub removing macos 13 causes this problem on newer runners:
54+
# "non-private labels cannot appear between .cfi_startproc / .cfi_endproc pairs"
55+
# Fixed in new FPC but that will never release... (sort of like this project xD)
56+
# Just comment out since x86 macos is quickly not existent in the year of 2025.
57+
# - name: Mac
58+
# runs-on: macos-13
59+
# binary: Simba-Mac.dmg
5660

5761
steps:
58-
- uses: actions/checkout@v4.2.2
62+
- uses: actions/checkout@v6.0.1
5963
with:
6064
submodules: true
6165

62-
- name: Install Lazarus (Mac)
63-
if: matrix.config.name == 'Mac'
64-
uses: ollydev/[email protected]
65-
with:
66-
laz-url: https://sourceforge.net/projects/lazarus/files/Lazarus%20macOS%20x86-64/Lazarus%204.0/lazarus-darwin-x86_64-4.0.zip
67-
fpc-url: |
68-
https://sourceforge.net/projects/lazarus/files/Lazarus%20macOS%20x86-64/Lazarus%204.0/fpc-3.2.2.intelarm64-macosx.dmg
69-
7066
- name: Install Lazarus (Mac Arm)
7167
if: matrix.config.name == 'Mac Arm'
72-
uses: ollydev/setup-lazarus@v3.5
68+
uses: ollydev/setup-lazarus@v3.6
7369
with:
74-
laz-url: https://sourceforge.net/projects/lazarus/files/Lazarus%20macOS%20aarch64/Lazarus%204.0/lazarus-darwin-aarch64-4.0.zip
70+
laz-url: https://sourceforge.net/projects/lazarus/files/Lazarus%20macOS%20aarch64/Lazarus%204.4/lazarus-darwin-aarch64-4.4.zip
7571
fpc-url: |
76-
https://sourceforge.net/projects/lazarus/files/Lazarus%20macOS%20aarch64/Lazarus%204.0/fpc-3.2.2.intelarm64-macosx.dmg
72+
https://sourceforge.net/projects/lazarus/files/Lazarus%20macOS%20aarch64/Lazarus%204.4/fpc-3.2.2.intelarm64-macosx.dmg
7773
7874
- name: Install Lazarus (Linux)
7975
if: matrix.config.name == 'Linux'
80-
uses: ollydev/setup-lazarus@v3.5
76+
uses: ollydev/setup-lazarus@v3.6
8177
with:
82-
laz-url: https://sourceforge.net/projects/lazarus/files/Lazarus%20Linux%20amd64%20DEB/Lazarus%204.0/lazarus-project_4.0.0-0_amd64.deb
78+
laz-url: https://sourceforge.net/projects/lazarus/files/Lazarus%20Linux%20amd64%20DEB/Lazarus%204.4/lazarus-project_4.4.0-0_amd64.deb
8379
fpc-url: |
84-
https://sourceforge.net/projects/lazarus/files/Lazarus%20Linux%20amd64%20DEB/Lazarus%204.0/fpc-laz_3.2.2-210709_amd64.deb
85-
https://sourceforge.net/projects/lazarus/files/Lazarus%20Linux%20amd64%20DEB/Lazarus%204.0/fpc-src_3.2.2-210709_amd64.deb
86-
80+
https://sourceforge.net/projects/lazarus/files/Lazarus%20Linux%20amd64%20DEB/Lazarus%204.4/fpc-laz_3.2.2-210709_amd64.deb
81+
https://sourceforge.net/projects/lazarus/files/Lazarus%20Linux%20amd64%20DEB/Lazarus%204.4/fpc-src_3.2.2-210709_amd64.deb
82+
8783
- name: Install Lazarus (Linux Arm)
8884
if: matrix.config.name == 'Linux Arm'
89-
uses: ollydev/setup-lazarus@v3.5
85+
uses: ollydev/setup-lazarus@v3.6
9086
with:
91-
laz-url: https://sourceforge.net/projects/lazarus/files/Lazarus%20Linux%20arm64%20DEB/Lazarus%204.0/lazarus-project_4.0.0-0_arm64.deb
87+
laz-url: https://sourceforge.net/projects/lazarus/files/Lazarus%20Linux%20arm64%20DEB/Lazarus%204.4/lazarus-project_4.4.0-0_arm64.deb
9288
fpc-url: |
93-
https://sourceforge.net/projects/lazarus/files/Lazarus%20Linux%20arm64%20DEB/Lazarus%204.0/fpc-laz_3.2.3-240813_arm64.deb
94-
https://sourceforge.net/projects/lazarus/files/Lazarus%20Linux%20arm64%20DEB/Lazarus%204.0/fpc-src_3.2.3-240813_arm64.deb
89+
https://sourceforge.net/projects/lazarus/files/Lazarus%20Linux%20arm64%20DEB/Lazarus%204.4/fpc-laz_3.2.3-240813_arm64.deb
90+
https://sourceforge.net/projects/lazarus/files/Lazarus%20Linux%20arm64%20DEB/Lazarus%204.4/fpc-src_3.2.3-240813_arm64.deb
9591
9692
- name: Install Lazarus (Win32)
9793
if: startsWith(matrix.config.name, 'Win32') == true
98-
uses: ollydev/setup-lazarus@v3.5
94+
uses: ollydev/setup-lazarus@v3.6
9995
with:
100-
laz-url: https://sourceforge.net/projects/lazarus/files/Lazarus%20Windows%2032%20bits/Lazarus%204.0/lazarus-4.0-fpc-3.2.2-win32.exe
96+
laz-url: https://sourceforge.net/projects/lazarus/files/Lazarus%20Windows%2032%20bits/Lazarus%204.4/lazarus-4.4-fpc-3.2.2-win32.exe
10197

10298
- name: Install Lazarus (Win64)
10399
if: startsWith(matrix.config.name, 'Win64') == true
104-
uses: ollydev/setup-lazarus@v3.5
100+
uses: ollydev/setup-lazarus@v3.6
105101
with:
106-
laz-url: https://sourceforge.net/projects/lazarus/files/Lazarus%20Windows%2064%20bits/Lazarus%204.0/lazarus-4.0-fpc-3.2.2-win64.exe
102+
laz-url: https://sourceforge.net/projects/lazarus/files/Lazarus%20Windows%2064%20bits/Lazarus%204.4/lazarus-4.4-fpc-3.2.2-win64.exe
107103

108104
- name: Build Simba
109105
run: |
@@ -132,7 +128,7 @@ jobs:
132128
./${{ matrix.config.test }} --run "Tests/RunTests/tester.simba"
133129
134130
- name: Upload Simba Binary
135-
uses: actions/upload-artifact@v4.6.1
131+
uses: actions/upload-artifact@v6.0.0
136132
with:
137133
name: ${{ matrix.config.name }}
138134
path: ${{ matrix.config.binary }}

0 commit comments

Comments
 (0)