Skip to content
Draft
Show file tree
Hide file tree
Changes from all commits
Commits
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
7 changes: 6 additions & 1 deletion .github/workflows/win_cpn-64.yml
Original file line number Diff line number Diff line change
Expand Up @@ -32,7 +32,7 @@ env:

jobs:
build:
runs-on: windows-2022
runs-on: windows-latest
if: |
github.event_name != 'pull_request' ||
!contains(github.event.pull_request.labels.*.name, 'ci: skip-cpn-win')
Expand Down Expand Up @@ -72,6 +72,11 @@ jobs:
- name: Setup MSVC
uses: ilammy/msvc-dev-cmd@v1

- name: Install NSIS
uses: repolevedavaj/install-nsis@v1.1.0
with:
nsis-version: '3.11'

- name: Build
env:
CMAKE_BUILD_PARALLEL_LEVEL: 4
Expand Down
13 changes: 10 additions & 3 deletions tools/build-companion.sh
Original file line number Diff line number Diff line change
Expand Up @@ -51,7 +51,7 @@ if [[ -z ${EDGETX_VERSION_SUFFIX} ]]; then
fi
fi

rm -rf build && mkdir build && cd build
rm -rf build && mkdir build && cd build || exit

# Function to output error logs (works in both GitHub Actions and terminal)
output_error_log() {
Expand Down Expand Up @@ -151,7 +151,8 @@ clean_build() {
}

get_platform_config() {
local platform=$(uname)
local platform
platform=$(uname)
case "$platform" in
"Darwin")
PACKAGE_TARGET="package"
Expand Down Expand Up @@ -291,16 +292,22 @@ fi

error_status=0
if run_pipeline "final" "final.log" "companion" "true"; then
if cp native/$PACKAGE_FILES "${OUTDIR}" 2>/dev/null; then
PACKAGE_FILE=$(find native/ -name "${PACKAGE_FILES}" -type f | head -n1)
if [ -n "$PACKAGE_FILE" ] && cp "$PACKAGE_FILE" "${OUTDIR}" 2>/dev/null; then
echo " ✅ All builds completed successfully!"
echo " 📁 Package saved to: ${OUTDIR}"
echo " 📄 Copied: $(basename "$PACKAGE_FILE")"
else
echo " ❌ Failed to copy package files to output directory"
echo " 📁 Directory Contents:"
echo " ----------------------"

echo "Contents of native/ directory:"
ls -la native/ || echo "native/ directory not found"
if [ "$PACKAGE_TARGET" == "installer" ]; then
echo "Contents of companion/ directory:"
ls -la companion/ || echo "companion/ directory not found"
fi
echo "Looking for files matching: $PACKAGE_FILES"
find native/ -name "$PACKAGE_FILES" 2>/dev/null || echo "No matching files found"
error_status=1
Expand Down
Loading