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

Jump to bottom

update vcpkg #9759

Merged
merged 1 commit into from
Nov 22, 2023
Merged

update vcpkg #9759

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
1 commit
Select commit
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
2 changes: 1 addition & 1 deletion .github/actions/build_extensions/action.yml
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -93,7 +93,7 @@ runs:
if: inputs.vcpkg_build == 1
uses: lukka/run-vcpkg@v11.1
with:
vcpkgGitCommitId: 501db0f17ef6df184fcdbfbe0f87cde2313b6ab1
vcpkgGitCommitId: a42af01b72c28a8e1d7b48107b33e4f286a55ef6

- name: Set vcpkg env variables
if: inputs.vcpkg_build == 1
Expand Down
2 changes: 1 addition & 1 deletion .github/actions/manylinux_2014_setup/action.yml
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -96,7 +96,7 @@ runs:
if: ${{ inputs.vcpkg == 1 }}
uses: lukka/run-vcpkg@v11.1
with:
vcpkgGitCommitId: 501db0f17ef6df184fcdbfbe0f87cde2313b6ab1
vcpkgGitCommitId: a42af01b72c28a8e1d7b48107b33e4f286a55ef6

- name: Install OpenSSL
if: ${{ inputs.openssl == 1 }}
Expand Down
2 changes: 1 addition & 1 deletion .github/actions/ubuntu_18_setup/action.yml
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -84,7 +84,7 @@ runs:
if: ${{ inputs.vcpkg == 1 }}
uses: lukka/run-vcpkg@v11.1
with:
vcpkgGitCommitId: 501db0f17ef6df184fcdbfbe0f87cde2313b6ab1
vcpkgGitCommitId: a42af01b72c28a8e1d7b48107b33e4f286a55ef6

- name: Setup Ccache
if: ${{ inputs.ccache == 1 }}
Expand Down
4 changes: 2 additions & 2 deletions .github/workflows/OSX.yml
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -209,8 +209,8 @@ jobs:
with:
python-version: '3.7'

- name: Install Ninja
run: brew install ninja
- name: Install Ninja and Pkg-config
run: brew install pkg-config ninja

- name: Setup Ccache
uses: hendrikmuhs/ccache-action@main
Expand Down
2 changes: 1 addition & 1 deletion .github/workflows/Wasm.yml
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -38,7 +38,7 @@ jobs:
- name: Setup vcpkg
uses: lukka/run-vcpkg@v11.1
with:
vcpkgGitCommitId: 501db0f17ef6df184fcdbfbe0f87cde2313b6ab1
vcpkgGitCommitId: a42af01b72c28a8e1d7b48107b33e4f286a55ef6

- name: Setup Ccache
uses: hendrikmuhs/ccache-action@main
Expand Down
2 changes: 1 addition & 1 deletion .github/workflows/_extension_distribution.yml
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -34,7 +34,7 @@ on:
vcpkg_commit:
required: false
type: string
default: "501db0f17ef6df184fcdbfbe0f87cde2313b6ab1"
default: "a42af01b72c28a8e1d7b48107b33e4f286a55ef6"
# Override the default script producing the matrices. Allows specifying custom matrices.
matrix_parse_script:
required: false
Expand Down
2 changes: 1 addition & 1 deletion scripts/merge_vcpkg_deps.py
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -55,7 +55,7 @@ def prefix_overlay_port(overlay_port):

data = {
"description": f"Auto-generated vcpkg.json for combined DuckDB extension build",
"builtin-baseline": "501db0f17ef6df184fcdbfbe0f87cde2313b6ab1",
"builtin-baseline": "a42af01b72c28a8e1d7b48107b33e4f286a55ef6",
"dependencies": final_deduplicated_deps,
"overrides": [{"name": "openssl", "version": "3.0.8"}],
}
Expand Down
2 changes: 1 addition & 1 deletion scripts/setup_manylinux2014.sh
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -40,7 +40,7 @@ install_deps() {
(
cd $VCPKG_TARGET_DIR ;
git clone https://github.com/Microsoft/vcpkg.git ;
git checkout 501db0f17ef6df184fcdbfbe0f87cde2313b6ab1 ;
git checkout a42af01b72c28a8e1d7b48107b33e4f286a55ef6 ;
cd vcpkg ;
./bootstrap-vcpkg.sh
)
Expand Down
Loading