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

Add optional python3 dependency and move tests to v1.1.1 #85

Merged
merged 5 commits into from
Oct 1, 2024
Merged

Add optional python3 dependency and move tests to v1.1.1 #85

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
5 commits
Select commit Hold shift + click to select a range
c5f67d2
Explcitly install python3 into Linux distributions
carlopi Oct 1, 2024
7d9f6ba
Fixup description of extra_toolchains
carlopi Oct 1, 2024
f047092
Add python3 explcitly to TestCITools
carlopi Oct 1, 2024
dc81ca5
Move to DuckDB v1.1.1 in the tests
carlopi Oct 1, 2024
c446aa4
Add v1.1.1 to README
carlopi Oct 1, 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
8 changes: 4 additions & 4 deletions .github/workflows/TestCITools.yml
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -19,10 +19,10 @@ jobs:
extension_name: quack
override_repository: duckdb/extension-template
override_ref: main
duckdb_version: v1.1.0
duckdb_version: v1.1.1
override_ci_tools_repository: ${{ github.repository }}
ci_tools_version: ${{ github.sha }}
extra_toolchains: 'parser_tools;fortran;omp;go'
extra_toolchains: 'parser_tools;fortran;omp;go;python3'
custom_toolchain_script: true

delta-extension-main:
Expand All @@ -34,6 +34,6 @@ jobs:
override_ref: 94f887bd539ec0d5ed0d31bd01ff3845cf378a9d
override_ci_tools_repository: ${{ github.repository }}
ci_tools_version: ${{ github.sha }}
duckdb_version: v1.1.0
duckdb_version: v1.1.1
exclude_archs: 'wasm_mvp;wasm_eh;wasm_threads;windows_amd64_rtools;windows_amd64'
extra_toolchains: 'rust'
extra_toolchains: 'rust'
2 changes: 1 addition & 1 deletion .github/workflows/_extension_distribution.yml
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -71,7 +71,7 @@ on:
type: string
default: "duckdb/extension-ci-tools"
# Pass extra toolchains
# available: (rust, fortran, omp)
# available: (parser_tools, rust, fortran, omp, python3)
extra_toolchains:
required: false
type: string
Expand Down
3 changes: 2 additions & 1 deletion README.md
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -7,7 +7,8 @@ DuckDB's [Extension Template](https://github.com/duckdb/extension-template/actio
| Extension-ci-tools Branch | DuckDB target version | Actively maintained? |
|---------------------------|-----------------------|----------------------|
| main | main | yes |
| v1.1.0 | v1.1.0 | yes |
| v1.1.1 | v1.1.1 | yes |
| v1.1.0 | v1.1.0 | no |
| v1.0.0 | v1.0.0 | no |
| v0.10.3 | v0.10.3 | no |
| v0.10.2 | v0.10.2 | no |
Expand Down
9 changes: 8 additions & 1 deletion docker/linux_amd64/Dockerfile
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -89,4 +89,11 @@ RUN case "$extra_toolchains" in \
apt-get install -y -qq golang-go \
;; \
esac
ENV PATH="/usr/local/go/bin:${PATH}"
ENV PATH="/usr/local/go/bin:${PATH}"

# Install Python3
RUN case "$extra_toolchains" in \
*\;python3\;*) \
apt-get install -y -qq python3 \
;; \
esac
7 changes: 7 additions & 0 deletions docker/linux_amd64_gcc4/Dockerfile
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -71,3 +71,10 @@ RUN if [[ $extra_toolchains == *";go;"* ]]; then \
tar -C /usr/local -xzf go1.23.1.linux-amd64.tar.gz; \
fi
ENV PATH="/usr/local/go/bin:${PATH}"

# Install Python3
RUN case "$extra_toolchains" in \
*\;python3\;*) \
yum install -y python3; \
;; \
esac
9 changes: 8 additions & 1 deletion docker/linux_arm64/Dockerfile
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -88,4 +88,11 @@ RUN case "$extra_toolchains" in \
*\;go\;*) \
apt-get install -y -qq golang-go \
;; \
esac
esac

# Install Python3
RUN case "$extra_toolchains" in \
*\;python3\;*) \
apt-get install -y -qq python3 \
;; \
esac
Loading