Skip to content

Fix CI after release 0.9.18 #1673

New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Open
ppigazzini wants to merge 4 commits into
base: stable
Choose a base branch
from
Open

Fix CI after release 0.9.18 #1673

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
4 commits
Select commit Hold shift + click to select a range
adae2cf
fix(ci): use libsystre in Windows packaging
ppigazzini Apr 13, 2026
e032eee
fix(wasm): bootstrap recorder and host tools correctly
ppigazzini Apr 13, 2026
26541e4
fix(ci): package db50x Windows simulator from the correct path
ppigazzini Apr 13, 2026
f132c8c
fix(ci): keep Android AABs under android/
ppigazzini Apr 15, 2026
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
17 changes: 9 additions & 8 deletions .github/workflows/README.md
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -6,7 +6,8 @@ This directory contains GitHub Actions workflows for automated building and test

### build.yml

Main build workflow that runs on every push and pull request to main/master/develop branches.
Main build workflow that runs on pushes and pull requests for the `stable` and
`dev` branches, plus manual dispatches, published releases, and version tags.

#### Jobs

Expand All @@ -28,8 +29,8 @@ Main build workflow that runs on every push and pull request to main/master/deve

3. **build-simulator-windows** - Builds the Windows simulator
- Platform: Windows (latest)
- Requirements: Qt 6.7.3 (includes MinGW 9.0), MSYS2 (FreeType, pkg-config)
- Target: `mingw32-make sim`
- Requirements: MSYS2 MinGW64 with Qt 6 packages, `libsystre`, FreeType, and `pkg-config`
- Target: `mingw32-make debug-sim`
- Build ID: Uses GitHub Actions run number
- Artifacts: `db48x.exe`, DLLs, help files

Expand All @@ -51,8 +52,8 @@ Main build workflow that runs on every push and pull request to main/master/deve

6. **build-color-simulator-windows** - Builds the color DM32 simulator for Windows
- Platform: Windows (latest)
- Requirements: Qt 6.7.3 (includes MinGW 9.0), MSYS2 (FreeType, pkg-config)
- Target: `mingw32-make color-dm32-sim`
- Requirements: MSYS2 MinGW64 with Qt 6 packages, `libsystre`, FreeType, and `pkg-config`
- Target: `mingw32-make debug-color-dm32-sim`
- Build ID: Uses GitHub Actions run number
- Artifacts: `db50x.exe`, DLLs, help files

Expand Down Expand Up @@ -96,9 +97,9 @@ Main build workflow that runs on every push and pull request to main/master/deve
- Artifacts: Distribution tarball (`db50x-v*.tgz`) with `.pg5`, `_qspi.bin`, help files

12. **build-release-package** - Creates release packages
- Runs only on pushes to main/master
- Depends on all other build jobs
- Creates `.tar.gz` archives of firmware builds
- Runs only for version-tag pushes
Copy link

Copilot AI Apr 16, 2026

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

The README says build-release-package “runs only for version-tag pushes”, but in build.yml that job currently runs on branch pushes (stable/dev) and does not run on tag pushes. Please align this documentation with the actual workflow trigger/if: condition to avoid misleading maintainers.

Suggested change
- Runs only for version-tag pushes
- Runs for `stable`/`dev` branch pushes (not for version-tag pushes)

Copilot uses AI. Check for mistakes.
- Depends on all other build jobs
- Creates `.tar.gz` archives of firmware builds

## Code Signing

Expand Down
65 changes: 42 additions & 23 deletions .github/workflows/build.yml
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -133,18 +133,18 @@ jobs:
mingw-w64-x86_64-make
mingw-w64-x86_64-freetype
mingw-w64-x86_64-pkg-config
mingw-w64-x86_64-libgnurx
mingw-w64-x86_64-libsystre
mingw-w64-x86_64-qt6-base
mingw-w64-x86_64-qt6-declarative
mingw-w64-x86_64-qt6-multimedia
mingw-w64-x86_64-qt6-translations
mingw-w64-x86_64-qt6-tools

