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.

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 custom toolchain script #61

Merged
merged 6 commits into from
Aug 27, 2024
Merged
Show file tree
Hide file tree
Changes from all commits
Commits
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
1 change: 1 addition & 0 deletions .github/workflows/TestCITools.yml
Original file line number Diff line number Diff line change
Expand Up @@ -23,6 +23,7 @@ jobs:
override_ci_tools_repository: ${{ github.repository }}
override_ci_tools_ref: ${{ github.sha }}
extra_toolchains: 'parser_tools;fortran;omp'
custom_toolchain_script: true

delta-extension-main:
name: Rust builds (using Delta extension)
Expand Down
32 changes: 32 additions & 0 deletions .github/workflows/_extension_distribution.yml
Original file line number Diff line number Diff line change
Expand Up @@ -71,6 +71,11 @@ on:
required: false
type: string
default: ""
# If set, the setup will look for a script in `./scripts/custom-toolchain-script.sh` to run
custom_toolchain_script:
required: false
type: boolean
default: false
# DEPRECATED: use extra_toolchains instead
enable_rust:
required: false
Expand Down Expand Up @@ -290,6 +295,15 @@ jobs:
echo "OPENSSL_DIR=`pwd`/build/release/vcpkg_installed/${{ matrix.vcpkg_triplet }}" >> $GITHUB_ENV
echo "OPENSSL_USE_STATIC_LIBS=true" >> $GITHUB_ENV

###
# Custom toolchain script
###
- name: Run custom toolchain script
if: ${{ inputs.custom_toolchain_script }}
shell: bash
run: |
bash scripts/setup-custom-toolchain.sh

###
# Building & testing
###
Expand Down Expand Up @@ -408,6 +422,12 @@ jobs:
echo "CPPFLAGS=-I/opt/homebrew/opt/libomp/include" >> $GITHUB_ENV
echo "CXXFLAGS=-I/opt/homebrew/opt/libomp/include" >> $GITHUB_ENV

- name: Run custom toolchain script
if: ${{ inputs.custom_toolchain_script }}
shell: bash
run: |
bash scripts/setup-custom-toolchain.sh

- name: Build extension
shell: bash
env:
Expand Down Expand Up @@ -511,6 +531,12 @@ jobs:
with:
vcpkgGitCommitId: ${{ inputs.vcpkg_commit }}

- name: Run custom toolchain script
if: ${{ inputs.custom_toolchain_script }}
shell: bash
run: |
bash scripts/setup-custom-toolchain.sh

- name: Build & test extension
env:
DUCKDB_PLATFORM: ${{ matrix.duckdb_arch }}
Expand Down Expand Up @@ -589,6 +615,12 @@ jobs:
with:
key: ${{ github.job }}-${{ matrix.duckdb_arch }}

- name: Run custom toolchain script
if: ${{ inputs.custom_toolchain_script }}
shell: bash
run: |
bash scripts/setup-custom-toolchain.sh

- name: Build Wasm module
run: |
make ${{ matrix.duckdb_arch }}
Expand Down
Loading