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

Improve and fix vcpkg caching #1493

Merged
merged 6 commits into from
Jan 10, 2025
Merged

Improve and fix vcpkg caching #1493

Changes from all commits
Commits
Show all changes
6 commits
Select commit Hold shift + click to select a range
9552e56
Update copy of `vcpkg` cache from OPHD to NAS2D
DanRStevens Jan 10, 2025
2b2bba2
Install `vcpkg` dependencies before build steps
DanRStevens Jan 10, 2025
2646b7c
Use early caching of `vcpkg` dependencies
DanRStevens Jan 10, 2025
7aca9a6
Install `vcpkg` dependencies before build - NAS2D
DanRStevens Jan 10, 2025
a8925b6
Update restore of NAS2D cache
DanRStevens Jan 10, 2025
49fba57
Group NAS2D build with NAS2D cache restore
DanRStevens Jan 10, 2025
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
47 changes: 30 additions & 17 deletions .github/workflows/build.yml
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -34,15 +34,28 @@ jobs:
core.exportVariable('ACTIONS_RUNTIME_TOKEN', process.env.ACTIONS_RUNTIME_TOKEN || '');

- name: Restore vcpkg dependency cache
uses: actions/cache@v4
id: cache
uses: actions/cache/restore@v4
with:
path: vcpkg_installed
key: vcpkgCache-${{ runner.os }}-${{ matrix.platform }}-${{ hashFiles('vcpkg.json') }}

- name: Pre-install vcpkg dependencies - OPHD
run: |
vcpkg install

- name: Save vcpkg dependency cache
uses: actions/cache/save@v4
with:
path: vcpkg_installed
key: vcpkgCache-${{ runner.os }}-${{ matrix.platform }}-${{ hashFiles('vcpkg.json') }}

- name: Copy vcpkg cache to NAS2D folder
run: |
xcopy vcpkg_installed nas2d-core /s /e
xcopy vcpkg_installed nas2d-core\vcpkg_installed\ /s /e

- name: Pre-install vcpkg dependencies - NAS2D
run: |
vcpkg install --x-manifest-root=nas2d-core

- name: Set NAS2D modification time
shell: bash
Expand All @@ -57,7 +70,20 @@ jobs:
find nas2d-core/ -type f -exec touch -d "${commitTime}" '{}' +

- name: Restore NAS2D cache
uses: actions/cache@v4
uses: actions/cache/restore@v4
with:
path: nas2d-core/.build/
key: nas2dCache-${{ runner.os }}-${{ matrix.platform }}-${{ env.nas2dSha }}

- name: Build NAS2D
# Add additional options to the MSBuild command line here (like platform or verbosity level).
# See https://docs.microsoft.com/visualstudio/msbuild/msbuild-command-line-reference
run: |
vcpkg integrate install
msbuild /maxCpuCount /warnAsError /property:Configuration=${{env.BUILD_CONFIGURATION}} ${{env.SOLUTION_FILE_PATH}} /target:NAS2D

- name: Save build cache - NAS2D
uses: actions/cache/save@v4
with:
path: nas2d-core/.build/
key: nas2dCache-${{ runner.os }}-${{ matrix.platform }}-${{ env.nas2dSha }}
Expand Down Expand Up @@ -99,19 +125,6 @@ jobs:
mkdir --parents .build/
echo "${{ github.sha }}" > .build/lastBuildSha.txt

- name: Build NAS2D
# Add additional options to the MSBuild command line here (like platform or verbosity level).
# See https://docs.microsoft.com/visualstudio/msbuild/msbuild-command-line-reference
run: |
vcpkg integrate install
msbuild /maxCpuCount /warnAsError /property:Configuration=${{env.BUILD_CONFIGURATION}} ${{env.SOLUTION_FILE_PATH}} /target:NAS2D

- name: Save build cache - NAS2D
uses: actions/cache/save@v4
with:
path: nas2d-core/.build/
key: nas2dCache-${{ runner.os }}-${{ matrix.platform }}-${{ env.nas2dSha }}

- name: Build OPHD
# Add additional options to the MSBuild command line here (like platform or verbosity level).
# See https://docs.microsoft.com/visualstudio/msbuild/msbuild-command-line-reference
Expand Down
Loading