Skip to content

Commit

Permalink
Group NAS2D build with NAS2D cache restore
Browse files Browse the repository at this point in the history
Makes more sense to group these together. Less that can go wrong in the middle and prevent the NAS2D build cache from being saved.
  • Loading branch information
DanRStevens committed Jan 10, 2025
1 parent a8925b6 commit 49fba57
Showing 1 changed file with 13 additions and 13 deletions.
26 changes: 13 additions & 13 deletions .github/workflows/build.yml
Original file line number Diff line number Diff line change
Expand Up @@ -75,6 +75,19 @@ jobs:
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 }}

- name: Restore incremental build cache
uses: actions/cache/restore@v4
if: github.ref != format('refs/heads/{0}', github.event.repository.default_branch)
Expand Down Expand Up @@ -112,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

0 comments on commit 49fba57

Please sign in to comment.