From 07806ffcab0b6f98fff6797cfa36ff7513403788 Mon Sep 17 00:00:00 2001 From: Jean-Frederic Clere Date: Mon, 16 Jun 2025 15:24:57 +0200 Subject: [PATCH 1/5] Add an artifact for easy testing. --- .github/workflows/makefile.yml | 4 ++++ 1 file changed, 4 insertions(+) diff --git a/.github/workflows/makefile.yml b/.github/workflows/makefile.yml index ad8a4412a..02025fd39 100644 --- a/.github/workflows/makefile.yml +++ b/.github/workflows/makefile.yml @@ -84,3 +84,7 @@ jobs: cd native echo "Building for ${{ matrix.build-arch }}" nmake -f NMAKEmakefile CPU=${{ matrix.build-arch }} WITH_APR=C:\APR WITH_OPENSSL=C:\OPENSSL APR_DECLARE_STATIC=1 STATIC_CRT=Hybrid OPENSSL_NEW_LIBS=1 ENABLE_OCSP=1 + - uses: actions/upload-artifact@v4 + with: + name: windows-artifact + path: native/WIN7_X64_DLL_RELEASE\tcnative-2.dll From b2d760992077bff8ce61b3d9f103c29899824414 Mon Sep 17 00:00:00 2001 From: Jean-Frederic Clere Date: Mon, 16 Jun 2025 15:47:09 +0200 Subject: [PATCH 2/5] Add the branch... --- .github/workflows/makefile.yml | 2 ++ 1 file changed, 2 insertions(+) diff --git a/.github/workflows/makefile.yml b/.github/workflows/makefile.yml index 02025fd39..74f60ba26 100644 --- a/.github/workflows/makefile.yml +++ b/.github/workflows/makefile.yml @@ -2,7 +2,9 @@ name: Makefile CI on: push: + branches: [ "main" ] pull_request: + branches: [ "main" ] env: OPENSSL_VERSION: 3.5.0 From 15fec87e4bcd216c711445d8197036f474e5ec08 Mon Sep 17 00:00:00 2001 From: Jean-Frederic Clere Date: Mon, 16 Jun 2025 16:04:47 +0200 Subject: [PATCH 3/5] typo... --- .github/workflows/makefile.yml | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/.github/workflows/makefile.yml b/.github/workflows/makefile.yml index 74f60ba26..66fae26cb 100644 --- a/.github/workflows/makefile.yml +++ b/.github/workflows/makefile.yml @@ -89,4 +89,4 @@ jobs: - uses: actions/upload-artifact@v4 with: name: windows-artifact - path: native/WIN7_X64_DLL_RELEASE\tcnative-2.dll + path: native\WIN7_X64_DLL_RELEASE\tcnative-2.dll From 535ed3052d5f391b573703b8e7663e47f0a66f26 Mon Sep 17 00:00:00 2001 From: Jean-Frederic Clere Date: Mon, 16 Jun 2025 16:20:10 +0200 Subject: [PATCH 4/5] try something else... --- .github/workflows/makefile.yml | 4 ---- 1 file changed, 4 deletions(-) diff --git a/.github/workflows/makefile.yml b/.github/workflows/makefile.yml index 66fae26cb..ba1be126a 100644 --- a/.github/workflows/makefile.yml +++ b/.github/workflows/makefile.yml @@ -86,7 +86,3 @@ jobs: cd native echo "Building for ${{ matrix.build-arch }}" nmake -f NMAKEmakefile CPU=${{ matrix.build-arch }} WITH_APR=C:\APR WITH_OPENSSL=C:\OPENSSL APR_DECLARE_STATIC=1 STATIC_CRT=Hybrid OPENSSL_NEW_LIBS=1 ENABLE_OCSP=1 - - uses: actions/upload-artifact@v4 - with: - name: windows-artifact - path: native\WIN7_X64_DLL_RELEASE\tcnative-2.dll From 6fd8b848e391909a11a093cd9b7ff9ea829d5d7f Mon Sep 17 00:00:00 2001 From: Jean-Frederic Clere Date: Mon, 16 Jun 2025 16:37:54 +0200 Subject: [PATCH 5/5] Oops ref was here... --- .github/workflows/makefile.yml | 4 ---- 1 file changed, 4 deletions(-) diff --git a/.github/workflows/makefile.yml b/.github/workflows/makefile.yml index ba1be126a..a67b2d0e7 100644 --- a/.github/workflows/makefile.yml +++ b/.github/workflows/makefile.yml @@ -2,9 +2,7 @@ name: Makefile CI on: push: - branches: [ "main" ] pull_request: - branches: [ "main" ] env: OPENSSL_VERSION: 3.5.0 @@ -26,8 +24,6 @@ jobs: runs-on: windows-latest steps: - uses: actions/checkout@v4 - with: - ref: trunk - name: Download Openssl using curl and Expand-Archive shell: pwsh run: |