Skip to content

Commit a44a3a5

Browse files
committed
Fix CI build
1 parent db99167 commit a44a3a5

File tree

4 files changed

+22
-5
lines changed

4 files changed

+22
-5
lines changed

.github/workflows/build.yml

Lines changed: 15 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -13,11 +13,25 @@ jobs:
1313
PICO_EXTRAS_PATH: ${{github.workspace}}/pico/pico-extras
1414
OUTPUT_DIR: ${{github.workspace}}/binaries
1515
steps:
16+
# Act is a utility for testing github actions locally. Only run when in act.
17+
- name: Install Act dependencies
18+
if: ${{ env.ACT }}
19+
run: apt-get update && sudo apt-get install curl build-essential cmake -y
20+
1621
- name: Checkout repo with submodules
1722
uses: actions/checkout@v4
1823
with:
1924
submodules: recursive
2025

26+
- name: Set up Python
27+
uses: actions/setup-python@v5
28+
with:
29+
python-version: '3.13'
30+
cache: 'pip' # caching pip dependencies
31+
32+
- name: Install Python dependencies
33+
run: pip install sympy scipy more-itertools
34+
2135
- name: Install Arm GNU Toolchain (arm-none-eabi-gcc)
2236
uses: carlosperate/arm-none-eabi-gcc-action@v1
2337
with:
@@ -93,7 +107,7 @@ jobs:
93107
uses: open-watcom/setup-watcom@v0
94108
with:
95109
version: "2.0-64"
96-
tag: "2024-03-01-Build"
110+
tag: "2025-07-01-Build"
97111

98112
- name: Build pgusinit
99113
working-directory: ${{github.workspace}}/pgusinit

sw/CMakeLists.txt

Lines changed: 4 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -281,7 +281,10 @@ function(build_adlib TARGET_NAME MULTIFW)
281281
set(SOUND_OPL TRUE)
282282
config_target(${TARGET_NAME} ${MULTIFW})
283283
pico_set_program_name(${TARGET_NAME} "picogus-adlib")
284-
target_sources(${TARGET_NAME} PRIVATE sbplay.cpp)
284+
target_sources(${TARGET_NAME} PRIVATE
285+
sbplay.cpp
286+
audio_i2s_minimal.c
287+
)
285288
target_link_libraries(${TARGET_NAME} resampler)
286289
endfunction()
287290

sw/multifw/uf2create/CMakeLists.txt

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -1,4 +1,4 @@
1-
cmake_minimum_required(VERSION 3.29)
1+
cmake_minimum_required(VERSION 3.22)
22
project(uf2create)
33

44
set(CMAKE_C_STANDARD 11)

sw/sbplay.cpp

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -188,9 +188,9 @@ void play_adlib() {
188188
printf("opl_ratio: %x ", opl_ratio);
189189
uint32_t opl_pos = 0;
190190

191-
// Initialize OPL samples
192-
191+
#ifdef CDROM
193192
cd_fifo = cdrom_audio_fifo_peek(&cdrom);
193+
#endif
194194

195195
// Use the PWM peripheral to trigger an IRQ at 44100Hz
196196
#if !AUDIO_CALLBACK_CORE0

0 commit comments

Comments
 (0)