Skip to content

Commit

Permalink
Fix windows msvc release (#1430)
Browse files Browse the repository at this point in the history
* Update release.yml

* Update msvc-full-features.yml

* Update vcpkg.json
  • Loading branch information
olanti-p authored Apr 3, 2022
1 parent 5087f16 commit 82f5658
Show file tree
Hide file tree
Showing 3 changed files with 4 additions and 5 deletions.
5 changes: 2 additions & 3 deletions .github/workflows/msvc-full-features.yml
Original file line number Diff line number Diff line change
Expand Up @@ -69,11 +69,10 @@ jobs:
# That said, we also have our custom vcpkg_triplets to hash, so we keep everything the same.
appendedCacheKey: ${{ hashFiles( 'msvc-full-features/vcpkg.json', '.github/vcpkg_triplets/**' ) }}-x64
vcpkgDirectory: '${{ runner.workspace }}/b/vcpkg'
# We have to use at least this version of vcpkg to include fixes for yasm-tool's
# availability only as an x86 host tool. Keep it in sync with the builtin-baseline
# Keep vcpkg version here in sync with the builtin-baseline
# field in vcpkg.json. Caching happens as a post-action which runs at the end of
# the whole workflow, after vcpkg install happens during msbuild run.
vcpkgGitCommitId: '49b67d9cb856424ff69f10e7721aec5299624268'
vcpkgGitCommitId: '9d9a6f486cc7da7664117a75d01440db0088634a'

- name: Integrate vcpkg
run: |
Expand Down
2 changes: 1 addition & 1 deletion .github/workflows/release.yml
Original file line number Diff line number Diff line change
Expand Up @@ -180,7 +180,7 @@ jobs:
# availability only as an x86 host tool. Keep it in sync with the builtin-baseline
# field in vcpkg.json. Caching happens as a post-action which runs at the end of
# the whole workflow, after vcpkg install happens during msbuild run.
vcpkgGitCommitId: '49b67d9cb856424ff69f10e7721aec5299624268'
vcpkgGitCommitId: '9d9a6f486cc7da7664117a75d01440db0088634a'
- name: Install dependencies (windows msvc) (3/3)
if: runner.os == 'Windows'
run: |
Expand Down
2 changes: 1 addition & 1 deletion msvc-full-features/vcpkg.json
Original file line number Diff line number Diff line change
Expand Up @@ -10,5 +10,5 @@
},
"sdl2-ttf"
],
"builtin-baseline": "49b67d9cb856424ff69f10e7721aec5299624268"
"builtin-baseline": "9d9a6f486cc7da7664117a75d01440db0088634a"
}

0 comments on commit 82f5658

Please sign in to comment.