Skip to content

Commit 1c97dc6

Browse files
Resolve merge conflict: keep updated snowflake refs
2 parents 5557468 + ef77c7b commit 1c97dc6

File tree

22 files changed

+92
-47
lines changed

22 files changed

+92
-47
lines changed

.github/workflows/_extension_deploy.yml

Lines changed: 8 additions & 16 deletions
Original file line numberDiff line numberDiff line change
@@ -18,6 +18,10 @@ on:
1818
duckdb_version:
1919
required: true
2020
type: string
21+
# Extension CI tools version to use
22+
ci_tools_version:
23+
required: true
24+
type: string
2125
# ';' separated list of architectures to exclude, for example: 'linux_amd64;osx_arm64'
2226
exclude_archs:
2327
required: false
@@ -43,11 +47,6 @@ on:
4347
required: false
4448
type: string
4549
default: "./duckdb/scripts/extension-upload-single.sh"
46-
# Override the default matrix parse script with a custom script
47-
matrix_parse_script:
48-
required: false
49-
type: string
50-
default: "./duckdb/scripts/modify_distribution_matrix.py"
5150
repository:
5251
required: false
5352
type: string
@@ -65,21 +64,14 @@ jobs:
6564
steps:
6665
- uses: actions/checkout@v3
6766
with:
68-
repository: ${{ inputs.repository }}
69-
ref: ${{ inputs.ref }}
70-
fetch-depth: 0
71-
submodules: 'true'
72-
73-
- uses: actions/checkout@v3
74-
with:
75-
repository: 'duckdb/duckdb'
76-
ref: ${{ inputs.duckdb_version }}
77-
path: duckdb
67+
repository: 'duckdb/extension-ci-tools'
68+
ref: ${{ inputs.ci_tools_version }}
69+
path: extension-ci-tools
7870
fetch-depth: 0
7971

8072
- id: parse-matrices
8173
run: |
82-
python3 ${{ inputs.matrix_parse_script }} --input ./duckdb/.github/config/distribution_matrix.json --deploy_matrix --output deploy_matrix.json --exclude "${{ inputs.exclude_archs }}" --pretty
74+
python3 ./extension-ci-tools/scripts/modify_distribution_matrix.py --input ./extension-ci-tools/config/distribution_matrix.json --deploy_matrix --output deploy_matrix.json --exclude "${{ inputs.exclude_archs }}" --pretty
8375
deploy_matrix="`cat deploy_matrix.json`"
8476
echo deploy_matrix=$deploy_matrix >> $GITHUB_OUTPUT
8577
echo `cat $GITHUB_OUTPUT`

.github/workflows/build.yml

Lines changed: 6 additions & 5 deletions
Original file line numberDiff line numberDiff line change
@@ -59,8 +59,8 @@ jobs:
5959
COMMUNITY_EXTENSION_VCPKG_URL: ${{ steps.parse.outputs.COMMUNITY_EXTENSION_VCPKG_URL == '' && 'https://github.com/microsoft/vcpkg.git' || steps.parse.outputs.COMMUNITY_EXTENSION_VCPKG_URL }}
6060
COMMUNITY_EXTENSION_VCPKG_COMMIT: ${{ steps.parse.outputs.COMMUNITY_EXTENSION_VCPKG_COMMIT == '' && 'ce613c41372b23b1f51333815feb3edd87ef8a8b' || steps.parse.outputs.COMMUNITY_EXTENSION_VCPKG_COMMIT }}
6161
env:
62-
DUCKDB_LATEST_STABLE: 'v1.3.2'
63-
DUCKDB_VERSION: ${{ inputs.duckdb_version || 'v1.3.2' }}
62+
DUCKDB_LATEST_STABLE: 'v1.4.0'
63+
DUCKDB_VERSION: ${{ inputs.duckdb_version || 'v1.4.0' }}
6464
runs-on: ubuntu-latest
6565
steps:
6666
- uses: actions/checkout@v4
@@ -91,7 +91,7 @@ jobs:
9191
uses: duckdb/extension-ci-tools/.github/workflows/_extension_distribution.yml@main
9292
if: ${{ needs.prepare.outputs.COMMUNITY_EXTENSION_NAME != '' }}
9393
with:
94-
duckdb_version: ${{ inputs.duckdb_version || 'v1.3.2' }}
94+
duckdb_version: ${{ inputs.duckdb_version || 'v1.4.0' }}
9595
duckdb_tag: ${{ inputs.duckdb_tag || '' }}
9696
ci_tools_version: 'main'
9797
exclude_archs: ${{ needs.prepare.outputs.COMMUNITY_EXTENSION_EXCLUDE_PLATFORMS }}
@@ -114,7 +114,7 @@ jobs:
114114
uses: ./.github/workflows/generate_docs.yml
115115
with:
116116
extension_name: ${{ needs.prepare.outputs.COMMUNITY_EXTENSION_NAME }}
117-
duckdb_version: ${{ inputs.duckdb_version || 'v1.3.2' }}
117+
duckdb_version: ${{ inputs.duckdb_version || 'v1.4.0' }}
118118

119119
archive:
120120
needs:
@@ -138,7 +138,8 @@ jobs:
138138
secrets: inherit
139139
with:
140140
deploy_latest: true
141-
duckdb_version: ${{ inputs.duckdb_version || 'v1.3.2' }}
141+
duckdb_version: ${{ inputs.duckdb_version || 'v1.4.0' }}
142+
ci_tools_version: 'main'
142143
exclude_archs: ${{ needs.prepare.outputs.COMMUNITY_EXTENSION_EXCLUDE_PLATFORMS }}
143144
extension_name: ${{ needs.prepare.outputs.COMMUNITY_EXTENSION_NAME }}
144145
repository: ${{ needs.prepare.outputs.COMMUNITY_EXTENSION_GITHUB }}

.github/workflows/build_all.yml

Lines changed: 13 additions & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -8,6 +8,11 @@ on:
88
type: string
99
deploy:
1010
type: string
11+
build_extensions:
12+
description: "List of extensions to build, formatted as: `['ext1', 'ext2']`"
13+
type: string
14+
required: false
15+
default: ''
1116

1217
jobs:
1318
collect_extensions:
@@ -22,10 +27,14 @@ jobs:
2227
- name: Generate extension list
2328
id: generate_list
2429
run: |
25-
./scripts/get_extension_list.sh
26-
cat extension_list
27-
cat extension_list >> $GITHUB_OUTPUT
28-
30+
if [[ "${{inputs.build_extensions}}" == "" ]]; then
31+
./scripts/get_extension_list.sh
32+
cat extension_list
33+
cat extension_list >> $GITHUB_OUTPUT
34+
else
35+
echo "EXTENSION_LIST=${{inputs.build_extensions}}" >> $GITHUB_OUTPUT
36+
fi
37+
2938
build_all:
3039
needs:
3140
- collect_extensions

.github/workflows/build_next.yml

Lines changed: 1 addition & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -15,6 +15,7 @@ on:
1515

1616
jobs:
1717
test_against_latest:
18+
if: false
1819
uses: ./.github/workflows/build.yml
1920
with:
2021
duckdb_version: 'v1.4-andium'

.github/workflows/cache_warming.yml

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -10,7 +10,7 @@ jobs:
1010
name: Warm CCache using DuckDB C++ extension template
1111
uses: duckdb/extension-ci-tools/.github/workflows/_extension_distribution.yml@main
1212
with:
13-
duckdb_version: 'v1.3.2'
13+
duckdb_version: 'v1.4.0'
1414
ci_tools_version: 'main' # TODO: this should probably be v1.3.1?
1515
extra_toolchains: ''
1616
extension_name: 'quack'
@@ -40,7 +40,7 @@ jobs:
4040
uses: duckdb/extension-ci-tools/.github/workflows/_extension_distribution.yml@main
4141
needs: parse_dependency_list
4242
with:
43-
duckdb_version: 'v1.3.2'
43+
duckdb_version: 'v1.4.0'
4444
ci_tools_version: 'main' # TODO: this should probably be v1.3.1?
4545
extra_toolchains: ';rust;go;fortran;parser_tools;'
4646
extension_name: 'capi_quack'

.github/workflows/generate_docs.yml

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -26,7 +26,7 @@ jobs:
2626

2727
- name: Set up DuckDB
2828
run: |
29-
wget https://github.com/duckdb/duckdb/releases/download/v1.3.2/duckdb_cli-linux-amd64.zip
29+
wget https://github.com/duckdb/duckdb/releases/download/v1.4.0/duckdb_cli-linux-amd64.zip
3030
unzip duckdb_cli-linux-amd64.zip
3131
chmod +x duckdb
3232

extensions/bigquery/description.yml

Lines changed: 1 addition & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -13,8 +13,7 @@ extension:
1313

1414
repo:
1515
github: hafenkran/duckdb-bigquery
16-
ref: 31aeb97b17ba0a4d83e8975548accb958af6d495
17-
ref_next: 10882a382d45f941d9672c5030fab22e34660792
16+
ref: 10882a382d45f941d9672c5030fab22e34660792
1817

1918
docs:
2019
hello_world: |

extensions/bitfilters/description.yml

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -12,4 +12,4 @@ extension:
1212
version: 1.0.1
1313
repo:
1414
github: query-farm/bitfilters
15-
ref: c706048a3f7ac37c84068280c76df071a1a9e97e
15+
ref: 4b3a69ae8616083e3506cfce3f5526bbcf9d16d2

extensions/capi_quack/description.yml

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -11,7 +11,7 @@ extension:
1111

1212
repo:
1313
github: duckdb/extension-template-c
14-
ref: 7463f669f6ea6705876dee047114f6484ba6ef6f
14+
ref: 7f71365c5ce61b2b346717af07c9d448cfc9d3c3
1515

1616
docs:
1717
extended_description: |

extensions/eeagrid/description.yml

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -10,7 +10,7 @@ extension:
1010

1111
repo:
1212
github: ahuarte47/duckdb-eeagrid
13-
ref: 6d22b0a910012f4ad391d90207673173a1682881
13+
ref: 7baa632d47cb58830b82eb515eb01c34a0d2cb25
1414

1515
docs:
1616
hello_world: |

0 commit comments

Comments
 (0)