Skip to content
New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Jump to bottom

Move duckdb specifics from workflow to Makefile #88

Merged
merged 8 commits into from
Oct 8, 2024
Merged

Move duckdb specifics from workflow to Makefile #88

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
8 commits
Select commit Hold shift + click to select a range
03c8e1e
Add set_duckdb_version|tag, to prepare for CAPI extensions
carlopi Oct 7, 2024
01f18f6
More refactor of makefile
carlopi Oct 7, 2024
46fe8f1
Override extension-ci-tools also in JSON generation
carlopi Oct 7, 2024
b8fe302
Add missing extension-ci-tools checkout
carlopi Oct 7, 2024
54947d0
Skip full history on extension-ci-tools
carlopi Oct 7, 2024
150e818
Fixup passing of duckdb_version
carlopi Oct 7, 2024
743d4dd
Fixup makefile
carlopi Oct 7, 2024
aa3e8a8
Fix windows env passing
carlopi Oct 7, 2024
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
76 changes: 43 additions & 33 deletions .github/workflows/_extension_distribution.yml
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -131,10 +131,17 @@ 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 }}

- name: Checkout DuckDB to version
if: ${{inputs.duckdb_version != ''}}
run: |
cd duckdb
git checkout ${{ inputs.duckdb_version }}
DUCKDB_GIT_VERSION=${{ inputs.duckdb_version }} make set_duckdb_version

- name: Tag extension
if: ${{inputs.extension_tag != ''}}
Expand All @@ -149,37 +156,38 @@ jobs:
- name: Tag DuckDB extension
if: ${{inputs.duckdb_tag != ''}}
run: |
cd duckdb
git tag ${{ inputs.duckdb_tag }}
DUCKDB_TAG=${{ inputs.duckdb_tag }} make set_duckdb_tag

- id: parse-matrices
run: |
python3 ${{ inputs.matrix_parse_script }} --input ./duckdb/.github/config/distribution_matrix.json --select_os linux --output linux_matrix.json --exclude "${{ inputs.exclude_archs }}" --pretty
python3 ${{ inputs.matrix_parse_script }} --input ./duckdb/.github/config/distribution_matrix.json --select_os osx --output osx_matrix.json --exclude "${{ inputs.exclude_archs }}" --pretty
python3 ${{ inputs.matrix_parse_script }} --input ./duckdb/.github/config/distribution_matrix.json --select_os windows --output windows_matrix.json --exclude "${{ inputs.exclude_archs }}" --pretty
python3 ${{ inputs.matrix_parse_script }} --input ./duckdb/.github/config/distribution_matrix.json --select_os wasm --output wasm_matrix.json --exclude "${{ inputs.exclude_archs }}" --pretty
mkdir build
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
python3 ${{ inputs.matrix_parse_script }} --input build/distribution_matrix.json --select_os wasm --output build/wasm_matrix.json --exclude "${{ inputs.exclude_archs }}" --pretty

- id: set-matrix-linux
run: |
linux_matrix="`cat linux_matrix.json`"
linux_matrix="`cat build/linux_matrix.json`"
echo linux_matrix=$linux_matrix >> $GITHUB_OUTPUT
echo `cat $GITHUB_OUTPUT`

- id: set-matrix-osx
run: |
osx_matrix="`cat osx_matrix.json`"
osx_matrix="`cat build/osx_matrix.json`"
echo osx_matrix=$osx_matrix >> $GITHUB_OUTPUT
echo `cat $GITHUB_OUTPUT`

- id: set-matrix-windows
run: |
windows_matrix="`cat windows_matrix.json`"
windows_matrix="`cat build/windows_matrix.json`"
echo windows_matrix=$windows_matrix >> $GITHUB_OUTPUT
echo `cat $GITHUB_OUTPUT`

- id: set-matrix-wasm
run: |
wasm_matrix="`cat wasm_matrix.json`"
wasm_matrix="`cat build/wasm_matrix.json`"
echo wasm_matrix=$wasm_matrix >> $GITHUB_OUTPUT
echo `cat $GITHUB_OUTPUT`

Expand Down Expand Up @@ -214,10 +222,17 @@ 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 }}

