Skip to content

Commit 6146452

Browse files
authored
Merge pull request #63 from carlopi/vcpkg
[Dev] Fixup workflows by using VCPKG
2 parents 9c38a30 + 3fcfcbf commit 6146452

File tree

3 files changed

+38
-6
lines changed

3 files changed

+38
-6
lines changed

.github/workflows/Linux.yml

+13-1
Original file line numberDiff line numberDiff line change
@@ -17,15 +17,21 @@ jobs:
1717
# Add commits/tags to build against other DuckDB versions
1818
duckdb_version: [ '<submodule_version>' ]
1919
arch: ['linux_amd64', 'linux_arm64', 'linux_amd64_gcc4']
20+
vcpkg_version: [ '2023.04.15' ]
2021
include:
2122
- arch: 'linux_amd64_gcc4'
2223
container: 'quay.io/pypa/manylinux2014_x86_64'
24+
vcpkg_triplet: 'x64-linux'
2325
- arch: 'linux_amd64'
2426
container: 'ubuntu:18.04'
27+
vcpkg_triplet: 'x64-linux'
2528
- arch: 'linux_arm64'
2629
container: 'ubuntu:18.04'
30+
vcpkg_triplet: 'arm64-linux'
2731
env:
32+
VCPKG_TARGET_TRIPLET: ${{ matrix.vcpkg_triplet }}
2833
GEN: Ninja
34+
VCPKG_TOOLCHAIN_PATH: ${{ github.workspace }}/vcpkg/scripts/buildsystems/vcpkg.cmake
2935

3036
steps:
3137
- name: Install required ubuntu packages
@@ -36,6 +42,7 @@ jobs:
3642
add-apt-repository ppa:git-core/ppa
3743
apt-get update -y -qq
3844
apt-get install -y -qq ninja-build make gcc-multilib g++-multilib libssl-dev wget openjdk-8-jdk zip maven unixodbc-dev libc6-dev-i386 lib32readline6-dev libssl-dev libcurl4-gnutls-dev libexpat1-dev gettext unzip build-essential checkinstall libffi-dev curl libz-dev openssh-client
45+
apt-get install -y -qq tar pkg-config
3946
4047
- name: Install Git 2.18.5
4148
if: ${{ matrix.arch == 'linux_amd64' || matrix.arch == 'linux_arm64' }}
@@ -69,6 +76,11 @@ jobs:
6976
with:
7077
aarch64_cross_compile: ${{ matrix.arch == 'linux_arm64' && 1 }}
7178

79+
- name: Setup vcpkg
80+
uses: lukka/run-vcpkg@v11
81+
with:
82+
vcpkgGitCommitId: 501db0f17ef6df184fcdbfbe0f87cde2313b6ab1
83+
7284
- name: Build extension
7385
env:
7486
GEN: ninja
@@ -94,4 +106,4 @@ jobs:
94106
with:
95107
name: ${{matrix.arch}}-extensions
96108
path: |
97-
build/release/extension/sqlite_scanner/sqlite_scanner.duckdb_extension
109+
build/release/extension/sqlite_scanner/sqlite_scanner.duckdb_extension

.github/workflows/MacOS.yml

+14-4
Original file line numberDiff line numberDiff line change
@@ -15,16 +15,21 @@ jobs:
1515
matrix:
1616
# Add commits/tags to build against other DuckDB versions
1717
duckdb_version: [ '<submodule_version>' ]
18-
osx_build_arch: [ 'x86_64', 'arm64' ]
18+
vcpkg_version: [ '2023.04.15' ]
19+
vcpkg_triplet: [ 'x64-osx', 'arm64-osx' ]
1920
include:
20-
- osx_build_arch: 'x86_64'
21+
- vcpkg_triplet: 'x64-osx'
22+
osx_build_arch: 'x86_64'
2123
duckdb_arch: 'osx_amd64'
22-
- osx_build_arch: 'arm64'
24+
- vcpkg_triplet: 'arm64-osx'
25+
osx_build_arch: 'arm64'
2326
duckdb_arch: 'osx_arm64'
2427

2528
env:
29+
VCPKG_TARGET_TRIPLET: ${{ matrix.vcpkg_triplet }}
2630
OSX_BUILD_ARCH: ${{ matrix.osx_build_arch }}
2731
GEN: Ninja
32+
VCPKG_TOOLCHAIN_PATH: ${{ github.workspace }}/vcpkg/scripts/buildsystems/vcpkg.cmake
2833

2934
steps:
3035
- uses: actions/checkout@v3
@@ -44,6 +49,11 @@ jobs:
4449
with:
4550
python-version: '3.7'
4651

52+
- name: Setup vcpkg
53+
uses: lukka/run-vcpkg@v11
54+
with:
55+
vcpkgGitCommitId: 501db0f17ef6df184fcdbfbe0f87cde2313b6ab1
56+
4757
- name: Checkout DuckDB to version
4858
if: ${{ matrix.duckdb_version != '<submodule_version>'}}
4959
run: |
@@ -74,4 +84,4 @@ jobs:
7484
with:
7585
name: osx-${{ matrix.osx_build_arch }}-extension
7686
path: |
77-
build/release/extension/sqlite_scanner/sqlite_scanner.duckdb_extension
87+
build/release/extension/sqlite_scanner/sqlite_scanner.duckdb_extension

.github/workflows/Windows.yml

+11-1
Original file line numberDiff line numberDiff line change
@@ -15,15 +15,25 @@ jobs:
1515
matrix:
1616
# Add commits/tags to build against other DuckDB versions
1717
duckdb_version: [ '<submodule_version>' ]
18+
vcpkg_version: [ '2023.04.15' ]
19+
vcpkg_triplet: ['x64-windows']
1820
env:
21+
VCPKG_TARGET_TRIPLET: ${{ matrix.vcpkg_triplet }}
1922
GEN: Ninja
23+
VCPKG_ROOT: ${{ github.workspace }}\vcpkg
24+
VCPKG_TOOLCHAIN_PATH: ${{ github.workspace }}\vcpkg\scripts\buildsystems\vcpkg.cmake
2025

2126
steps:
2227
- uses: actions/checkout@v3
2328
with:
2429
fetch-depth: 0
2530
submodules: 'true'
2631

32+
- name: Setup vcpkg
33+
uses: lukka/run-vcpkg@v11
34+
with:
35+
vcpkgGitCommitId: 501db0f17ef6df184fcdbfbe0f87cde2313b6ab1
36+
2737
- uses: actions/setup-python@v2
2838
with:
2939
python-version: '3.7'
@@ -57,4 +67,4 @@ jobs:
5767
with:
5868
name: windows-extension
5969
path: |
60-
build/release/extension/sqlite_scanner/sqlite_scanner.duckdb_extension
70+
build/release/extension/sqlite_scanner/sqlite_scanner.duckdb_extension

0 commit comments

Comments
 (0)