From e0af727d765ee80b76075e6dc5a3f0228aff76a7 Mon Sep 17 00:00:00 2001 From: Sebastian Staacks Date: Sun, 8 Sep 2024 01:15:12 +0200 Subject: [PATCH 1/7] Automatically build normal and base video mode variant of firmware --- .github/workflows/main.yml | 16 ++++++++++++++-- 1 file changed, 14 insertions(+), 2 deletions(-) diff --git a/.github/workflows/main.yml b/.github/workflows/main.yml index e877872..05c1832 100644 --- a/.github/workflows/main.yml +++ b/.github/workflows/main.yml @@ -25,9 +25,21 @@ jobs: cmake .. -G Ninja -DPICO_SDK_PATH=../../pico-sdk ninja - name: 'Upload artifacts' - uses: actions/upload-artifact@v3 + uses: actions/upload-artifact@v4 with: name: firmware path: | ./firmware/build/gb_interceptor.* - retention-days: 7 + retention-days: 30 + - name: Build base video mode firmware + run: | + rm -rf * .* + cmake .. -G Ninja -DBASE_VIDEO_MODE -DPICO_SDK_PATH=../../pico-sdk + ninja + - name: 'Upload base video mode artifacts' + uses: actions/upload-artifact@v4 + with: + name: firmware_base_video_mode + path: | + ./firmware/build/gb_interceptor.* + retention-days: 30 From 0c2327525e89dc1a61545328760aebd897699245 Mon Sep 17 00:00:00 2001 From: Sebastian Staacks Date: Sun, 8 Sep 2024 01:18:44 +0200 Subject: [PATCH 2/7] Fix automatic build of base video mode executes rm in wrong directory --- .github/workflows/main.yml | 1 + 1 file changed, 1 insertion(+) diff --git a/.github/workflows/main.yml b/.github/workflows/main.yml index 05c1832..31c7b81 100644 --- a/.github/workflows/main.yml +++ b/.github/workflows/main.yml @@ -33,6 +33,7 @@ jobs: retention-days: 30 - name: Build base video mode firmware run: | + cd ./firmware/build rm -rf * .* cmake .. -G Ninja -DBASE_VIDEO_MODE -DPICO_SDK_PATH=../../pico-sdk ninja From b86897300c73ee93ffd14f0fda0a3b6112b667fc Mon Sep 17 00:00:00 2001 From: Sebastian Staacks Date: Sun, 8 Sep 2024 01:24:14 +0200 Subject: [PATCH 3/7] Fixing error of rm in automatic build --- .github/workflows/main.yml | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/.github/workflows/main.yml b/.github/workflows/main.yml index 31c7b81..941509b 100644 --- a/.github/workflows/main.yml +++ b/.github/workflows/main.yml @@ -34,7 +34,7 @@ jobs: - name: Build base video mode firmware run: | cd ./firmware/build - rm -rf * .* + rm -rf -- ..?* .[!.]* * cmake .. -G Ninja -DBASE_VIDEO_MODE -DPICO_SDK_PATH=../../pico-sdk ninja - name: 'Upload base video mode artifacts' From 1c87418631a450e7adb3bad313280c40f5137a47 Mon Sep 17 00:00:00 2001 From: Sebastian Staacks Date: Sun, 8 Sep 2024 01:32:23 +0200 Subject: [PATCH 4/7] Still trying to automatically build the base video mode variant --- .github/workflows/main.yml | 3 ++- 1 file changed, 2 insertions(+), 1 deletion(-) diff --git a/.github/workflows/main.yml b/.github/workflows/main.yml index 941509b..5427a32 100644 --- a/.github/workflows/main.yml +++ b/.github/workflows/main.yml @@ -35,7 +35,8 @@ jobs: run: | cd ./firmware/build rm -rf -- ..?* .[!.]* * - cmake .. -G Ninja -DBASE_VIDEO_MODE -DPICO_SDK_PATH=../../pico-sdk + export CXXFLAGS="-D_BASE_VIDEO_MODE=1 + cmake .. -G Ninja -DPICO_SDK_PATH=../../pico-sdk ninja - name: 'Upload base video mode artifacts' uses: actions/upload-artifact@v4 From d8b8f09cbefa259734723ce90a238b3f0b128586 Mon Sep 17 00:00:00 2001 From: Sebastian Staacks Date: Sun, 8 Sep 2024 01:35:06 +0200 Subject: [PATCH 5/7] There is a reason I am doing this in a seperate branch... --- .github/workflows/main.yml | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/.github/workflows/main.yml b/.github/workflows/main.yml index 5427a32..ac948b6 100644 --- a/.github/workflows/main.yml +++ b/.github/workflows/main.yml @@ -35,7 +35,7 @@ jobs: run: | cd ./firmware/build rm -rf -- ..?* .[!.]* * - export CXXFLAGS="-D_BASE_VIDEO_MODE=1 + export CXXFLAGS="-D_BASE_VIDEO_MODE=1" cmake .. -G Ninja -DPICO_SDK_PATH=../../pico-sdk ninja - name: 'Upload base video mode artifacts' From b48c39a2460c125e543093232fd841c5bbd4bdfd Mon Sep 17 00:00:00 2001 From: Sebastian Staacks Date: Sun, 8 Sep 2024 01:46:04 +0200 Subject: [PATCH 6/7] Update main.yml --- .github/workflows/main.yml | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/.github/workflows/main.yml b/.github/workflows/main.yml index ac948b6..87f411b 100644 --- a/.github/workflows/main.yml +++ b/.github/workflows/main.yml @@ -35,7 +35,7 @@ jobs: run: | cd ./firmware/build rm -rf -- ..?* .[!.]* * - export CXXFLAGS="-D_BASE_VIDEO_MODE=1" + export CFLAGS="-D_BASE_VIDEO_MODE=1" cmake .. -G Ninja -DPICO_SDK_PATH=../../pico-sdk ninja - name: 'Upload base video mode artifacts' From e6d3ff97ea4647566c0a82a80f7abb50608f84a7 Mon Sep 17 00:00:00 2001 From: Sebastian Staacks Date: Sun, 8 Sep 2024 01:51:04 +0200 Subject: [PATCH 7/7] Update main.yml --- .github/workflows/main.yml | 3 +-- 1 file changed, 1 insertion(+), 2 deletions(-) diff --git a/.github/workflows/main.yml b/.github/workflows/main.yml index 87f411b..cc66ccf 100644 --- a/.github/workflows/main.yml +++ b/.github/workflows/main.yml @@ -35,8 +35,7 @@ jobs: run: | cd ./firmware/build rm -rf -- ..?* .[!.]* * - export CFLAGS="-D_BASE_VIDEO_MODE=1" - cmake .. -G Ninja -DPICO_SDK_PATH=../../pico-sdk + cmake .. -G Ninja -DBASE_VIDEO_MODE=1 -DPICO_SDK_PATH=../../pico-sdk ninja - name: 'Upload base video mode artifacts' uses: actions/upload-artifact@v4