- name: Checkout DuckDB to version
if: ${{inputs.duckdb_version != ''}}
run: |
cd duckdb
git checkout ${{ inputs.duckdb_version }}
DUCKDB_GIT_VERSION=${{ inputs.duckdb_version }} make set_duckdb_version

- name: Tag extension
if: ${{inputs.extension_tag != ''}}
Expand All @@ -227,8 +242,7 @@ jobs:
- name: Tag DuckDB extension
if: ${{inputs.duckdb_tag != ''}}
run: |
cd duckdb
git tag ${{ inputs.duckdb_tag }}
DUCKDB_TAG=${{ inputs.duckdb_tag }} make set_duckdb_tag

- uses: actions/checkout@v4
name: Checkout Extension CI tools
Expand Down Expand Up @@ -354,12 +368,11 @@ jobs:
path: 'extension-ci-tools'
ref: ${{ inputs.ci_tools_version }}
repository: ${{ inputs.override_ci_tools_repository }}
fetch-depth: 0

- name: Checkout DuckDB to version
if: ${{inputs.duckdb_version != ''}}
run: |
cd duckdb
git checkout ${{ inputs.duckdb_version }}
DUCKDB_GIT_VERSION=${{ inputs.duckdb_version }} make set_duckdb_version

- name: Tag extension
if: ${{inputs.extension_tag != ''}}
Expand All @@ -369,9 +382,7 @@ jobs:
- name: Tag DuckDB extension
if: ${{inputs.duckdb_tag != ''}}
run: |
cd duckdb
git tag ${{ inputs.duckdb_tag }}

DUCKDB_TAG=${{ inputs.duckdb_tag }} make set_duckdb_tag

- name: Setup vcpkg
uses: lukka/run-vcpkg@v11.1
Expand Down Expand Up @@ -528,12 +539,13 @@ jobs:
path: 'extension-ci-tools'
ref: ${{ inputs.ci_tools_version }}
repository: ${{ inputs.override_ci_tools_repository }}
fetch-depth: 0

- name: Checkout DuckDB to version
if: ${{inputs.duckdb_version != ''}}
env:
DUCKDB_GIT_VERSION: ${{ inputs.duckdb_version }}
run: |
cd duckdb
git checkout ${{ inputs.duckdb_version }}
make set_duckdb_version

- name: Tag extension
if: ${{inputs.extension_tag != ''}}
Expand All @@ -542,10 +554,10 @@ jobs:

- name: Tag DuckDB extension
if: ${{inputs.duckdb_tag != ''}}
env:
DUCKDB_TAG: ${{ inputs.duckdb_tag }}
run: |
cd duckdb
git tag ${{ inputs.duckdb_tag }}

make set_duckdb_tag

- name: Setup Ccache
uses: hendrikmuhs/ccache-action@main
Expand Down Expand Up @@ -633,12 +645,11 @@ jobs:
path: 'extension-ci-tools'
ref: ${{ inputs.ci_tools_version }}
repository: ${{ inputs.override_ci_tools_repository }}
fetch-depth: 0

- name: Checkout DuckDB to version
if: ${{inputs.duckdb_version != ''}}
run: |
cd duckdb
git checkout ${{ inputs.duckdb_version }}
DUCKDB_GIT_VERSION=${{ inputs.duckdb_version }} make set_duckdb_version

- name: Tag extension
if: ${{inputs.extension_tag != ''}}
Expand All @@ -648,8 +659,7 @@ jobs:
- name: Tag DuckDB extension
if: ${{inputs.duckdb_tag != ''}}
run: |
cd duckdb
git tag ${{ inputs.duckdb_tag }}
DUCKDB_TAG=${{ inputs.duckdb_tag }} make set_duckdb_tag

- uses: mymindstorm/setup-emsdk@v13
with:
Expand Down
9 changes: 9 additions & 0 deletions makefiles/duckdb_extension.Makefile
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -129,3 +129,12 @@ clean:

clean-python:
make $@ -C $(DUCKDB_SRCDIR)

set_duckdb_version:
cd duckdb && git checkout $(DUCKDB_GIT_VERSION)

set_duckdb_tag:
cd duckdb && git tag $(DUCKDB_TAG)

output_distribution_matrix:
cat duckdb/.github/config/distribution_matrix.json
Loading