From 787b7ef3907a1120217ce5eccfb3d75fd44445eb Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Alja=C5=BE?= Date: Tue, 21 Jan 2025 15:34:38 +0100 Subject: [PATCH 1/2] Enable manually running the GitHub workflow to retrieve module binaries, etc. --- .github/workflows/cmake-multi-platform.yml | 1 + 1 file changed, 1 insertion(+) diff --git a/.github/workflows/cmake-multi-platform.yml b/.github/workflows/cmake-multi-platform.yml index 778b2fa..02ef937 100644 --- a/.github/workflows/cmake-multi-platform.yml +++ b/.github/workflows/cmake-multi-platform.yml @@ -3,6 +3,7 @@ name: CMake on multiple platforms on: + workflow_dispatch: push: branches: [ "main" ] pull_request: From 5da63605871f89cdc5bfc1b19a894e6458212249 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Alja=C5=BE?= Date: Tue, 21 Jan 2025 17:51:08 +0100 Subject: [PATCH 2/2] Fix CI --- .github/workflows/cmake-multi-platform.yml | 17 ++++++++--------- 1 file changed, 8 insertions(+), 9 deletions(-) diff --git a/.github/workflows/cmake-multi-platform.yml b/.github/workflows/cmake-multi-platform.yml index 02ef937..bd9d951 100644 --- a/.github/workflows/cmake-multi-platform.yml +++ b/.github/workflows/cmake-multi-platform.yml @@ -14,7 +14,7 @@ env: jobs: build_linux: - runs-on: ${{ matrix.os }} + runs-on: ubuntu-latest timeout-minutes: 180 strategy: @@ -22,15 +22,14 @@ jobs: fail-fast: false matrix: - os: [ubuntu-latest] - build_type: [Release] - c_compiler: [gcc, clang] include: - - os: ubuntu-latest + - os: ubuntu:20.04 + build_type: Release c_compiler: gcc cpp_compiler: g++ cpack: tgz - - os: ubuntu-latest + - os: ubuntu:20.04 + build_type: Release c_compiler: clang cpp_compiler: clang++ cpack: tgz @@ -39,7 +38,7 @@ jobs: - name: Install basic dependencies run: | sudo apt-get update - sudo apt-get install -y libpcap-dev + sudo apt-get install -y libpcap-dev mono-runtime - uses: actions/checkout@v4 @@ -76,7 +75,7 @@ jobs: if: always() uses: actions/upload-artifact@v4 with: - name: Test Results ${{ matrix.os }}-${{ matrix.c_compiler }} + name: Test Results ubuntu-${{ matrix.c_compiler }} path: ${{ steps.strings.outputs.build-output-dir }}/Testing/Temporary/LastTest.log retention-days: 7 @@ -89,7 +88,7 @@ jobs: if: always() uses: actions/upload-artifact@v4 with: - name: asam-cmp-${{ matrix.os }}-${{ matrix.c_compiler }} + name: asam-cmp-ubuntu-${{ matrix.c_compiler }} path: ${{ env.package_path }} retention-days: 7