Skip to content

Remove redundant vcpkg steps #23

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.

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

Open
wants to merge 2 commits into
base: master
Choose a base branch
from
Open
Changes from all commits
Commits
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
35 changes: 12 additions & 23 deletions .github/workflows/build.yaml
Original file line number Diff line number Diff line change
Expand Up @@ -6,7 +6,6 @@ on:

env:
VCPKG_BINARY_SOURCES: "clear;x-gha,readwrite"
VCPKG_REPOSITORY: https://github.com/microsoft/vcpkg.git
VCPKG_REVISION: 137197a8f85e6c6cf1843ef024af7d9c28bb0bde

jobs:
Expand All @@ -32,17 +31,12 @@ jobs:
core.exportVariable('ACTIONS_CACHE_URL', process.env.ACTIONS_CACHE_URL || '');
core.exportVariable('ACTIONS_RUNTIME_TOKEN', process.env.ACTIONS_RUNTIME_TOKEN || '');

- working-directory: 'C:/vcpkg'
run: git remote add openmw ${{ env.VCPKG_REPOSITORY }}

- working-directory: 'C:/vcpkg'
run: git fetch openmw

- working-directory: 'C:/vcpkg'
run: git checkout ${{ env.VCPKG_REVISION }}

- working-directory: 'C:/vcpkg'
run: ./bootstrap-vcpkg.bat -disableMetrics
- name: Set up vcpkg
run: |
cd $Env:VCPKG_INSTALLATION_ROOT
git fetch
git checkout ${{ env.VCPKG_REVISION }}
./bootstrap-vcpkg.bat -disableMetrics

- name: Install vcpkg packages
run: >
Expand Down Expand Up @@ -119,17 +113,12 @@ jobs:
core.exportVariable('ACTIONS_CACHE_URL', process.env.ACTIONS_CACHE_URL || '');
core.exportVariable('ACTIONS_RUNTIME_TOKEN', process.env.ACTIONS_RUNTIME_TOKEN || '');

- working-directory: 'C:/vcpkg'
run: git remote add openmw ${{ env.VCPKG_REPOSITORY }}

- working-directory: 'C:/vcpkg'
run: git fetch openmw

- working-directory: 'C:/vcpkg'
run: git checkout ${{ env.VCPKG_REVISION }}

- working-directory: 'C:/vcpkg'
run: ./bootstrap-vcpkg.bat -disableMetrics
- name: Set up vcpkg
run: |
cd $Env:VCPKG_INSTALLATION_ROOT
git fetch
git checkout ${{ env.VCPKG_REVISION }}
./bootstrap-vcpkg.bat -disableMetrics

- name: Install vcpkg packages
run: >
Expand Down