Skip to content

Commit

Permalink
trying different vpckg baseline
Browse files Browse the repository at this point in the history
  • Loading branch information
hafenkran committed Jul 10, 2024
1 parent 42a95c8 commit dcaf198
Show file tree
Hide file tree
Showing 3 changed files with 7 additions and 8 deletions.
2 changes: 1 addition & 1 deletion .github/workflows/MainDistributionPipeline.yml
Original file line number Diff line number Diff line change
Expand Up @@ -22,7 +22,7 @@ jobs:
extension_name: bigquery
exclude_archs: 'wasm_mvp;wasm_eh;wasm_threads;windows_amd64_rtools'
# vcpkg_commit: 'a4275b7eee79fb24ec2e135481ef5fce8b41c339'
vcpkg_commit: '8c6fb0ba78d415493a5383fd277a746afc1a8825'
vcpkg_commit: '230d85084ca006926d51c3d332c94298fb3bd56c'

duckdb-stable-deploy:
name: Deploy extension binaries
Expand Down
9 changes: 4 additions & 5 deletions .github/workflows/_extension_distribution.yml
Original file line number Diff line number Diff line change
Expand Up @@ -291,11 +291,10 @@ jobs:
###
echo "Setup vcpkg"
cd $CURR_DIR
git clone https://github.com/hafenkran/vcpkg.git
git clone https://github.com/microsoft/vcpkg.git
cd vcpkg
# git fetch
git fetch
# git checkout f7d13cb679898dbe65fd5cf1cab43bd013feb092
git checkout 230d85084ca006926d51c3d332c94298fb3bd56c
#export CC="${CC}"
#export CXX="${CXX}"
./bootstrap-vcpkg.sh
Expand Down Expand Up @@ -530,7 +529,7 @@ jobs:
- name: Setup vcpkg
uses: lukka/[email protected]
with:
vcpkgGitURL: https://github.com/hafenkran/vcpkg
vcpkgGitURL: https://github.com/microsoft/vcpkg
vcpkgGitCommitId: ${{ inputs.vcpkg_commit }}

- name: Install Rust cross compile dependency
Expand Down Expand Up @@ -625,7 +624,7 @@ jobs:
- name: Setup vcpkg
uses: lukka/[email protected]
with:
vcpkgGitURL: https://github.com/hafenkran/vcpkg.git
vcpkgGitURL: https://github.com/microsoft/vcpkg.git
vcpkgGitCommitId: ${{ inputs.vcpkg_commit }}

# - name: Install SSL Certificates
Expand Down
4 changes: 2 additions & 2 deletions vcpkg.json
Original file line number Diff line number Diff line change
Expand Up @@ -20,11 +20,11 @@
},
{
"name": "google-cloud-cpp",
"features": ["bigquery", "grpc-common", "storage"],
"features": ["bigquery", "grpc-common"],
"default-features": false
}
],
"builtin-baseline": "8c6fb0ba78d415493a5383fd277a746afc1a8825",
"builtin-baseline": "a4275b7eee79fb24ec2e135481ef5fce8b41c339",
"overrides": [
{
"name": "abseil",
Expand Down

0 comments on commit dcaf198

Please sign in to comment.