From 1fe93339bce25819640f5c52078f81b01a947f1c Mon Sep 17 00:00:00 2001 From: Alvin Bryan <107407814+alvinometric@users.noreply.github.com> Date: Thu, 7 Aug 2025 15:08:06 +0100 Subject: [PATCH 1/3] Update ci.yml --- .github/workflows/ci.yml | 18 ++++++++++++++---- 1 file changed, 14 insertions(+), 4 deletions(-) diff --git a/.github/workflows/ci.yml b/.github/workflows/ci.yml index bbb9e7c..ebb8ff6 100644 --- a/.github/workflows/ci.yml +++ b/.github/workflows/ci.yml @@ -7,18 +7,17 @@ on: jobs: BuildLinux: - runs-on: ubuntu-20.04 # test slightly older ubuntu. + runs-on: ubuntu-20.04 strategy: fail-fast: false matrix: compiler: - g++ - clang++ - name: Build ${{matrix.compiler}} steps: - name: Get the Source - uses: actions/checkout@v3 + uses: actions/checkout@v4 - name: Configure shell run: | @@ -29,13 +28,24 @@ jobs: run: | make -k + - name: Upload build artifacts + uses: actions/upload-artifact@v4 + with: + name: gcode-cli-build + path: gcode-cli + BuildMac: name: Build Mac runs-on: macos-latest steps: - name: Get the Source uses: actions/checkout@v3 - - name: Build run: | make -k + + - name: Upload build artifacts + uses: actions/upload-artifact@v4 + with: + name: gcode-cli-build + path: gcode-cli From 824e7e03730404d85d336571600d3e7e81173df3 Mon Sep 17 00:00:00 2001 From: Alvin Bryan <107407814+alvinometric@users.noreply.github.com> Date: Thu, 7 Aug 2025 15:13:33 +0100 Subject: [PATCH 2/3] fix conflicting artefacts, restore comment --- .github/workflows/ci.yml | 14 ++++---------- 1 file changed, 4 insertions(+), 10 deletions(-) diff --git a/.github/workflows/ci.yml b/.github/workflows/ci.yml index ebb8ff6..08406ca 100644 --- a/.github/workflows/ci.yml +++ b/.github/workflows/ci.yml @@ -4,10 +4,9 @@ on: branches: - master pull_request: - jobs: BuildLinux: - runs-on: ubuntu-20.04 + runs-on: ubuntu-20.04 # test slightly older ubuntu. strategy: fail-fast: false matrix: @@ -18,34 +17,29 @@ jobs: steps: - name: Get the Source uses: actions/checkout@v4 - - name: Configure shell run: | echo "CXX=${{ matrix.compiler }}" >> $GITHUB_ENV echo "CXXFLAGS=-Werror" >> $GITHUB_ENV - - name: Build run: | make -k - - name: Upload build artifacts uses: actions/upload-artifact@v4 with: - name: gcode-cli-build + name: gcode-cli-linux-${{ matrix.compiler }} path: gcode-cli - BuildMac: name: Build Mac runs-on: macos-latest steps: - name: Get the Source - uses: actions/checkout@v3 + uses: actions/checkout@v4 - name: Build run: | make -k - - name: Upload build artifacts uses: actions/upload-artifact@v4 with: - name: gcode-cli-build + name: gcode-cli-mac path: gcode-cli From 25f7f486c5830777d8c5ec14f9e5e67be8fd964b Mon Sep 17 00:00:00 2001 From: Alvin Bryan <107407814+alvinometric@users.noreply.github.com> Date: Thu, 7 Aug 2025 15:28:10 +0100 Subject: [PATCH 3/3] Newer Ubuntu --- .github/workflows/ci.yml | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/.github/workflows/ci.yml b/.github/workflows/ci.yml index 08406ca..cb2d686 100644 --- a/.github/workflows/ci.yml +++ b/.github/workflows/ci.yml @@ -6,7 +6,7 @@ on: pull_request: jobs: BuildLinux: - runs-on: ubuntu-20.04 # test slightly older ubuntu. + runs-on: ubuntu-24.04 strategy: fail-fast: false matrix: