From ed9506a68e33f2bbc2e4ec4d0df491ba77b442a7 Mon Sep 17 00:00:00 2001 From: Mark Roberts Date: Tue, 30 Jul 2024 19:13:13 +0000 Subject: [PATCH 1/7] Add cmake build action. --- .github/workflows/cmake_build.yaml | 20 ++++++++++++++++++++ 1 file changed, 20 insertions(+) create mode 100644 .github/workflows/cmake_build.yaml diff --git a/.github/workflows/cmake_build.yaml b/.github/workflows/cmake_build.yaml new file mode 100644 index 0000000..2280a11 --- /dev/null +++ b/.github/workflows/cmake_build.yaml @@ -0,0 +1,20 @@ +name: C/C++ build + +on: [push, pull_request] + +jobs: + ubuntu-build: + strategy: + matrix: + os: [ubuntu-latest, macos-latest] + compiler: [g++, clang++] + runs-on: ${{ matrix.os }} + steps: + - name: Checkout + uses: actions/checkout@v2.0.0 + - name: Build project + uses: nicledomaS/cmake_build_action@v1.4 + with: + cmake_args: -DCMAKE_CXX_COMPILER=${{ matrix.compiler }} + # run_tests: ON + # unit_test_build: -Dtest=ON From 42a3f813f2d8fb332bf751ca86c4ec13ab526efe Mon Sep 17 00:00:00 2001 From: Mark Roberts Date: Tue, 30 Jul 2024 19:18:20 +0000 Subject: [PATCH 2/7] Update build pipeline. --- .github/workflows/cmake_build.yaml | 8 +++----- 1 file changed, 3 insertions(+), 5 deletions(-) diff --git a/.github/workflows/cmake_build.yaml b/.github/workflows/cmake_build.yaml index 2280a11..1d7d510 100644 --- a/.github/workflows/cmake_build.yaml +++ b/.github/workflows/cmake_build.yaml @@ -12,9 +12,7 @@ jobs: steps: - name: Checkout uses: actions/checkout@v2.0.0 - - name: Build project - uses: nicledomaS/cmake_build_action@v1.4 + - name: Configure and Build Project + uses: threeal/cmake-action@main with: - cmake_args: -DCMAKE_CXX_COMPILER=${{ matrix.compiler }} - # run_tests: ON - # unit_test_build: -Dtest=ON + cxx-compiler: ${{ matrix.compiler }} From 5bb92ca07766251334974fe4461c0adbfc324110 Mon Sep 17 00:00:00 2001 From: Mark Roberts Date: Tue, 30 Jul 2024 19:19:35 +0000 Subject: [PATCH 3/7] Update checkout --- .github/workflows/cmake_build.yaml | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/.github/workflows/cmake_build.yaml b/.github/workflows/cmake_build.yaml index 1d7d510..f521f2f 100644 --- a/.github/workflows/cmake_build.yaml +++ b/.github/workflows/cmake_build.yaml @@ -11,7 +11,7 @@ jobs: runs-on: ${{ matrix.os }} steps: - name: Checkout - uses: actions/checkout@v2.0.0 + uses: actions/checkout@v4.1.7 - name: Configure and Build Project uses: threeal/cmake-action@main with: From 77c17b596f15f959eb96bc699f7fd06648561f98 Mon Sep 17 00:00:00 2001 From: Mark Roberts Date: Tue, 30 Jul 2024 19:42:26 +0000 Subject: [PATCH 4/7] Install NASM on agent --- .github/workflows/cmake_build.yaml | 3 +++ 1 file changed, 3 insertions(+) diff --git a/.github/workflows/cmake_build.yaml b/.github/workflows/cmake_build.yaml index f521f2f..756cd0b 100644 --- a/.github/workflows/cmake_build.yaml +++ b/.github/workflows/cmake_build.yaml @@ -10,9 +10,12 @@ jobs: compiler: [g++, clang++] runs-on: ${{ matrix.os }} steps: + - name: Setup NASM + uses: ilammy/setup-nasm@v1 - name: Checkout uses: actions/checkout@v4.1.7 - name: Configure and Build Project + uses: ilammy/setup-nasm@v1 uses: threeal/cmake-action@main with: cxx-compiler: ${{ matrix.compiler }} From a036bfa4ffd963293259cd73eae6474d9c254756 Mon Sep 17 00:00:00 2001 From: Mark Roberts Date: Tue, 30 Jul 2024 19:43:24 +0000 Subject: [PATCH 5/7] Fix broken yaml. --- .github/workflows/cmake_build.yaml | 1 - 1 file changed, 1 deletion(-) diff --git a/.github/workflows/cmake_build.yaml b/.github/workflows/cmake_build.yaml index 756cd0b..6e9abe2 100644 --- a/.github/workflows/cmake_build.yaml +++ b/.github/workflows/cmake_build.yaml @@ -15,7 +15,6 @@ jobs: - name: Checkout uses: actions/checkout@v4.1.7 - name: Configure and Build Project - uses: ilammy/setup-nasm@v1 uses: threeal/cmake-action@main with: cxx-compiler: ${{ matrix.compiler }} From b47f71803a3d20b3a14a833acde694335304d511 Mon Sep 17 00:00:00 2001 From: Mark Roberts Date: Tue, 30 Jul 2024 21:22:08 +0000 Subject: [PATCH 6/7] Update build job name --- .github/workflows/cmake_build.yaml | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/.github/workflows/cmake_build.yaml b/.github/workflows/cmake_build.yaml index 6e9abe2..318b0f5 100644 --- a/.github/workflows/cmake_build.yaml +++ b/.github/workflows/cmake_build.yaml @@ -3,7 +3,7 @@ name: C/C++ build on: [push, pull_request] jobs: - ubuntu-build: + cmake_build: strategy: matrix: os: [ubuntu-latest, macos-latest] From 434521d82a4eaabc132d6c8f9b1734ba464bd8b9 Mon Sep 17 00:00:00 2001 From: Mark Roberts Date: Tue, 30 Jul 2024 21:36:29 +0000 Subject: [PATCH 7/7] Remove macos build. --- .github/workflows/cmake_build.yaml | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/.github/workflows/cmake_build.yaml b/.github/workflows/cmake_build.yaml index 318b0f5..b615fa7 100644 --- a/.github/workflows/cmake_build.yaml +++ b/.github/workflows/cmake_build.yaml @@ -6,7 +6,7 @@ jobs: cmake_build: strategy: matrix: - os: [ubuntu-latest, macos-latest] + os: [ubuntu-latest] # [ubuntu-latest, macos-latest] compiler: [g++, clang++] runs-on: ${{ matrix.os }} steps: