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

Build - update vcpkg versions and fix the VCPKG_ROOT variable that GHA now sets #3213

Merged
merged 1 commit into from
Sep 15, 2022
Merged

Build - update vcpkg versions and fix the VCPKG_ROOT variable that GHA now sets #3213

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
6 changes: 0 additions & 6 deletions .github/workflows/build.yml
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -32,12 +32,6 @@ jobs:
# Get the code
- uses: actions/checkout@v2

# hardcode cmake version
- name: Setup cmake
uses: jwlawson/actions-setup-cmake@v1.12
with:
cmake-version: '3.22.3'

# Install Ruby for the windows build
- uses: ruby/setup-ruby@v1
id: ruby-inst
Expand Down
4 changes: 3 additions & 1 deletion app/linux-pre-vcpkg.sh
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -30,9 +30,11 @@ cd "${SCRIPT_DIR}"
# Build vcpkg
if [ ! -d "vcpkg" ]; then
echo "Cloning vcpkg"
git clone --depth 1 --branch "${VCPKG_BRANCH:-2022.06.16.1}" https://github.com/microsoft/vcpkg.git vcpkg
git clone --depth 1 --branch "${VCPKG_BRANCH:-2022.08.15}" https://github.com/microsoft/vcpkg.git vcpkg
fi

export VCPKG_ROOT="$SCRIPT_DIR/vcpkg"

if [ ! -f "vcpkg/vcpkg" ]; then
echo "Building vcpkg"
cd vcpkg
Expand Down
4 changes: 3 additions & 1 deletion app/mac-pre-vcpkg.sh
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -30,9 +30,11 @@ cd "${SCRIPT_DIR}"
# Build vcpkg
if [ ! -d "vcpkg" ]; then
echo "Cloning vcpkg"
git clone --depth 1 --branch 2022.06.16.1 https://github.com/microsoft/vcpkg.git vcpkg
git clone --depth 1 --branch 2022.08.15 https://github.com/microsoft/vcpkg.git vcpkg
fi

export VCPKG_ROOT="$SCRIPT_DIR/vcpkg"

if [ ! -f "vcpkg/vcpkg" ]; then
echo "Building vcpkg"
cd vcpkg
Expand Down
2 changes: 2 additions & 0 deletions app/win-pre-vcpkg.bat
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -8,6 +8,8 @@ if not exist "vcpkg\" (
git clone --depth 1 --branch 2022.08.15 https://github.com/microsoft/vcpkg.git vcpkg
)

set VCPKG_ROOT=%~dp0/vcpkg

if not exist "vcpkg\vcpkg.exe" (
cd vcpkg
echo Building vcpkg
Expand Down