|
88 | 88 | runs-on: windows-latest
|
89 | 89 | needs: build-linux
|
90 | 90 | env:
|
91 |
| - gvsbuildref: 69cdac34c36d74eeae37006bb0fcedc64ee518dd |
| 91 | + gvsbuildref: 3d3067d1090df7bfdf4b29680b951024e37b20ae |
92 | 92 | gvsbuildupdate: 1
|
93 | 93 |
|
94 | 94 | outputs:
|
@@ -158,11 +158,29 @@ jobs:
|
158 | 158 |
|
159 | 159 | - uses: actions/checkout@v2
|
160 | 160 |
|
| 161 | + - name: Compile icon resource |
| 162 | + run: | |
| 163 | + # TODO: how to call the rc without copying it? |
| 164 | + cp $env:RC_BIN\rc.exe src\ |
| 165 | + cp $env:RC_BIN\rcdll.dll src\ |
| 166 | + cd src |
| 167 | + .\rc.exe dragit.rc |
| 168 | + ls |
| 169 | + env: |
| 170 | + RC_BIN: C:/Program Files (x86)/Windows Kits/10/bin/10.0.18362.0/x64/ |
| 171 | + |
161 | 172 | - uses: actions-rs/toolchain@v1
|
162 | 173 | with:
|
163 | 174 | toolchain: stable
|
164 | 175 | default: true
|
165 | 176 |
|
| 177 | + - name: Create linker config for the icon |
| 178 | + run: | |
| 179 | + $repoPath = $env:GITHUB_WORKSPACE -replace "\\", "/" |
| 180 | + mkdir .cargo |
| 181 | + Set-Content -Path .\.cargo\config -Value "[build]`nrustflags = [`"-Clink-args=${repoPath}/src/dragit.res`"]" |
| 182 | + Get-Content .\.cargo\config |
| 183 | +
|
166 | 184 | - name: Build release
|
167 | 185 | uses: actions-rs/cargo@v1
|
168 | 186 | with:
|
@@ -193,8 +211,7 @@ jobs:
|
193 | 211 | cp -r C:\gtk-build\gtk\x64\release\share\glib-2.0 $env:PACKAGE_DIR\share\
|
194 | 212 |
|
195 | 213 | # Icons are installed from msys2.
|
196 |
| - # TODO: Figure out the env var for the temp path |
197 |
| - cp -r D:\a\_temp\msys\msys64\mingw64\share\icons $env:PACKAGE_DIR\share\ |
| 214 | + cp -r $env:RUNNER_TEMP\msys\msys64\mingw64\share\icons $env:PACKAGE_DIR\share\ |
198 | 215 |
|
199 | 216 | # https://github.com/gtk-rs/gtk/issues/422
|
200 | 217 | cp -r C:\gtk-build\gtk\x64\release\lib\gdk-pixbuf-2.0 $env:PACKAGE_DIR\lib\
|
|
0 commit comments