Override extension-ci-tools also in JSON generation

duckdb · Oct 7, 2024 · 46fe8f1 · 46fe8f1
1 parent 01f18f6
commit 46fe8f1
Show file tree

Hide file tree

Showing 2 changed files with 10 additions and 2 deletions.
diff --git a/.github/workflows/_extension_distribution.yml b/.github/workflows/_extension_distribution.yml
@@ -131,6 +131,14 @@ jobs:
           fetch-depth: 0
           submodules: 'true'
 
+      - uses: actions/checkout@v4
+        name: Checkout Extension CI tools
+        with:
+          path: 'extension-ci-tools'
+          ref: ${{ inputs.ci_tools_version }}
+          repository: ${{ inputs.override_ci_tools_repository }}
+          fetch-depth: 0
+
       - name: Checkout DuckDB to version
         run: |
           DUCKDB_GIT_VERSION=${{ inputs.duckdb_tag }} make set_duckdb_version
@@ -153,7 +161,7 @@ jobs:
       - id: parse-matrices
         run: |
           mkdir build
-          make output_distribution_matrix > build/distribution_matrix.json
+          make output_distribution_matrix | tail -n +2 > build/distribution_matrix.json
           python3 ${{ inputs.matrix_parse_script }} --input build/distribution_matrix.json --select_os linux --output build/linux_matrix.json --exclude "${{ inputs.exclude_archs }}" --pretty
           python3 ${{ inputs.matrix_parse_script }} --input build/distribution_matrix.json --select_os osx --output build/osx_matrix.json --exclude "${{ inputs.exclude_archs }}" --pretty
           python3 ${{ inputs.matrix_parse_script }} --input build/distribution_matrix.json --select_os windows --output build/windows_matrix.json --exclude "${{ inputs.exclude_archs }}" --pretty

diff --git a/makefiles/duckdb_extension.Makefile b/makefiles/duckdb_extension.Makefile
@@ -139,4 +139,4 @@ set_duckdb_tag:
 	git tag $(DUCKDB_TAG)
 
 output_distribution_matrix:
-	cat ./duckdb/.github/config/distribution_matrix.json
+	cat duckdb/.github/config/distribution_matrix.json