Skip to content

VALIDATION (do not merge): edgetx-dev:pr-42 native arm64 #21

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

Closed
pfeerick wants to merge 3 commits into from
Closed

VALIDATION (do not merge): edgetx-dev:pr-42 native arm64 #21

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
3 commits
Select commit Hold shift + click to select a range
ff92d61
ci: validate edgetx-dev:pr-42 (native arm64) — DO NOT MERGE
pfeerick Jun 10, 2026
4b74dd9
diag: capture linuxdeploy output for AppImage packaging investigation
pfeerick Jun 11, 2026
a039419
diag: dump full packaging log instead of truncated grep
pfeerick Jun 11, 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
18 changes: 13 additions & 5 deletions .github/workflows/build_fw.yml
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -20,12 +20,16 @@ on:
jobs:
test:
name: Run tests
runs-on: ubuntu-latest
runs-on: ${{ matrix.os }}
if: |
github.event_name != 'pull_request' ||
!contains(github.event.pull_request.labels.*.name, 'ci: skip-fw')
strategy:
fail-fast: false
matrix:
os:
- ubuntu-24.04
- ubuntu-24.04-arm
target:
- x9dp2019;x9e
- tx15
Expand All @@ -48,7 +52,7 @@ jobs:
- t15pro
- pa01
container:
image: ghcr.io/edgetx/edgetx-dev:latest
image: ghcr.io/edgetx/edgetx-dev:pr-42
volumes:
- ${{ github.workspace }}:/src
steps:
Expand All @@ -68,12 +72,16 @@ jobs:
build:
name: Run builds
needs: test
runs-on: ubuntu-latest
runs-on: ${{ matrix.os }}
if: |
github.event_name != 'pull_request' ||
!contains(github.event.pull_request.labels.*.name, 'ci: skip-fw')
strategy:
fail-fast: false
matrix:
os:
- ubuntu-24.04
- ubuntu-24.04-arm
target:
- nv14;el18
- pl18;pl18ev
Expand All @@ -92,7 +100,7 @@ jobs:
- nb4p;st16
- tx16smk3;t14;t15pro
container:
image: ghcr.io/edgetx/edgetx-dev:latest
image: ghcr.io/edgetx/edgetx-dev:pr-42
volumes:
- ${{ github.workspace }}:/src
steps:
Expand All @@ -112,7 +120,7 @@ jobs:
- name: Upload ${{ matrix.target }}
uses: actions/upload-artifact@v7
with:
name: firmware-${{ matrix.target }}
name: firmware-${{ matrix.target }}-${{ matrix.os }}
path: |
fw.json
LICENSE
Expand Down
12 changes: 9 additions & 3 deletions .github/workflows/companion.yml
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -92,12 +92,18 @@ jobs:

build-linux:
name: Linux Companion
runs-on: ubuntu-latest
needs: modules
if: inputs.target == 'all' || inputs.target == 'linux' || inputs.target == ''
strategy:
fail-fast: false
matrix:
os:
- ubuntu-24.04
- ubuntu-24.04-arm
runs-on: ${{ matrix.os }}

container:
image: ghcr.io/edgetx/edgetx-dev:latest
image: ghcr.io/edgetx/edgetx-dev:pr-42
volumes:
- ${{ github.workspace }}:/src

Expand All @@ -117,7 +123,7 @@ jobs:
- name: Setup and Build
uses: ./.github/actions/build_companion
with:
os: 'linux'
os: ${{ matrix.os == 'ubuntu-24.04-arm' && 'linux-arm64' || 'linux-amd64' }}

build-macos:
name: macOS Companion
Expand Down
18 changes: 15 additions & 3 deletions companion/targets/linux/CPackLinuxDeploy.cmake.in
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -1,8 +1,20 @@
execute_process(COMMAND @CMAKE_MAKE_PROGRAM@ DESTDIR=@APPIMAGE_DIR@ install
WORKING_DIRECTORY @CMAKE_BINARY_DIR@)
WORKING_DIRECTORY @CMAKE_BINARY_DIR@
RESULT_VARIABLE _install_result
OUTPUT_VARIABLE _install_output
ERROR_VARIABLE _install_error)
message(STATUS "DIAG: install result=${_install_result}")
message(STATUS "DIAG: install output=${_install_output}")
message(STATUS "DIAG: install error=${_install_error}")

# This is done by cmake install target
# setup Companion application
# add -v0 to linuxdeploy for debug info
execute_process(COMMAND env LDAI_NO_APPSTREAM=1 @LINUXDEPLOY_APP@ --appdir @APPIMAGE_DIR@ -e @COMPANION_NAME@ -e @SIMULATOR_NAME@ -d @COMPANION_DESKTOP_FILE@ --custom-apprun @CMAKE_BINARY_DIR@/AppDir/AppRun --plugin qt --output appimage
WORKING_DIRECTORY @CMAKE_BINARY_DIR@)
execute_process(COMMAND env LDAI_NO_APPSTREAM=1 @LINUXDEPLOY_APP@ --appdir @APPIMAGE_DIR@ -e @COMPANION_NAME@ -e @SIMULATOR_NAME@ -d @COMPANION_DESKTOP_FILE@ --custom-apprun @CMAKE_BINARY_DIR@/AppDir/AppRun --plugin qt --output appimage -v1
WORKING_DIRECTORY @CMAKE_BINARY_DIR@
RESULT_VARIABLE _ld_result
OUTPUT_VARIABLE _ld_output
ERROR_VARIABLE _ld_error)
message(STATUS "DIAG: linuxdeploy result=${_ld_result}")
message(STATUS "DIAG: linuxdeploy output=${_ld_output}")
message(STATUS "DIAG: linuxdeploy error=${_ld_error}")
2 changes: 2 additions & 0 deletions tools/build-companion.sh
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -122,6 +122,8 @@ elif cp native/$PACKAGE_FILES "${OUTDIR}" 2>/dev/null; then
else
echo " ❌ Failed to copy package files to output directory"
ls -la native/ || echo "native/ directory not found"
echo " DIAG: tail of packaging log:"
tail -200 "$LOG_FILE"
error_status=1
fi

Expand Down
Loading