Skip to content

Commit 5652a16

Browse files
committed
Updated Windows CI
1 parent 77fc312 commit 5652a16

File tree

1 file changed

+7
-5
lines changed

1 file changed

+7
-5
lines changed

.github/workflows/continuous.yml

Lines changed: 7 additions & 5 deletions
Original file line numberDiff line numberDiff line change
@@ -108,30 +108,32 @@ jobs:
108108
with:
109109
fetch-depth: 10
110110
- uses: seanmiddleditch/gha-setup-ninja@master
111-
# https://github.com/actions/cache/issues/101
112111

113112
- name: Set env
114113
run: |
115114
echo "appdata=$env:LOCALAPPDATA" >> ${env:GITHUB_ENV}
116115
117116
- name: Cache build
118117
id: cache-build
119-
uses: actions/cache@v1
118+
uses: actions/cache@v2
120119
with:
121120
path: ${{ env.appdata }}\Mozilla\sccache
122-
key: ${{ runner.os }}-${{ matrix.config }}-cache
121+
key: ${{ runner.os }}-${{ matrix.config }}-cache-${{ github.sha }}
122+
restore-keys: ${{ runner.os }}-${{ matrix.config }}-cache
123123

124124
- name: Prepare sccache
125125
run: |
126-
Invoke-Expression (New-Object System.Net.WebClient).DownloadString('https://get.scoop.sh')
126+
iwr -useb 'https://raw.githubusercontent.com/scoopinstaller/install/master/install.ps1' -outfile 'install.ps1'
127+
.\install.ps1 -RunAsAdmin
127128
scoop install sccache --global
128-
# Scoop modifies the PATH so we make the modified PATH global.
129+
# Scoop modifies the PATH so we make it available for the next steps of the job
129130
echo "${env:PATH}" >> ${env:GITHUB_PATH}
130131
131132
- name: Configure and build
132133
shell: cmd
133134
run: |
134135
call "C:\Program Files (x86)\Microsoft Visual Studio\2019\Enterprise\Common7\Tools\VsDevCmd.bat" -arch=x64
136+
cmake --version
135137
cmake -G Ninja ^
136138
-DCMAKE_CXX_COMPILER_LAUNCHER=sccache ^
137139
-DCMAKE_BUILD_TYPE=${{ matrix.config }} ^

0 commit comments

Comments
 (0)