From 7e23d208b66d501b12caa1b458c188da6316e1f6 Mon Sep 17 00:00:00 2001 From: Simon Hausmann Date: Fri, 23 Aug 2024 16:30:45 +0200 Subject: [PATCH] WIP: debug --- .github/workflows/cpp_package.yaml | 235 +++++++++++++++-------------- 1 file changed, 118 insertions(+), 117 deletions(-) diff --git a/.github/workflows/cpp_package.yaml b/.github/workflows/cpp_package.yaml index d85d8eec5b0..bf64219883a 100644 --- a/.github/workflows/cpp_package.yaml +++ b/.github/workflows/cpp_package.yaml @@ -16,65 +16,65 @@ env: GITHUB_TOKEN: ${{ secrets.GITHUB_TOKEN }} jobs: - cmake_package_desktop: - env: - DYLD_FRAMEWORK_PATH: /Users/runner/work/slint/Qt/6.5.1/clang_64/lib - QT_QPA_PLATFORM: offscreen - CARGO_INCREMENTAL: false - strategy: - matrix: - os: [ubuntu-20.04, macOS-12, macos-14, windows-2022] - include: - - os: ubuntu-20.04 - package_suffix: linux - - os: macOS-12 - package_suffix: macos-x86_64 - - os: macos-14 - package_suffix: macos-aarch64 - - os: windows-2022 - package_suffix: windows - - runs-on: ${{ matrix.os }} - steps: - - uses: actions/checkout@v4 - - uses: ./.github/actions/install-linux-dependencies - with: - old-ubuntu: true - - name: Install Qt (Ubuntu) - uses: jurplel/install-qt-action@v3 - if: matrix.os == 'ubuntu-20.04' - with: - version: 5.15.2 - cache: true - - uses: ./.github/actions/setup-rust - - uses: baptiste0928/cargo-install@v3 - with: - crate: cargo-about - - name: Prepare licenses - run: bash -x ../../scripts/prepare_binary_package.sh ../.. - working-directory: api/cpp/ - - uses: ilammy/msvc-dev-cmd@v1 - - name: Select MSVC (windows) - run: | - echo "CC=cl.exe" >> $GITHUB_ENV - echo "CXX=cl.exe" >> $GITHUB_ENV - if: matrix.os == 'windows-2022' - - name: C++ Build - uses: lukka/run-cmake@v3.4 - with: - cmakeListsOrSettingsJson: CMakeListsTxtAdvanced - cmakeListsTxtPath: CMakeLists.txt - cmakeAppendedArgs: "-DCMAKE_BUILD_TYPE=RelWithDebInfo ${{ env.SLINT_BINARY_FEATURES }}" - buildDirectory: ${{ runner.workspace }}/cppbuild - buildWithCMakeArgs: "--config Release" - - name: cpack - working-directory: ${{ runner.workspace }}/cppbuild - run: cmake --build . --config Release --target package - - name: "Upload C++ packages" - uses: actions/upload-artifact@v4 - with: - name: cpp_bin-${{ matrix.package_suffix }} - path: ${{ runner.workspace }}/cppbuild/Slint-cpp-* +# cmake_package_desktop: +# env: +# DYLD_FRAMEWORK_PATH: /Users/runner/work/slint/Qt/6.5.1/clang_64/lib +# QT_QPA_PLATFORM: offscreen +# CARGO_INCREMENTAL: false +# strategy: +# matrix: +# os: [ubuntu-20.04, macOS-12, macos-14, windows-2022] +# include: +# - os: ubuntu-20.04 +# package_suffix: linux +# - os: macOS-12 +# package_suffix: macos-x86_64 +# - os: macos-14 +# package_suffix: macos-aarch64 +# - os: windows-2022 +# package_suffix: windows +# +# runs-on: ${{ matrix.os }} +# steps: +# - uses: actions/checkout@v4 +# - uses: ./.github/actions/install-linux-dependencies +# with: +# old-ubuntu: true +# - name: Install Qt (Ubuntu) +# uses: jurplel/install-qt-action@v3 +# if: matrix.os == 'ubuntu-20.04' +# with: +# version: 5.15.2 +# cache: true +# - uses: ./.github/actions/setup-rust +# - uses: baptiste0928/cargo-install@v3 +# with: +# crate: cargo-about +# - name: Prepare licenses +# run: bash -x ../../scripts/prepare_binary_package.sh ../.. +# working-directory: api/cpp/ +# - uses: ilammy/msvc-dev-cmd@v1 +# - name: Select MSVC (windows) +# run: | +# echo "CC=cl.exe" >> $GITHUB_ENV +# echo "CXX=cl.exe" >> $GITHUB_ENV +# if: matrix.os == 'windows-2022' +# - name: C++ Build +# uses: lukka/run-cmake@v3.4 +# with: +# cmakeListsOrSettingsJson: CMakeListsTxtAdvanced +# cmakeListsTxtPath: CMakeLists.txt +# cmakeAppendedArgs: "-DCMAKE_BUILD_TYPE=RelWithDebInfo ${{ env.SLINT_BINARY_FEATURES }}" +# buildDirectory: ${{ runner.workspace }}/cppbuild +# buildWithCMakeArgs: "--config Release" +# - name: cpack +# working-directory: ${{ runner.workspace }}/cppbuild +# run: cmake --build . --config Release --target package +# - name: "Upload C++ packages" +# uses: actions/upload-artifact@v4 +# with: +# name: cpp_bin-${{ matrix.package_suffix }} +# path: ${{ runner.workspace }}/cppbuild/Slint-cpp-* cmake_package_mcu_arm: env: @@ -82,7 +82,8 @@ jobs: strategy: matrix: target: [thumbv7em-none-eabihf] - host: [ubuntu-20.04, windows-2022, macOS-12] +# host: [ubuntu-20.04, windows-2022, macOS-12] + host: [windows-2022] runs-on: ${{ matrix.host }} steps: @@ -120,60 +121,60 @@ jobs: name: cpp_mcu_bin-${{ runner.os }}-${{ runner.arch }}-${{ matrix.target }} path: ${{ runner.workspace }}/cppbuild/Slint-cpp-* - cmake_package_mcu_esp: - env: - CARGO_INCREMENTAL: false - strategy: - matrix: - idf_target: [esp32s2, esp32s3, esp32p4] - host: [ubuntu-22.04, windows-2022, macOS-12] - include: - - idf_target: esp32s2 - rust_target: xtensa-esp32s2-none-elf - - idf_target: esp32s3 - rust_target: xtensa-esp32s3-none-elf - - idf_target: esp32p4 - rust_target: riscv32imafc-esp-espidf - - runs-on: ${{ matrix.host }} - steps: - - uses: actions/checkout@v4 - - uses: ./.github/actions/install-linux-dependencies - with: - old-ubuntu: true - - uses: dtolnay/rust-toolchain@stable - - name: install espup - run: | - cargo install espup - espup install - rustup default esp - - name: add esp toolchains to PATH - if: runner.os != 'Windows' - run: | - source "$HOME/export-esp.sh" - echo "$PATH" >> "$GITHUB_PATH" - - uses: baptiste0928/cargo-install@v3 - with: - crate: cargo-about - - name: Prepare licenses - run: bash -x ../../scripts/prepare_binary_package.sh ../.. - working-directory: api/cpp/ - - name: C++ Build - uses: lukka/run-cmake@v3.4 - with: - cmakeListsOrSettingsJson: CMakeListsTxtAdvanced - cmakeListsTxtPath: CMakeLists.txt - # NOTE: xtensa-esp-elf-gcc as compiler for the RISC-V targets is wrong, but the compiler argument here is only - # used to ensure that SIZEOF_VOID_P is 4 in the generated cmake config file. Otherwise this build requires no - # C compiler. - cmakeAppendedArgs: "-GNinja -DCMAKE_BUILD_TYPE=RelWithDebInfo -DCMAKE_BUILD_TYPE=Release -DBUILD_SHARED_LIBS=OFF -DESP_PLATFORM=1 -DIDF_TARGET=${{ matrix.idf_target }} -DRust_CARGO_TARGET=${{ matrix.rust_target }} -DCMAKE_C_COMPILER=xtensa-esp-elf-gcc -DCMAKE_CXX_COMPILER=xtensa-esp-elf-g++ -DCMAKE_AR=arm-none-eabi-ar -DCMAKE_TRY_COMPILE_TARGET_TYPE=STATIC_LIBRARY -DSLINT_LIBRARY_CARGO_FLAGS='-Zbuild-std=core,alloc' ${{ env.SLINT_MCU_FEATURES }}" - buildDirectory: ${{ runner.workspace }}/cppbuild - buildWithCMakeArgs: "--config Release" - - name: cpack - working-directory: ${{ runner.workspace }}/cppbuild - run: cpack -G TGZ - - name: "Upload C++ packages" - uses: actions/upload-artifact@v4 - with: - name: cpp_mcu_bin-${{ runner.os }}-${{ runner.arch }}-${{ matrix.idf_target }} - path: ${{ runner.workspace }}/cppbuild/Slint-cpp-* +# cmake_package_mcu_esp: +# env: +# CARGO_INCREMENTAL: false +# strategy: +# matrix: +# idf_target: [esp32s2, esp32s3, esp32p4] +# host: [ubuntu-22.04, windows-2022, macOS-12] +# include: +# - idf_target: esp32s2 +# rust_target: xtensa-esp32s2-none-elf +# - idf_target: esp32s3 +# rust_target: xtensa-esp32s3-none-elf +# - idf_target: esp32p4 +# rust_target: riscv32imafc-esp-espidf +# +# runs-on: ${{ matrix.host }} +# steps: +# - uses: actions/checkout@v4 +# - uses: ./.github/actions/install-linux-dependencies +# with: +# old-ubuntu: true +# - uses: dtolnay/rust-toolchain@stable +# - name: install espup +# run: | +# cargo install espup +# espup install +# rustup default esp +# - name: add esp toolchains to PATH +# if: runner.os != 'Windows' +# run: | +# source "$HOME/export-esp.sh" +# echo "$PATH" >> "$GITHUB_PATH" +# - uses: baptiste0928/cargo-install@v3 +# with: +# crate: cargo-about +# - name: Prepare licenses +# run: bash -x ../../scripts/prepare_binary_package.sh ../.. +# working-directory: api/cpp/ +# - name: C++ Build +# uses: lukka/run-cmake@v3.4 +# with: +# cmakeListsOrSettingsJson: CMakeListsTxtAdvanced +# cmakeListsTxtPath: CMakeLists.txt +# # NOTE: xtensa-esp-elf-gcc as compiler for the RISC-V targets is wrong, but the compiler argument here is only +# # used to ensure that SIZEOF_VOID_P is 4 in the generated cmake config file. Otherwise this build requires no +# # C compiler. +# cmakeAppendedArgs: "-GNinja -DCMAKE_BUILD_TYPE=RelWithDebInfo -DCMAKE_BUILD_TYPE=Release -DBUILD_SHARED_LIBS=OFF -DESP_PLATFORM=1 -DIDF_TARGET=${{ matrix.idf_target }} -DRust_CARGO_TARGET=${{ matrix.rust_target }} -DCMAKE_C_COMPILER=xtensa-esp-elf-gcc -DCMAKE_CXX_COMPILER=xtensa-esp-elf-g++ -DCMAKE_AR=arm-none-eabi-ar -DCMAKE_TRY_COMPILE_TARGET_TYPE=STATIC_LIBRARY -DSLINT_LIBRARY_CARGO_FLAGS='-Zbuild-std=core,alloc' ${{ env.SLINT_MCU_FEATURES }}" +# buildDirectory: ${{ runner.workspace }}/cppbuild +# buildWithCMakeArgs: "--config Release" +# - name: cpack +# working-directory: ${{ runner.workspace }}/cppbuild +# run: cpack -G TGZ +# - name: "Upload C++ packages" +# uses: actions/upload-artifact@v4 +# with: +# name: cpp_mcu_bin-${{ runner.os }}-${{ runner.arch }}-${{ matrix.idf_target }} +# path: ${{ runner.workspace }}/cppbuild/Slint-cpp-*