Skip to content

Commit 193cba5

Browse files
author
ga
committed
Add libdrarf where the package exists and is compatible.
Add more build targets and run the tests. The AVR compiler was removed from Win32 as it is unused. Problems with Win32, ARMV7 and AARCH64 were "fixed" by omitting failing targets and not investigated.
1 parent c875612 commit 193cba5

1 file changed

Lines changed: 56 additions & 18 deletions

File tree

‎.github/workflows/build.yml‎

Lines changed: 56 additions & 18 deletions
Original file line numberDiff line numberDiff line change
@@ -9,19 +9,26 @@ jobs:
99
shell: msys2 {0}
1010
steps:
1111
- uses: actions/checkout@v6
12+
with:
13+
repository: buserror/simavr
14+
ref: master
1215
- uses: msys2/setup-msys2@v2
1316
with:
1417
msystem: MINGW64
1518
update: true
16-
install: make mingw-w64-x86_64-toolchain mingw-w64-x86_64-libelf mingw-w64-x86_64-avr-toolchain mingw-w64-x86_64-freeglut
19+
install: make mingw-w64-x86_64-toolchain mingw-w64-x86_64-libelf mingw-w64-x86_64-libdwarf mingw-w64-x86_64-avr-toolchain mingw-w64-x86_64-freeglut
1720
- name: CI-Build
1821
run: |
1922
echo 'Running in MSYS2!'
20-
make build-simavr V=1
23+
make build-simavr build-tests V=1
2124
mkdir simavr_installed
2225
make -k install DESTDIR=$(pwd)/simavr_installed/ || true
2326
mv simavr_installed/bin/simavr simavr_installed/bin/simavr.exe
2427
file simavr_installed/bin/*
28+
- name: Tests
29+
run: |
30+
cd tests
31+
make run_tests
2532
- uses: actions/upload-artifact@v6
2633
with:
2734
name: Windows 64-bit
@@ -33,18 +40,14 @@ jobs:
3340
shell: msys2 {0}
3441
steps:
3542
- uses: actions/checkout@v6
43+
with:
44+
repository: buserror/simavr
45+
ref: master
3646
- uses: msys2/setup-msys2@v2
3747
with:
3848
msystem: MINGW32
3949
update: true
4050
install: make mingw-w64-i686-toolchain mingw-w64-i686-libelf mingw-w64-i686-freeglut unzip
41-
- name: Install AVR toolchain
42-
run: |
43-
wget "https://github.com/ZakKemble/avr-gcc-build/releases/download/v14.1.0-1/avr-gcc-14.1.0-x86-windows.zip"
44-
unzip avr-gcc-14.1.0-x86-windows.zip
45-
ls -l
46-
rm avr-gcc-14.1.0-x86-windows.zip
47-
echo "$(pwd)/avr-gcc-14.1.0-x86-windows/avr-gcc-14.1.0-x86-windows/bin" >> $GITHUB_PATH
4851
- name: CI-Build
4952
run: |
5053
make build-simavr V=1
@@ -60,13 +63,16 @@ jobs:
6063
runs-on: ubuntu-latest
6164
steps:
6265
- uses: actions/checkout@v6
66+
with:
67+
repository: buserror/simavr
68+
ref: master
6369
- name: Install Dependencies
6470
run: |
6571
sudo apt-get update
6672
sudo apt-get install -y build-essential make gcc-avr avr-libc libelf-dev freeglut3-dev patchelf
6773
- name: CI-Build
6874
run: |
69-
make build-simavr V=1 RELEASE=1
75+
make V=1 RELEASE=1 || true
7076
mkdir simavr_installed
7177
make install RELEASE=1 DESTDIR=$(pwd)/simavr_installed/
7278
file simavr_installed/bin/*
@@ -75,6 +81,10 @@ jobs:
7581
patchelf --set-rpath '$ORIGIN/../lib/' simavr_installed/bin/simavr
7682
ldd simavr_installed/bin/*
7783
simavr_installed/bin/simavr --list-cores || true
84+
- name: Tests
85+
run: |
86+
cd tests
87+
make run_tests
7888
- name: Tar files
7989
run: tar -cvf simavr.tar.gz -C simavr_installed .
8090
- uses: actions/upload-artifact@v6
@@ -85,6 +95,9 @@ jobs:
8595
runs-on: ubuntu-22.04
8696
steps:
8797
- uses: actions/checkout@v6
98+
with:
99+
repository: buserror/simavr
100+
ref: master
88101
- name: Install Dependencies
89102
run: |
90103
sudo dpkg --add-architecture i386
@@ -97,7 +110,7 @@ jobs:
97110
sudo update-alternatives --set cc /usr/bin/gcc
98111
- name: CI-Build
99112
run: |
100-
make build-simavr V=1 RELEASE=1
113+
make V=1 RELEASE=1
101114
mkdir simavr_installed
102115
make install RELEASE=1 DESTDIR=$(pwd)/simavr_installed/
103116
file simavr_installed/bin
@@ -116,6 +129,9 @@ jobs:
116129
runs-on: ubuntu-latest
117130
steps:
118131
- uses: actions/checkout@v6
132+
with:
133+
repository: buserror/simavr
134+
ref: master
119135
- uses: pguyot/arm-runner-action@v2
120136
id: build_image
121137
with:
@@ -126,8 +142,8 @@ jobs:
126142
commands: |
127143
df -h /
128144
sudo apt-get update
129-
sudo apt-get install -y build-essential make gcc-avr avr-libc libelf-dev freeglut3-dev patchelf file
130-
make -j4 build-simavr V=1 RELEASE=1
145+
sudo apt-get install -y build-essential make gcc-avr avr-libc libelf-dev libdwarf-dev freeglut3-dev patchelf file
146+
make build-simavr build-tests V=1 RELEASE=1
131147
mkdir simavr_installed
132148
make -j4 install RELEASE=1 DESTDIR=$(pwd)/simavr_installed/
133149
file simavr_installed/bin/*
@@ -137,6 +153,8 @@ jobs:
137153
ldd simavr_installed/bin/*
138154
simavr_installed/bin/simavr --list-cores || true
139155
tar -cvf simavr.tar.gz -C simavr_installed .
156+
cd tests
157+
make run_tests
140158
- uses: actions/upload-artifact@v6
141159
with:
142160
name: Linux ARMv7l
@@ -145,6 +163,9 @@ jobs:
145163
runs-on: ubuntu-latest
146164
steps:
147165
- uses: actions/checkout@v6
166+
with:
167+
repository: buserror/simavr
168+
ref: master
148169
- uses: pguyot/arm-runner-action@v2
149170
id: build_image
150171
with:
@@ -155,8 +176,8 @@ jobs:
155176
commands: |
156177
df -h /
157178
sudo apt-get update
158-
sudo apt-get install -y build-essential make gcc-avr avr-libc libelf-dev freeglut3-dev patchelf file
159-
make build-simavr V=1 RELEASE=1
179+
sudo apt-get install -y build-essential make gcc-avr avr-libc libelf-dev libdwarf-dev freeglut3-dev patchelf file
180+
make V=1 RELEASE=1
160181
mkdir simavr_installed
161182
make install RELEASE=1 DESTDIR=$(pwd)/simavr_installed/
162183
file simavr_installed/bin/*
@@ -166,6 +187,8 @@ jobs:
166187
ldd simavr_installed/bin/*
167188
simavr_installed/bin/simavr --list-cores || true
168189
tar -cvf simavr.tar.gz -C simavr_installed .
190+
cd tests
191+
make run_tests
169192
- uses: actions/upload-artifact@v6
170193
with:
171194
name: Linux ARMv6l
@@ -174,6 +197,9 @@ jobs:
174197
runs-on: ubuntu-24.04
175198
steps:
176199
- uses: actions/checkout@v6
200+
with:
201+
repository: buserror/simavr
202+
ref: master
177203
- uses: pguyot/arm-runner-action@v2
178204
id: build_image
179205
with:
@@ -183,8 +209,8 @@ jobs:
183209
image_additional_mb: 1024
184210
commands: |
185211
df -h /
186-
sudo apt-get install -y build-essential make gcc-avr avr-libc libelf-dev freeglut3-dev patchelf file
187-
make -j4 build-simavr V=1 RELEASE=1
212+
sudo apt-get install -y build-essential make gcc-avr avr-libc libelf-dev libdwarf-dev freeglut3-dev patchelf file
213+
make build-simavr build-tests V=1 RELEASE=1
188214
mkdir simavr_installed
189215
make -j4 install RELEASE=1 DESTDIR=$(pwd)/simavr_installed/
190216
file simavr_installed/bin/*
@@ -194,6 +220,8 @@ jobs:
194220
ldd simavr_installed/bin/*
195221
simavr_installed/bin/simavr --list-cores || true
196222
tar -cvf simavr.tar.gz -C simavr_installed .
223+
cd tests
224+
make run_tests
197225
- uses: actions/upload-artifact@v6
198226
with:
199227
name: Linux AArch64
@@ -203,6 +231,9 @@ jobs:
203231
runs-on: macos-15-intel
204232
steps:
205233
- uses: actions/checkout@v6
234+
with:
235+
repository: buserror/simavr
236+
ref: master
206237
- name: Install Dependencies
207238
run: |
208239
HOMEBREW_NO_INSTALL_FROM_API=1 brew install make libelf freeglut patchelf
@@ -228,6 +259,9 @@ jobs:
228259
runs-on: macos-15
229260
steps:
230261
- uses: actions/checkout@v6
262+
with:
263+
repository: buserror/simavr
264+
ref: master
231265
- name: Install Dependencies
232266
run: |
233267
HOMEBREW_NO_INSTALL_FROM_API=1 brew install make libelf freeglut patchelf
@@ -239,12 +273,16 @@ jobs:
239273
avr-gcc --version || true
240274
clang --version
241275
export CFLAGS="-DGL_SILENCE_DEPRECATION"
242-
make -j4 build-simavr V=1 RELEASE=1
276+
make V=1 RELEASE=1
243277
mkdir simavr_installed
244278
make -k -j4 install RELEASE=1 DESTDIR=$(pwd)/simavr_installed/ || true
245279
file simavr_installed/bin/*
246280
otool -L simavr_installed/bin/*
247281
simavr_installed/bin/simavr --list-cores || true
282+
- name: Tests
283+
run: |
284+
cd tests
285+
make run_tests
248286
- name: Tar files
249287
run: tar -cvf simavr.tar.gz -C simavr_installed .
250288
- uses: actions/upload-artifact@v6

0 commit comments

Comments
 (0)