From d37d309335949e4629ae52303907e26ce9c9c6b1 Mon Sep 17 00:00:00 2001 From: ochafik Date: Sat, 8 Feb 2025 15:17:48 +0000 Subject: [PATCH 1/4] Install alternative curl to maybe avoid flaky auto certification revocation --- .github/workflows/build.yml | 50 +++++++++++++++++++++++++++++-------- 1 file changed, 40 insertions(+), 10 deletions(-) diff --git a/.github/workflows/build.yml b/.github/workflows/build.yml index 6841ba589..a5028a4df 100644 --- a/.github/workflows/build.yml +++ b/.github/workflows/build.yml @@ -693,6 +693,14 @@ jobs: - name: Clone uses: actions/checkout@v4 + - name: Install Deps + run: | + choco install curl + + - name: Check curl version + run: | + curl --version + - name: ccache uses: hendrikmuhs/ccache-action@v1.2.16 with: @@ -768,6 +776,14 @@ jobs: with: fetch-depth: 0 + - name: Install Deps + run: | + choco install ninja curl + + - name: Check curl version + run: | + curl --version + - name: ccache uses: hendrikmuhs/ccache-action@v1.2.16 with: @@ -803,11 +819,6 @@ jobs: Add-Content $env:GITHUB_ENV "VULKAN_SDK=C:\VulkanSDK\${env:VULKAN_VERSION}" Add-Content $env:GITHUB_PATH "C:\VulkanSDK\${env:VULKAN_VERSION}\bin" - - name: Install Ninja - id: install_ninja - run: | - choco install ninja - - name: Install OpenCL Headers and Libs id: install_opencl if: ${{ matrix.build == 'llvm-arm64-opencl-adreno' }} @@ -953,6 +964,14 @@ jobs: with: fetch-depth: 0 + - name: Install Deps + run: | + choco install ninja curl + + - name: Check curl version + run: | + curl --version + - name: Install ccache uses: hendrikmuhs/ccache-action@v1.2.16 with: @@ -1016,11 +1035,6 @@ jobs: echo "CUDA_PATH=C:\Program Files\NVIDIA GPU Computing Toolkit\CUDA\v12.4" | Out-File -FilePath $env:GITHUB_ENV -Append -Encoding utf8 echo "CUDA_PATH_V12_4=C:\Program Files\NVIDIA GPU Computing Toolkit\CUDA\v12.4" | Out-File -FilePath $env:GITHUB_ENV -Append -Encoding utf8 - - name: Install Ninja - id: install_ninja - run: | - choco install ninja - - name: Build id: cmake_build shell: cmd @@ -1095,6 +1109,14 @@ jobs: with: fetch-depth: 0 + - name: Install Deps + run: | + choco install curl + + - name: Check curl version + run: | + curl --version + - name: ccache uses: hendrikmuhs/ccache-action@v1.2.16 with: @@ -1214,6 +1236,14 @@ jobs: with: fetch-depth: 0 + - name: Install Deps + run: | + choco install curl + + - name: Check curl version + run: | + curl --version + - name: ccache uses: hendrikmuhs/ccache-action@v1.2.16 with: From 5f15932ab43c4007c8109e921d67caf798106c91 Mon Sep 17 00:00:00 2001 From: ochafik Date: Sat, 8 Feb 2025 15:26:20 +0000 Subject: [PATCH 2/4] check curl version *before* the choco deps install (temp) --- .github/workflows/build.yml | 25 ++++++++++++++++++++----- 1 file changed, 20 insertions(+), 5 deletions(-) diff --git a/.github/workflows/build.yml b/.github/workflows/build.yml index a5028a4df..647208bbc 100644 --- a/.github/workflows/build.yml +++ b/.github/workflows/build.yml @@ -693,7 +693,10 @@ jobs: - name: Clone uses: actions/checkout@v4 - - name: Install Deps + - name: Check curl version BEFORE + run: curl --version + + - name: Install Choco Deps run: | choco install curl @@ -776,7 +779,10 @@ jobs: with: fetch-depth: 0 - - name: Install Deps + - name: Check curl version BEFORE + run: curl --version + + - name: Install Choco Deps run: | choco install ninja curl @@ -964,7 +970,10 @@ jobs: with: fetch-depth: 0 - - name: Install Deps + - name: Check curl version BEFORE + run: curl --version + + - name: Install Choco Deps run: | choco install ninja curl @@ -1109,7 +1118,10 @@ jobs: with: fetch-depth: 0 - - name: Install Deps + - name: Check curl version BEFORE + run: curl --version + + - name: Install Choco Deps run: | choco install curl @@ -1236,7 +1248,10 @@ jobs: with: fetch-depth: 0 - - name: Install Deps + - name: Check curl version BEFORE + run: curl --version + + - name: Install Choco Deps run: | choco install curl From b2b8c6140a08a896a860d076086f71fc1225326f Mon Sep 17 00:00:00 2001 From: ochafik Date: Sat, 8 Feb 2025 17:09:17 +0000 Subject: [PATCH 3/4] revert changes --- .github/workflows/build.yml | 65 ++++++------------------------------- 1 file changed, 10 insertions(+), 55 deletions(-) diff --git a/.github/workflows/build.yml b/.github/workflows/build.yml index 647208bbc..6841ba589 100644 --- a/.github/workflows/build.yml +++ b/.github/workflows/build.yml @@ -693,17 +693,6 @@ jobs: - name: Clone uses: actions/checkout@v4 - - name: Check curl version BEFORE - run: curl --version - - - name: Install Choco Deps - run: | - choco install curl - - - name: Check curl version - run: | - curl --version - - name: ccache uses: hendrikmuhs/ccache-action@v1.2.16 with: @@ -779,17 +768,6 @@ jobs: with: fetch-depth: 0 - - name: Check curl version BEFORE - run: curl --version - - - name: Install Choco Deps - run: | - choco install ninja curl - - - name: Check curl version - run: | - curl --version - - name: ccache uses: hendrikmuhs/ccache-action@v1.2.16 with: @@ -825,6 +803,11 @@ jobs: Add-Content $env:GITHUB_ENV "VULKAN_SDK=C:\VulkanSDK\${env:VULKAN_VERSION}" Add-Content $env:GITHUB_PATH "C:\VulkanSDK\${env:VULKAN_VERSION}\bin" + - name: Install Ninja + id: install_ninja + run: | + choco install ninja + - name: Install OpenCL Headers and Libs id: install_opencl if: ${{ matrix.build == 'llvm-arm64-opencl-adreno' }} @@ -970,17 +953,6 @@ jobs: with: fetch-depth: 0 - - name: Check curl version BEFORE - run: curl --version - - - name: Install Choco Deps - run: | - choco install ninja curl - - - name: Check curl version - run: | - curl --version - - name: Install ccache uses: hendrikmuhs/ccache-action@v1.2.16 with: @@ -1044,6 +1016,11 @@ jobs: echo "CUDA_PATH=C:\Program Files\NVIDIA GPU Computing Toolkit\CUDA\v12.4" | Out-File -FilePath $env:GITHUB_ENV -Append -Encoding utf8 echo "CUDA_PATH_V12_4=C:\Program Files\NVIDIA GPU Computing Toolkit\CUDA\v12.4" | Out-File -FilePath $env:GITHUB_ENV -Append -Encoding utf8 + - name: Install Ninja + id: install_ninja + run: | + choco install ninja + - name: Build id: cmake_build shell: cmd @@ -1118,17 +1095,6 @@ jobs: with: fetch-depth: 0 - - name: Check curl version BEFORE - run: curl --version - - - name: Install Choco Deps - run: | - choco install curl - - - name: Check curl version - run: | - curl --version - - name: ccache uses: hendrikmuhs/ccache-action@v1.2.16 with: @@ -1248,17 +1214,6 @@ jobs: with: fetch-depth: 0 - - name: Check curl version BEFORE - run: curl --version - - - name: Install Choco Deps - run: | - choco install curl - - - name: Check curl version - run: | - curl --version - - name: ccache uses: hendrikmuhs/ccache-action@v1.2.16 with: From e78170eefb9fca4a9546d699506db29ee6306cae Mon Sep 17 00:00:00 2001 From: ochafik Date: Sat, 8 Feb 2025 17:11:34 +0000 Subject: [PATCH 4/4] trigger ci again --- .github/workflows/build.yml | 1 + 1 file changed, 1 insertion(+) diff --git a/.github/workflows/build.yml b/.github/workflows/build.yml index 6841ba589..34a440245 100644 --- a/.github/workflows/build.yml +++ b/.github/workflows/build.yml @@ -1095,6 +1095,7 @@ jobs: with: fetch-depth: 0 + - name: ccache uses: hendrikmuhs/ccache-action@v1.2.16 with: