Skip to content

Commit d7df022

Browse files
ollydevollydev
committed
Add Linux arm64 build
1 parent e7d60a1 commit d7df022

File tree

3 files changed

+23
-9
lines changed

3 files changed

+23
-9
lines changed

‎.github/workflows/archive.yml

Lines changed: 2 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -50,7 +50,7 @@ jobs:
5050
branch=${{ github.event.workflow_run.head_branch }}
5151
sha=${{ github.event.workflow_run.head_sha }}
5252
commit=${sha::10}
53-
echo "$date_year/$date_month_day | $branch | [$commit](https://github.com/Villavu/Simba/commit/$commit) | [Win32](/$date_year/$date_month_day%20$branch%20$commit/Win32.zip?raw=true) - [Win64](/$date_year/$date_month_day%20$branch%20$commit/Win64.zip?raw=true) - [Win64&nbsp;Debug](/$date_year/$date_month_day%20$branch%20$commit/Win64%20DebugInfo.zip?raw=true)<br>[Mac](/$date_year/$date_month_day%20$branch%20$commit/Mac.zip?raw=true) - [Mac Arm](/$date_year/$date_month_day%20$branch%20$commit/Mac%20Arm.zip?raw=true)<br>[Linux64](/$date_year/$date_month_day%20$branch%20$commit/Linux64.zip?raw=true)" > row.txt
53+
echo "$date_year/$date_month_day | $branch | [$commit](https://github.com/Villavu/Simba/commit/$commit) | [Win32](/$date_year/$date_month_day%20$branch%20$commit/Win32.zip?raw=true) - [Win64](/$date_year/$date_month_day%20$branch%20$commit/Win64.zip?raw=true) - [Win64&nbsp;Debug](/$date_year/$date_month_day%20$branch%20$commit/Win64%20DebugInfo.zip?raw=true)<br>[Mac](/$date_year/$date_month_day%20$branch%20$commit/Mac.zip?raw=true) - [Mac Arm](/$date_year/$date_month_day%20$branch%20$commit/Mac%20Arm.zip?raw=true)<br>[Linux64](/$date_year/$date_month_day%20$branch%20$commit/Linux64.zip?raw=true) - [Linux64](/$date_year/$date_month_day%20$branch%20$commit/Linux%20Arm.zip?raw=true)" > row.txt
5454
5555
cd Simba-Build-Archive
5656
mkdir -p "$date_year/$date_month_day $branch $commit"
@@ -64,6 +64,7 @@ jobs:
6464
echo "https://github.com/Villavu/Simba-Build-Archive/blob/main/$date_year/$date_month_day%20$branch%20$commit/Win64.zip?raw=true" > latest.win64
6565
echo "https://github.com/Villavu/Simba-Build-Archive/blob/main/$date_year/$date_month_day%20$branch%20$commit/Win64%20DebugInfo.zip?raw=true" > latest.win64debuginfo
6666
echo "https://github.com/Villavu/Simba-Build-Archive/blob/main/$date_year/$date_month_day%20$branch%20$commit/Linux64.zip?raw=true" > latest.linux64
67+
echo "https://github.com/Villavu/Simba-Build-Archive/blob/main/$date_year/$date_month_day%20$branch%20$commit/Linux%20Arm.zip?raw=true" > latest.linuxarm
6768
echo "https://github.com/Villavu/Simba-Build-Archive/blob/main/$date_year/$date_month_day%20$branch%20$commit/Mac.zip?raw=true" > latest.mac
6869
echo "https://github.com/Villavu/Simba-Build-Archive/blob/main/$date_year/$date_month_day%20$branch%20$commit/Mac%20Arm.zip?raw=true" > latest.macarm
6970

‎.github/workflows/build.yml

Lines changed: 17 additions & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -35,15 +35,19 @@ jobs:
3535
binary: Simba-Win32.exe
3636
test: Simba-Win32.exe
3737

38-
- name: Linux64
38+
- name: Linux
3939
runs-on: ubuntu-22.04
4040
binary: Simba-Linux64
4141
test: Simba-Linux64
42-
42+
43+
- name: Linux Arm
44+
runs-on: ubuntu-22.04-arm
45+
binary: Simba-Linux
46+
#test: Simba-Linux MatchTemplateMask test fails, investigate later
47+
4348
- name: Mac
4449
runs-on: macos-13
4550
binary: Simba-Mac.dmg
46-
test: Simba
4751

4852
- name: Mac Arm
4953
runs-on: macos-14
@@ -72,14 +76,23 @@ jobs:
7276
https://sourceforge.net/projects/lazarus/files/Lazarus%20macOS%20aarch64/Lazarus%204.0/fpc-3.2.2.intelarm64-macosx.dmg
7377
7478
- name: Install Lazarus (Linux)
75-
if: startsWith(matrix.config.name, 'Linux') == true
79+
if: matrix.config.name == 'Linux'
7680
uses: ollydev/setup-lazarus@v3.5
7781
with:
7882
laz-url: https://sourceforge.net/projects/lazarus/files/Lazarus%20Linux%20amd64%20DEB/Lazarus%204.0/lazarus-project_4.0.0-0_amd64.deb
7983
fpc-url: |
8084
https://sourceforge.net/projects/lazarus/files/Lazarus%20Linux%20amd64%20DEB/Lazarus%204.0/fpc-laz_3.2.2-210709_amd64.deb
8185
https://sourceforge.net/projects/lazarus/files/Lazarus%20Linux%20amd64%20DEB/Lazarus%204.0/fpc-src_3.2.2-210709_amd64.deb
8286
87+
- name: Install Lazarus (Linux Arm)
88+
if: matrix.config.name == 'Linux Arm'
89+
uses: ollydev/setup-lazarus@v3.5
90+
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
92+
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
95+
8396
- name: Install Lazarus (Win32)
8497
if: startsWith(matrix.config.name, 'Win32') == true
8598
uses: ollydev/setup-lazarus@v3.5

‎Source/Simba.lpi

Lines changed: 4 additions & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -191,7 +191,7 @@
191191
</Other>
192192
</CompilerOptions>
193193
</Item4>
194-
<Item5 Name="Linux64">
194+
<Item5 Name="Linux">
195195
<CompilerOptions>
196196
<Version Value="11"/>
197197
<Target>
@@ -239,7 +239,7 @@
239239
</Other>
240240
</CompilerOptions>
241241
</Item5>
242-
<Item6 Name="Linux64 DebugInfo">
242+
<Item6 Name="Linux DebugInfo">
243243
<CompilerOptions>
244244
<Version Value="11"/>
245245
<Target>
@@ -280,11 +280,11 @@
280280
</Other>
281281
</CompilerOptions>
282282
</Item6>
283-
<Item7 Name="Linux Arm64">
283+
<Item7 Name="Linux Arm">
284284
<CompilerOptions>
285285
<Version Value="11"/>
286286
<Target>
287-
<Filename Value="../Simba-Linux-AArch64"/>
287+
<Filename Value="../Simba-Linux"/>
288288
</Target>
289289
<SearchPaths>
290290
<IncludeFiles Value="$(ProjOutDir);$(LazarusDir)/components/synedit;../Third-Party/lape"/>

0 commit comments

Comments
 (0)