trying different vpckg baseline

hafenkran · Jul 10, 2024 · 6296adc · 6296adc
1 parent 42a95c8
commit 6296adc
Show file tree

Hide file tree

Showing 3 changed files with 5 additions and 6 deletions.
diff --git a/.github/workflows/MainDistributionPipeline.yml b/.github/workflows/MainDistributionPipeline.yml
@@ -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

diff --git a/.github/workflows/_extension_distribution.yml b/.github/workflows/_extension_distribution.yml
@@ -291,9 +291,8 @@ 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
                   #export CC="${CC}"
@@ -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
@@ -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

diff --git a/vcpkg.json b/vcpkg.json
@@ -20,7 +20,7 @@
     },
     {
       "name": "google-cloud-cpp",
-      "features": ["bigquery", "grpc-common", "storage"],
+      "features": ["bigquery", "grpc-common"],
       "default-features": false
     }
   ],