Skip to content

Commit

Permalink
Merge remote-tracking branch 'upstream/main'
Browse files Browse the repository at this point in the history
  • Loading branch information
Dtenwolde committed Sep 25, 2024
2 parents cbb6578 + 00831df commit cca3d71
Show file tree
Hide file tree
Showing 10 changed files with 715 additions and 182 deletions.
39 changes: 39 additions & 0 deletions .github/workflows/TestCITools.yml
Original file line number Diff line number Diff line change
@@ -0,0 +1,39 @@
#
# This tests the extension-ci-tools works as expected
#
name: Test CI Tools
on:
push:
pull_request:
workflow_dispatch:

concurrency:
group: ${{ github.workflow }}-${{ github.ref }}-${{ github.head_ref || '' }}-${{ github.base_ref || '' }}-${{ github.ref != 'refs/heads/main' || github.sha }}
cancel-in-progress: true

jobs:
extension-template-main:
name: Extension template
uses: ./.github/workflows/_extension_distribution.yml
with:
extension_name: quack
override_repository: duckdb/extension-template
override_ref: main
duckdb_version: v1.1.0
override_ci_tools_repository: ${{ github.repository }}
ci_tools_version: ${{ github.sha }}
extra_toolchains: 'parser_tools;fortran;omp;go'
custom_toolchain_script: true

delta-extension-main:
name: Rust builds (using Delta extension)
uses: ./.github/workflows/_extension_distribution.yml
with:
extension_name: delta
override_repository: duckdb/duckdb_delta
override_ref: 94f887bd539ec0d5ed0d31bd01ff3845cf378a9d
override_ci_tools_repository: ${{ github.repository }}
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'
6 changes: 3 additions & 3 deletions .github/workflows/_extension_deploy.yml
Original file line number Diff line number Diff line change
Expand Up @@ -56,7 +56,7 @@ jobs:
outputs:
deploy_matrix: ${{ steps.parse-matrices.outputs.deploy_matrix }}
steps:
- uses: actions/checkout@v3
- uses: actions/checkout@v4
with:
fetch-depth: 0
submodules: 'true'
Expand All @@ -82,7 +82,7 @@ jobs:
matrix: ${{fromJson(needs.generate_matrix.outputs.deploy_matrix)}}

steps:
- uses: actions/checkout@v3
- uses: actions/checkout@v4
with:
fetch-depth: 0
submodules: 'true'
Expand All @@ -92,7 +92,7 @@ jobs:
cd duckdb
git checkout ${{ inputs.duckdb_version }}
- uses: actions/download-artifact@v2
- uses: actions/download-artifact@v3
with:
name: ${{ inputs.extension_name }}-${{ inputs.duckdb_version }}-extension-${{matrix.duckdb_arch}}${{inputs.artifact_postfix}}${{startsWith(matrix.duckdb, 'wasm') && '.wasm' || ''}}
path: |
Expand Down
Loading

0 comments on commit cca3d71

Please sign in to comment.