- name: Build simulator
- name: Build debug simulator
shell: msys2 {0}
run: |
echo "${{ github.run_number }}" > .build_id
mingw32-make sim
mingw32-make debug-sim
Copy link

Copilot AI Apr 16, 2026

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

mingw32-make debug-sim does not appear to be a valid top-level make target in this repo (the Makefile documents/implements sim-<target> e.g. sim-debug). As-is, this job likely fails with “No rule to make target 'debug-sim'”. Use the existing target naming convention (e.g. mingw32-make sim-debug) or add a corresponding alias target in the Makefile.

Suggested change
mingw32-make debug-sim
mingw32-make sim-debug

Copilot uses AI. Check for mistakes.

- name: Deploy Qt dependencies
shell: msys2 {0}
Expand All @@ -154,7 +154,8 @@ jobs:
cp /mingw64/bin/libgcc_s_seh-1.dll .
cp /mingw64/bin/libstdc++-6.dll .
cp /mingw64/bin/libwinpthread-1.dll .
cp /mingw64/bin/libgnurx-0.dll .
cp /mingw64/bin/libsystre-0.dll .
cp /mingw64/bin/libtre-5.dll .
cp /mingw64/bin/libintl-8.dll .
cp /mingw64/bin/libiconv-2.dll .
# Copy all Qt dependency DLLs
Expand All @@ -181,7 +182,7 @@ jobs:
if: ${{ env.WINDOWS_CERT_DATA != '' }}
uses: lando/code-sign-action@v3
with:
file: debug/db48x.exe
file: db48x.exe
certificate-data: ${{ secrets.WINDOWS_CERT_DATA }}
certificate-password: ${{ secrets.WINDOWS_CERT_PASSWORD }}

Expand Down Expand Up @@ -316,18 +317,18 @@ jobs:
mingw-w64-x86_64-make
mingw-w64-x86_64-freetype
mingw-w64-x86_64-pkg-config
mingw-w64-x86_64-libgnurx
mingw-w64-x86_64-libsystre
mingw-w64-x86_64-qt6-base
mingw-w64-x86_64-qt6-declarative
mingw-w64-x86_64-qt6-multimedia
mingw-w64-x86_64-qt6-translations
mingw-w64-x86_64-qt6-tools

- name: Build color DM32 simulator
- name: Build debug color DM32 simulator
shell: msys2 {0}
run: |
echo "${{ github.run_number }}" > .build_id
mingw32-make color-dm32-sim
mingw32-make debug-color-dm32-sim
Copy link

Copilot AI Apr 16, 2026

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

mingw32-make debug-color-dm32-sim does not match the Makefile’s target composition rules (which build variants via prefixes like color-/dm32- and suffixes like -debug, e.g. color-dm32-sim-debug). As written, this is likely an invalid target and will fail the Windows color simulator job.

Suggested change
mingw32-make debug-color-dm32-sim
mingw32-make color-dm32-sim-debug

Copilot uses AI. Check for mistakes.

- name: Deploy Qt dependencies
shell: msys2 {0}
Expand All @@ -337,7 +338,8 @@ jobs:
cp /mingw64/bin/libgcc_s_seh-1.dll .
cp /mingw64/bin/libstdc++-6.dll .
cp /mingw64/bin/libwinpthread-1.dll .
cp /mingw64/bin/libgnurx-0.dll .
cp /mingw64/bin/libsystre-0.dll .
cp /mingw64/bin/libtre-5.dll .
cp /mingw64/bin/libintl-8.dll .
cp /mingw64/bin/libiconv-2.dll .
# Copy all Qt dependency DLLs
Expand All @@ -364,7 +366,7 @@ jobs:
if: ${{ env.WINDOWS_CERT_DATA != '' }}
uses: lando/code-sign-action@v3
with:
file: debug/db50x.exe
file: db50x.exe
certificate-data: ${{ secrets.WINDOWS_CERT_DATA }}
certificate-password: ${{ secrets.WINDOWS_CERT_PASSWORD }}

