From 63729145d8ebc4e68b80bc3f413233f2f7c07e49 Mon Sep 17 00:00:00 2001 From: Andre Renaud Date: Mon, 8 Dec 2025 08:52:03 +1300 Subject: [PATCH 1/7] Bump action versions --- .github/workflows/build_and_test.yml | 10 +++++----- 1 file changed, 5 insertions(+), 5 deletions(-) diff --git a/.github/workflows/build_and_test.yml b/.github/workflows/build_and_test.yml index ef7ae17..e7bb14c 100644 --- a/.github/workflows/build_and_test.yml +++ b/.github/workflows/build_and_test.yml @@ -9,7 +9,7 @@ jobs: image: docker://andredesigna/pdfgen:latest steps: - - uses: actions/checkout@v1 + - uses: actions/checkout@v6 - name: Build Win32 run: | make clean @@ -37,7 +37,7 @@ jobs: - name: Coverage run: make clean && make coverage - name: Upload artifacts - uses: actions/upload-artifact@v2 + uses: actions/upload-artifact@v4 with: name: artifacts path: | @@ -53,7 +53,7 @@ jobs: runs-on: windows-latest steps: - - uses: actions/checkout@v1 + - uses: actions/checkout@v6 - name: make x64 shell: cmd run: | @@ -73,7 +73,7 @@ jobs: testprog-32 cp output.pdf output-win32.pdf - name: Upload aritfacts - uses: actions/upload-artifact@v2 + uses: actions/upload-artifact@v4 with: name: artifacts path: | @@ -85,6 +85,6 @@ jobs: build-macos: runs-on: macos-latest steps: - - uses: actions/checkout@v1 + - uses: actions/checkout@v6 - name: make run: make From 3e509888866c601745e6f46ff6f072b2fd74ad2f Mon Sep 17 00:00:00 2001 From: Andre Renaud Date: Mon, 8 Dec 2025 08:56:03 +1300 Subject: [PATCH 2/7] Appveyor issue --- appveyor.yml | 2 ++ 1 file changed, 2 insertions(+) diff --git a/appveyor.yml b/appveyor.yml index 72bd608..fd66081 100644 --- a/appveyor.yml +++ b/appveyor.yml @@ -14,6 +14,8 @@ environment: configuration: - Release +build: Script + platform: - x64 # 64-bit build # - win32 # 32-bit build From e0c557f2faf01f5058ba41ec93b2ab2207901fa8 Mon Sep 17 00:00:00 2001 From: Andre Renaud Date: Mon, 8 Dec 2025 09:00:10 +1300 Subject: [PATCH 3/7] More appveyor attempts --- appveyor.yml | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/appveyor.yml b/appveyor.yml index fd66081..5244853 100644 --- a/appveyor.yml +++ b/appveyor.yml @@ -14,7 +14,7 @@ environment: configuration: - Release -build: Script +build: off platform: - x64 # 64-bit build From 67da33da806625038fecdb6e6d7d1ad501786af6 Mon Sep 17 00:00:00 2001 From: Andre Renaud Date: Mon, 8 Dec 2025 09:14:35 +1300 Subject: [PATCH 4/7] appveyor --- appveyor.yml | 7 +++---- 1 file changed, 3 insertions(+), 4 deletions(-) diff --git a/appveyor.yml b/appveyor.yml index 5244853..2ad597c 100644 --- a/appveyor.yml +++ b/appveyor.yml @@ -14,8 +14,6 @@ environment: configuration: - Release -build: off - platform: - x64 # 64-bit build # - win32 # 32-bit build @@ -34,8 +32,9 @@ before_build: - if "%PLATFORM%"=="win32" SET PATH=C:\msys64\mingw32\bin;C:\msys64\mingw64\bin;C:\MinGW\bin;%PATH% build_script: - - mingw32-make testprog.exe CC=cl - - testprog + - sh: |- + mingw32-make testprog.exe CC=cl + ./testprog artifacts: - path: '*.pdf' From c2ea4905a6fc80c7ac08321ec83994020bb85e6a Mon Sep 17 00:00:00 2001 From: Andre Renaud Date: Mon, 8 Dec 2025 09:17:16 +1300 Subject: [PATCH 5/7] revery appveyor. This isn't working --- appveyor.yml | 5 ++--- 1 file changed, 2 insertions(+), 3 deletions(-) diff --git a/appveyor.yml b/appveyor.yml index 2ad597c..72bd608 100644 --- a/appveyor.yml +++ b/appveyor.yml @@ -32,9 +32,8 @@ before_build: - if "%PLATFORM%"=="win32" SET PATH=C:\msys64\mingw32\bin;C:\msys64\mingw64\bin;C:\MinGW\bin;%PATH% build_script: - - sh: |- - mingw32-make testprog.exe CC=cl - ./testprog + - mingw32-make testprog.exe CC=cl + - testprog artifacts: - path: '*.pdf' From 3caa1093154269ac5c40c72dc671831caae07759 Mon Sep 17 00:00:00 2001 From: Andre Renaud Date: Mon, 8 Dec 2025 09:24:28 +1300 Subject: [PATCH 6/7] change PR workflow run so it doesn't run twice --- .github/workflows/build_and_test.yml | 6 +++++- 1 file changed, 5 insertions(+), 1 deletion(-) diff --git a/.github/workflows/build_and_test.yml b/.github/workflows/build_and_test.yml index e7bb14c..0020351 100644 --- a/.github/workflows/build_and_test.yml +++ b/.github/workflows/build_and_test.yml @@ -1,6 +1,10 @@ name: Build and Test -on: [push, pull_request] +on: + push: + branches: + - master + pull_request: jobs: build: From b6a15534b4a3014a745529e6d61c05eac2513fea Mon Sep 17 00:00:00 2001 From: Andre Renaud Date: Mon, 8 Dec 2025 10:04:26 +1300 Subject: [PATCH 7/7] name of artifacts --- .github/workflows/build_and_test.yml | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/.github/workflows/build_and_test.yml b/.github/workflows/build_and_test.yml index 0020351..726a5fb 100644 --- a/.github/workflows/build_and_test.yml +++ b/.github/workflows/build_and_test.yml @@ -43,7 +43,7 @@ jobs: - name: Upload artifacts uses: actions/upload-artifact@v4 with: - name: artifacts + name: main-artifacts path: | output.pdf pdfgen.h @@ -79,7 +79,7 @@ jobs: - name: Upload aritfacts uses: actions/upload-artifact@v4 with: - name: artifacts + name: win32-artifacts path: | output-win32.pdf output-win64.pdf