From b2859a33c9e086463a86b424d5194e7cbea0de2c Mon Sep 17 00:00:00 2001
From: Sam Ansmink <samansmink@hotmail.com>
Date: Fri, 20 Sep 2024 14:36:15 +0200
Subject: [PATCH] force passing ci tools version

---
 .github/workflows/TestCITools.yml             |  4 ++--
 .github/workflows/_extension_distribution.yml | 22 ++++++++-----------
 2 files changed, 11 insertions(+), 15 deletions(-)

diff --git a/.github/workflows/TestCITools.yml b/.github/workflows/TestCITools.yml
index 3910a51..93ab297 100644
--- a/.github/workflows/TestCITools.yml
+++ b/.github/workflows/TestCITools.yml
@@ -21,7 +21,7 @@ jobs:
       override_ref: main
       duckdb_version: v1.1.0
       override_ci_tools_repository: ${{ github.repository }}
-      override_ci_tools_ref: ${{ github.sha }}
+      ci_tools_version: ${{ github.sha }}
       extra_toolchains: 'parser_tools;fortran;omp;go'
       custom_toolchain_script: true
 
@@ -33,7 +33,7 @@ jobs:
       override_repository: duckdb/duckdb_delta
       override_ref: 94f887bd539ec0d5ed0d31bd01ff3845cf378a9d
       override_ci_tools_repository: ${{ github.repository }}
-      override_ci_tools_ref: ${{ github.sha }}
+      ci_tools_version: ${{ github.sha }}
       duckdb_version: v1.1.0
       exclude_archs: 'wasm_mvp;wasm_eh;wasm_threads;windows_amd64_rtools;windows_amd64'
       extra_toolchains: 'rust'
\ No newline at end of file
diff --git a/.github/workflows/_extension_distribution.yml b/.github/workflows/_extension_distribution.yml
index 94a451f..bae7fed 100644
--- a/.github/workflows/_extension_distribution.yml
+++ b/.github/workflows/_extension_distribution.yml
@@ -20,6 +20,11 @@ on:
       duckdb_version:
         required: true
         type: string
+      # The version of the https://github.com/duckdb/extension-ci-tools submodule of the extension. In most cases will be identical to `duckdb_version`.
+      # Passing this explicitly is required because of https://github.com/actions/toolkit/issues/1264
+      ci_tools_version:
+        required: true
+        type: string
       # ';' separated list of architectures to exclude, for example: 'linux_amd64;osx_arm64'
       exclude_archs:
         required: false
@@ -65,11 +70,6 @@ on:
         required: false
         type: string
         default: ""
-      # Override the ref for the CI tools (for testing CI tools itself)
-      override_ci_tools_ref:
-        required: false
-        type: string
-        default: ""
       # Pass extra toolchains
       #   available: (rust, fortran, omp)
       extra_toolchains:
@@ -186,10 +186,9 @@ jobs:
 
       - uses: actions/checkout@v4
         name: Checkout Extension CI tools
-        if: ${{inputs.override_ci_tools_ref != ''}}
         with:
           path: 'extension-ci-tools'
-          ref: ${{ inputs.override_ci_tools_ref }}
+          ref: ${{ inputs.ci_tools_version }}
           repository: ${{ inputs.override_ci_tools_repository }}
           fetch-depth: 0
 
@@ -305,10 +304,9 @@ jobs:
 
       - uses: actions/checkout@v4
         name: Checkout Extension CI tools
-        if: ${{inputs.override_ci_tools_ref != ''}}
         with:
           path: 'extension-ci-tools'
-          ref: ${{ inputs.override_ci_tools_ref }}
+          ref: ${{ inputs.ci_tools_version }}
           repository: ${{ inputs.override_ci_tools_repository }}
           fetch-depth: 0
 
@@ -461,10 +459,9 @@ jobs:
 
       - uses: actions/checkout@v4
         name: Checkout Extension CI tools
-        if: ${{inputs.override_ci_tools_ref != ''}}
         with:
           path: 'extension-ci-tools'
-          ref: ${{ inputs.override_ci_tools_ref }}
+          ref: ${{ inputs.ci_tools_version }}
           repository: ${{ inputs.override_ci_tools_repository }}
           fetch-depth: 0
 
@@ -546,10 +543,9 @@ jobs:
 
       - uses: actions/checkout@v4
         name: Checkout Extension CI tools
-        if: ${{inputs.override_ci_tools_ref != ''}}
         with:
           path: 'extension-ci-tools'
-          ref: ${{ inputs.override_ci_tools_ref }}
+          ref: ${{ inputs.ci_tools_version }}
           repository: ${{ inputs.override_ci_tools_repository }}
           fetch-depth: 0