Expand All @@ -373,12 +375,12 @@ jobs:
with:
name: db50x-color-simulator-windows
path: |
debug/db50x.exe
debug/*.dll
debug/platforms/
debug/imageformats/
debug/tls/
debug/translations/
db50x.exe
*.dll
platforms/
imageformats/
tls/
translations/
help/

build-wasm:
Expand All @@ -399,6 +401,11 @@ jobs:
sudo apt-get update
sudo apt-get install -y libfreetype6-dev pkg-config

- name: Generate recorder config header
run: |
make -C recorder TARGET=opt BUILDENV=auto RECURSE=.config .config
Comment thread
ppigazzini marked this conversation as resolved.
cp recorder/.build/linux/opt/config.h recorder/config.h

- name: Setup Emscripten
uses: mymindstorm/setup-emsdk@v14
with:
Expand Down Expand Up @@ -479,14 +486,19 @@ jobs:

- name: List generated AAB files
run: |
echo "Looking for AAB files in android directory:"
find android -name "*.aab" -type f 2>/dev/null || echo "No AAB files found"
echo "Looking for AAB files in workspace:"
find . -name "*.aab" -type f 2>/dev/null || echo "No AAB files found"

- name: Verify generated AAB
run: test -f android/db48x.aab

- name: Upload Android artifacts
uses: actions/upload-artifact@v7
with:
name: db48x-android
if-no-files-found: error
path: |
android/*.aab
android/**/*.aab
help/

Expand Down Expand Up @@ -545,14 +557,19 @@ jobs:

- name: List generated AAB files
run: |
echo "Looking for AAB files in android directory:"
find android -name "*.aab" -type f 2>/dev/null || echo "No AAB files found"
echo "Looking for AAB files in workspace:"
find . -name "*.aab" -type f 2>/dev/null || echo "No AAB files found"

- name: Verify generated AAB
run: test -f android/db50x.aab

- name: Upload Android artifacts
uses: actions/upload-artifact@v7
with:
name: db50x-android
if-no-files-found: error
path: |
android/*.aab
android/**/*.aab
help/

Expand Down Expand Up @@ -752,10 +769,12 @@ jobs:
mv artifacts/db50x-dm32-*.tar.gz releases/db50x-dm32.tar.gz
mv artifacts/db50x-dm42n-*.tar.gz releases/db50x-dm42n.tar.gz

- name: Move Android artifacts
- name: Package Android artifacts
run: |
mv artifacts/db48x-android-*.tar.gz releases/db48x-android.tar.gz
mv artifacts/db50x-android-*.tar.gz releases/db50x-android.tar.gz
cd artifacts/db48x-android
tar czf ../../releases/db48x-android.tar.gz *
cd ../db50x-android
tar czf ../../releases/db50x-android.tar.gz *

- name: Extract tag message for release body
run: |
Expand Down
26 changes: 19 additions & 7 deletions Makefile
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -379,7 +379,7 @@ TOOLS_BUILDS=$(dir $(wildcard tools/*/Makefile))
TOOLS=$(foreach t,$(TOOLS_BUILDS),$t$(notdir $(t:%/=%)))
tools: $(TOOLS)
tools/%:
$(PRINT_COMMAND) cd tools/$(*D) && $(MAKE) BUILDENV=auto TIME= DO_INSTALL= VARIANT=$(*D)
$(PRINT_COMMAND) cd tools/$(*D) && $(MAKE) BUILDENV=auto TIME= DO_INSTALL= VARIANT=$(*D) OUTPUT=./

clangdb: clangdb-color-dm32-sim
clangdb-%: .ALWAYS
Expand Down Expand Up @@ -576,7 +576,10 @@ QMAKE_ENV = export ANDROID_SDK_ROOT=$(ANDROID_SDK_ROOT) ; \
export ANDROID_NDK_ROOT=$(ANDROID_NDK_ROOT) ; \
export KEYSTORE_PATH=$(ANDROID_KEYSTORE) ; \
export JAVA_HOME=$(ANDROID_JAVA_HOME);
AAB_FILE=$(OUTPUT:%=%/)$(NAME).aab
# make-it-quick defaults OUTPUT to the workspace root; keep Android bundles
# under android/ unless the caller overrides ANDROID_OUTPUT_DIR explicitly.
ANDROID_OUTPUT_DIR ?= android
AAB_FILE=$(ANDROID_OUTPUT_DIR:%=%/)$(NAME).aab

android-$(TARGET): $(AAB_FILE)
android-%: qt-%
Expand All @@ -585,18 +588,27 @@ android-%: qt-%
$(QMAKEFILE): sim/android/AndroidManifest.xml sim/android/build.gradle

# Deploy (and optionally sign) the AAB via androiddeployqt. androiddeployqt
# expects the .so at <output>/libs/arm64-v8a/; the qmake build puts it in
# DESTDIR, so we must run make install INSTALL_ROOT=<output> first.
# expects a build directory as --output and the .so staged under
# <output>/libs/arm64-v8a/, so we must run make install INSTALL_ROOT=<output>
# first. Normalize the final bundle to $(AAB_FILE) so workflows and helper
# scripts can upload a stable path.
$(AAB_FILE): $(QMAKEFILE) qt-$(TARGET)
$(PRINT_COMMAND) \
AAB="$(abspath $@)"; \
OUTDIR="$(abspath $(dir $@))"; \
mkdir -p "$$OUTDIR" && \
cd sim && \
$(MAKE) -f $(<F) install INSTALL_ROOT="$$AAB" && \
$(MAKE) -f $(<F) install INSTALL_ROOT="$$OUTDIR" && \
$(QMAKE_ENV) \
$(ANDROID_DEPLOY_QT) \
--input android-$(NAME)-deployment-settings.json \
--output "$$AAB" --gradle --aab \
$(ANDROID_DEPLOY_SIGN_FLAGS)
--output "$$OUTDIR" --gradle --aab \
$(ANDROID_DEPLOY_SIGN_FLAGS) && \
if [ ! -f "$$AAB" ]; then \
BUILT_AAB="$$(find "$$OUTDIR" -type f -name '*.aab' | sort | tail -1)"; \
[ -n "$$BUILT_AAB" ] && cp "$$BUILT_AAB" "$$AAB"; \
Comment on lines +608 to +609
Copy link

Copilot AI Apr 16, 2026

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

The fallback that copies the “latest” *.aab from OUTDIR can select the wrong bundle if multiple AABs exist under the same ANDROID_OUTPUT_DIR (e.g., after building both db48x and db50x in the same tree). Consider constraining the find to bundles matching $(NAME) (or the expected package/app name) and failing if there isn’t an unambiguous match, rather than sort | tail -1.

Suggested change
BUILT_AAB="$$(find "$$OUTDIR" -type f -name '*.aab' | sort | tail -1)"; \
[ -n "$$BUILT_AAB" ] && cp "$$BUILT_AAB" "$$AAB"; \
BUILT_AABS="$$(find "$$OUTDIR" -type f -name '$(NAME)*.aab' -print)"; \
BUILT_AAB_COUNT="$$(printf '%s\n' "$$BUILT_AABS" | sed '/^$$/d' | wc -l | tr -d '[:space:]')"; \
if [ "$$BUILT_AAB_COUNT" = "1" ]; then \
cp "$$BUILT_AABS" "$$AAB"; \
else \
echo "Expected exactly one $(NAME) Android App Bundle in $$OUTDIR, found $$BUILT_AAB_COUNT." >&2; \
if [ "$$BUILT_AAB_COUNT" != "0" ]; then \
printf '%s\n' "$$BUILT_AABS" >&2; \
fi; \
exit 1; \
fi; \

Copilot uses AI. Check for mistakes.
fi && \
test -f "$$AAB"
$(if $(ANDROID_CAN_SIGN),,$(PRINT_COMMAND) $(INFO) "[WARNING]" "Android AAB is UNSIGNED (need $(ANDROID_KEYSTORE) and ANDROID_KEYSTORE_PASS). Not for Play Store.")

endif
Expand Down
Loading