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

Allows either _rtoolsOR _mingw in _extension_distribution (but only mingw in the json) #127

Merged
merged 2 commits into from
Jan 7, 2025
Merged

Allows either _rtoolsOR _mingw in _extension_distribution (but only mingw in the json) #127

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
2 commits
Select commit Hold shift + click to select a range
9e24f1b
Move from rtools to mingw
carlopi Jan 6, 2025
6367b2b
Handle both _rtools AND _mingw
carlopi Jan 6, 2025
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
4 changes: 2 additions & 2 deletions .github/workflows/TestCITools.yml
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -48,7 +48,7 @@ jobs:
override_ci_tools_repository: ${{ github.repository }}
ci_tools_version: ${{ github.sha }}
extra_toolchains: 'rust;python3'
exclude_archs: 'windows_amd64_rtools;windows_amd64_mingw;linux_amd64_musl' # TODO: remove once fixed upstream
exclude_archs: 'windows_amd64_mingw;linux_amd64_musl' # TODO: remove once fixed upstream

delta-extension-main:
name: Rust builds (using Delta extension)
Expand All @@ -60,5 +60,5 @@ jobs:
override_ci_tools_repository: ${{ github.repository }}
ci_tools_version: ${{ github.sha }}
duckdb_version: v1.1.3
exclude_archs: 'wasm_mvp;wasm_eh;wasm_threads;windows_amd64_rtools;windows_amd64;linux_amd64_musl'
exclude_archs: 'wasm_mvp;wasm_eh;wasm_threads;windows_amd64_mingw;windows_amd64;linux_amd64_musl'
extra_toolchains: 'rust'
14 changes: 7 additions & 7 deletions .github/workflows/_extension_distribution.yml
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -467,8 +467,8 @@ jobs:
VCPKG_TARGET_TRIPLET: ${{ matrix.vcpkg_triplet }}
BUILD_SHELL: ${{ inputs.build_duckdb_shell && '1' || '0' }}
DUCKDB_PLATFORM: ${{ matrix.duckdb_arch }}
CC: ${{ matrix.duckdb_arch == 'windows_amd64_rtools' && 'gcc' || '' }}
CXX: ${{ matrix.duckdb_arch == 'windows_amd64_rtools' && 'g++' || '' }}
CC: ${{ (matrix.duckdb_arch == 'windows_amd64_rtools' || matrix.duckdb_arch == 'windows_amd64_mingw') && 'gcc' || '' }}
CXX: ${{ (matrix.duckdb_arch == 'windows_amd64_rtools' || matrix.duckdb_arch == 'windows_amd64_mingw') && 'g++' || '' }}

steps:
- name: Keep \n line endings
Expand Down Expand Up @@ -513,14 +513,14 @@ jobs:
choco install winflexbison3

- uses: r-lib/actions/setup-r@v2
if: matrix.duckdb_arch == 'windows_amd64_rtools'
if: matrix.duckdb_arch == 'windows_amd64_rtools' || matrix.duckdb_arch == 'windows_amd64_mingw'
with:
r-version: 'devel'
update-rtools: true
rtools-version: '42' # linker bug in 43

- name: setup rtools gcc for vcpkg
if: matrix.duckdb_arch == 'windows_amd64_rtools'
if: matrix.duckdb_arch == 'windows_amd64_rtools' || matrix.duckdb_arch == 'windows_amd64_mingw'
run: |
cp C:/rtools42/x86_64-w64-mingw32.static.posix/bin/gcc.exe C:/rtools42/x86_64-w64-mingw32.static.posix/bin/x86_64-w64-mingw32-gcc.exe
cp C:/rtools42/x86_64-w64-mingw32.static.posix/bin/g++.exe C:/rtools42/x86_64-w64-mingw32.static.posix/bin/x86_64-w64-mingw32-g++.exe
Expand Down Expand Up @@ -568,23 +568,23 @@ jobs:
shell: bash
env:
DUCKDB_PLATFORM: ${{ matrix.duckdb_arch }}
DUCKDB_PLATFORM_RTOOLS: ${{ matrix.duckdb_arch == 'windows_amd64_rtools' && 1 || 0 }}
DUCKDB_PLATFORM_RTOOLS: ${{ (matrix.duckdb_arch == 'windows_amd64_rtools' || matrix.duckdb_arch == 'windows_amd64_mingw') && 1 || 0 }}
DUCKDB_GIT_VERSION: ${{ inputs.duckdb_version }}
run: |
make configure_ci

- name: Build extension
env:
DUCKDB_PLATFORM: ${{ matrix.duckdb_arch }}
DUCKDB_PLATFORM_RTOOLS: ${{ matrix.duckdb_arch == 'windows_amd64_rtools' && 1 || 0 }}
DUCKDB_PLATFORM_RTOOLS: ${{ (matrix.duckdb_arch == 'windows_amd64_rtools' || matrix.duckdb_arch == 'windows_amd64_mingw') && 1 || 0 }}
run: |
make release

- name: Test extension
if: ${{ inputs.skip_tests == false }}
env:
DUCKDB_PLATFORM: ${{ matrix.duckdb_arch }}
DUCKDB_PLATFORM_RTOOLS: ${{ matrix.duckdb_arch == 'windows_amd64_rtools' && 1 || 0 }}
DUCKDB_PLATFORM_RTOOLS: ${{ (matrix.duckdb_arch == 'windows_amd64_rtools' || matrix.duckdb_arch == 'windows_amd64_mingw') && 1 || 0 }}
run: |
make test_release

Expand Down
2 changes: 1 addition & 1 deletion config/distribution_matrix.json
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -44,7 +44,7 @@
"vcpkg_triplet": "x64-windows-static-md"
},
{
"duckdb_arch": "windows_amd64_rtools",
"duckdb_arch": "windows_amd64_mingw",
"vcpkg_triplet": "x64-mingw-static"
}
]
Expand Down
Loading