From f89cffa95e2cf7500d36afc46d407062cd74fd7e Mon Sep 17 00:00:00 2001 From: ochafik Date: Sat, 8 Feb 2025 16:10:00 +0000 Subject: [PATCH 1/7] Attempt to use curl that doesn't choke on unavailable cert revocation servers --- .github/workflows/build.yml | 12 ++++++++++++ 1 file changed, 12 insertions(+) diff --git a/.github/workflows/build.yml b/.github/workflows/build.yml index d73d9b9..3a62c5d 100644 --- a/.github/workflows/build.yml +++ b/.github/workflows/build.yml @@ -54,6 +54,18 @@ jobs: with: fetch-depth: 0 + - name: Install Choco Deps + if: matrix.setup.os == 'windows-latest' + run: | + choco install curl msys2 --yes + + - name: Prepend MSYS2 to PATH + if: matrix.setup.os == 'windows-latest' + run: echo "C:\msys64\usr\bin" >> $GITHUB_PATH + + - name: Check curl version + run: curl --version + - name: ccache uses: hendrikmuhs/ccache-action@v1.2.11 with: From b56e19a936985ef05768b48735bbd58bfed54b75 Mon Sep 17 00:00:00 2001 From: ochafik Date: Sat, 8 Feb 2025 16:27:27 +0000 Subject: [PATCH 2/7] attempt to only install curl, not msys (since ccache-action uses git's sh.exe anyway) --- .github/workflows/build.yml | 18 +++++++++++------- 1 file changed, 11 insertions(+), 7 deletions(-) diff --git a/.github/workflows/build.yml b/.github/workflows/build.yml index 3a62c5d..a728707 100644 --- a/.github/workflows/build.yml +++ b/.github/workflows/build.yml @@ -54,22 +54,26 @@ jobs: with: fetch-depth: 0 + - name: Check curl version BEFORE + if: matrix.setup.os == 'windows-latest' + run: "C:\Program Files\Git\bin\sh.exe" -xc "curl --version" + - name: Install Choco Deps if: matrix.setup.os == 'windows-latest' run: | - choco install curl msys2 --yes + choco install curl --yes + echo "C:\ProgramData\chocolatey\bin" >> $GITHUB_PATH + curl --version - - name: Prepend MSYS2 to PATH + - name: Check curl version AFTER if: matrix.setup.os == 'windows-latest' - run: echo "C:\msys64\usr\bin" >> $GITHUB_PATH - - - name: Check curl version - run: curl --version - + run: "C:\Program Files\Git\bin\sh.exe" -xc "curl --version" + - name: ccache uses: hendrikmuhs/ccache-action@v1.2.11 with: key: ${{ matrix.setup.os }}-${{ matrix.setup.build }}-${{ matrix.type }} + variant: ${{ matrix.setup.os == 'windows-latest' ? 'sccache' : 'ccache' }} - name: Set up CMake uses: lukka/get-cmake@latest From 68cfc4d346cd9b1b8ff2906999a2fd26fc804872 Mon Sep 17 00:00:00 2001 From: ochafik Date: Sat, 8 Feb 2025 16:32:44 +0000 Subject: [PATCH 3/7] Update build.yml --- .github/workflows/build.yml | 12 +++++++----- 1 file changed, 7 insertions(+), 5 deletions(-) diff --git a/.github/workflows/build.yml b/.github/workflows/build.yml index a728707..9d2f7b4 100644 --- a/.github/workflows/build.yml +++ b/.github/workflows/build.yml @@ -55,19 +55,21 @@ jobs: fetch-depth: 0 - name: Check curl version BEFORE - if: matrix.setup.os == 'windows-latest' - run: "C:\Program Files\Git\bin\sh.exe" -xc "curl --version" + if: ${{ matrix.setup.os == 'windows-latest' }} + run: | + "C:\Program Files\Git\bin\sh.exe" -xc "curl --version" - name: Install Choco Deps - if: matrix.setup.os == 'windows-latest' + if: ${{ matrix.setup.os == 'windows-latest' }} run: | choco install curl --yes echo "C:\ProgramData\chocolatey\bin" >> $GITHUB_PATH curl --version - name: Check curl version AFTER - if: matrix.setup.os == 'windows-latest' - run: "C:\Program Files\Git\bin\sh.exe" -xc "curl --version" + if: ${{ matrix.setup.os == 'windows-latest' }} + run: | + "C:\Program Files\Git\bin\sh.exe" -xc "curl --version" - name: ccache uses: hendrikmuhs/ccache-action@v1.2.11 From ec7292fc9980ef57be01094f10d8b832bc8940eb Mon Sep 17 00:00:00 2001 From: ochafik Date: Sat, 8 Feb 2025 16:34:01 +0000 Subject: [PATCH 4/7] Update build.yml --- .github/workflows/build.yml | 1 - 1 file changed, 1 deletion(-) diff --git a/.github/workflows/build.yml b/.github/workflows/build.yml index 9d2f7b4..b7843c1 100644 --- a/.github/workflows/build.yml +++ b/.github/workflows/build.yml @@ -75,7 +75,6 @@ jobs: uses: hendrikmuhs/ccache-action@v1.2.11 with: key: ${{ matrix.setup.os }}-${{ matrix.setup.build }}-${{ matrix.type }} - variant: ${{ matrix.setup.os == 'windows-latest' ? 'sccache' : 'ccache' }} - name: Set up CMake uses: lukka/get-cmake@latest From 77c81f2d56526fa381511affae9b74d01cc060cf Mon Sep 17 00:00:00 2001 From: ochafik Date: Sat, 8 Feb 2025 16:37:41 +0000 Subject: [PATCH 5/7] Update build.yml --- .github/workflows/build.yml | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/.github/workflows/build.yml b/.github/workflows/build.yml index b7843c1..ad1e0a1 100644 --- a/.github/workflows/build.yml +++ b/.github/workflows/build.yml @@ -57,7 +57,7 @@ jobs: - name: Check curl version BEFORE if: ${{ matrix.setup.os == 'windows-latest' }} run: | - "C:\Program Files\Git\bin\sh.exe" -xc "curl --version" + & "C:\Program Files\Git\bin\sh.exe" -xc 'curl --version' - name: Install Choco Deps if: ${{ matrix.setup.os == 'windows-latest' }} @@ -69,7 +69,7 @@ jobs: - name: Check curl version AFTER if: ${{ matrix.setup.os == 'windows-latest' }} run: | - "C:\Program Files\Git\bin\sh.exe" -xc "curl --version" + & "C:\Program Files\Git\bin\sh.exe" -xc 'curl --version' - name: ccache uses: hendrikmuhs/ccache-action@v1.2.11 From e8f52405676330ce9920e698c25c009796c09574 Mon Sep 17 00:00:00 2001 From: ochafik Date: Sat, 8 Feb 2025 16:39:43 +0000 Subject: [PATCH 6/7] cancel-in-progress: true --- .github/workflows/build.yml | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/.github/workflows/build.yml b/.github/workflows/build.yml index ad1e0a1..e6b44bc 100644 --- a/.github/workflows/build.yml +++ b/.github/workflows/build.yml @@ -12,7 +12,7 @@ on: concurrency: group: ${{ github.workflow }}-${{ github.head_ref && github.ref || github.run_id }} # group: ${{ github.workflow }}-${{ github.head_ref && github.ref || github.run_id }}-${{ matrix.setup.os }}-${{ matrix.setup.build }}-${{ matrix.type }} - # cancel-in-progress: true + cancel-in-progress: true jobs: build_and_test: From ec028039afec029b2fcd6ceb8b54b131d96979bf Mon Sep 17 00:00:00 2001 From: ochafik Date: Sat, 8 Feb 2025 16:45:23 +0000 Subject: [PATCH 7/7] disable changes --- .github/workflows/build.yml | 28 ++++++++++++++-------------- 1 file changed, 14 insertions(+), 14 deletions(-) diff --git a/.github/workflows/build.yml b/.github/workflows/build.yml index e6b44bc..e6ca7b1 100644 --- a/.github/workflows/build.yml +++ b/.github/workflows/build.yml @@ -54,22 +54,22 @@ jobs: with: fetch-depth: 0 - - name: Check curl version BEFORE - if: ${{ matrix.setup.os == 'windows-latest' }} - run: | - & "C:\Program Files\Git\bin\sh.exe" -xc 'curl --version' + # - name: Check curl version BEFORE + # if: ${{ matrix.setup.os == 'windows-latest' }} + # run: | + # & "C:\Program Files\Git\bin\sh.exe" -xc 'curl --version' - - name: Install Choco Deps - if: ${{ matrix.setup.os == 'windows-latest' }} - run: | - choco install curl --yes - echo "C:\ProgramData\chocolatey\bin" >> $GITHUB_PATH - curl --version + # - name: Install Choco Deps + # if: ${{ matrix.setup.os == 'windows-latest' }} + # run: | + # choco install curl --yes + # echo "C:\ProgramData\chocolatey\bin" >> $GITHUB_PATH + # curl --version - - name: Check curl version AFTER - if: ${{ matrix.setup.os == 'windows-latest' }} - run: | - & "C:\Program Files\Git\bin\sh.exe" -xc 'curl --version' + # - name: Check curl version AFTER + # if: ${{ matrix.setup.os == 'windows-latest' }} + # run: | + # & "C:\Program Files\Git\bin\sh.exe" -xc 'curl --version' - name: ccache uses: hendrikmuhs/ccache-action@v1.2.11