Skip to content

Commit 53cddd3

Browse files
committed
log/update msys2 location because it changed
1 parent 2c21256 commit 53cddd3

File tree

2 files changed

+26
-24
lines changed

2 files changed

+26
-24
lines changed

.github/workflows/prebuild.yaml

Lines changed: 2 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -237,6 +237,7 @@ jobs:
237237
# https://github.com/msys2/setup-msys2#setup-msys2
238238
# https://github.com/actions/virtual-environments/pull/632
239239
- uses: msys2/setup-msys2@v2
240+
id: msys2
240241
with:
241242
msystem: UCRT64
242243
update: true
@@ -255,6 +256,7 @@ jobs:
255256

256257
- name: Build
257258
run: |
259+
echo "MSYS2 LOCATION: ${{steps.msys2.outputs.msys2-location}}"
258260
git checkout ${{ matrix.canvas_tag }}
259261
git checkout $env:GITHUB_SHA -- prebuild/
260262
npm install -g node-gyp

prebuild/Windows/binding.gyp

Lines changed: 24 additions & 24 deletions
Original file line numberDiff line numberDiff line change
@@ -32,33 +32,33 @@
3232
'NODE_ADDON_API_ENABLE_MAYBE'
3333
],
3434
'libraries': [
35-
'D:/a/_temp/msys64/ucrt64/lib/libcairo-2.lib',
36-
'D:/a/_temp/msys64/ucrt64/lib/libpng16-16.lib',
37-
'D:/a/_temp/msys64/ucrt64/lib/libjpeg-8.lib',
38-
'D:/a/_temp/msys64/ucrt64/lib/libpango-1.0-0.lib',
39-
'D:/a/_temp/msys64/ucrt64/lib/libpangocairo-1.0-0.lib',
40-
'D:/a/_temp/msys64/ucrt64/lib/libgobject-2.0-0.lib',
41-
'D:/a/_temp/msys64/ucrt64/lib/libglib-2.0-0.lib',
42-
'D:/a/_temp/msys64/ucrt64/lib/libturbojpeg.lib',
43-
'D:/a/_temp/msys64/ucrt64/lib/libgif-7.lib',
44-
'D:/a/_temp/msys64/ucrt64/lib/libfreetype-6.lib',
45-
'D:/a/_temp/msys64/ucrt64/lib/librsvg-2-2.lib'
35+
'C:/a/_temp/msys64/ucrt64/lib/libcairo-2.lib',
36+
'C:/a/_temp/msys64/ucrt64/lib/libpng16-16.lib',
37+
'C:/a/_temp/msys64/ucrt64/lib/libjpeg-8.lib',
38+
'C:/a/_temp/msys64/ucrt64/lib/libpango-1.0-0.lib',
39+
'C:/a/_temp/msys64/ucrt64/lib/libpangocairo-1.0-0.lib',
40+
'C:/a/_temp/msys64/ucrt64/lib/libgobject-2.0-0.lib',
41+
'C:/a/_temp/msys64/ucrt64/lib/libglib-2.0-0.lib',
42+
'C:/a/_temp/msys64/ucrt64/lib/libturbojpeg.lib',
43+
'C:/a/_temp/msys64/ucrt64/lib/libgif-7.lib',
44+
'C:/a/_temp/msys64/ucrt64/lib/libfreetype-6.lib',
45+
'C:/a/_temp/msys64/ucrt64/lib/librsvg-2-2.lib'
4646
],
4747
'include_dirs': [
4848
'<!(node -p "require(\'node-addon-api\').include_dir")',
49-
'D:/a/_temp/msys64/ucrt64/include',
50-
'D:/a/_temp/msys64/ucrt64/include/harfbuzz',
51-
'D:/a/_temp/msys64/ucrt64/include/pango-1.0',
52-
'D:/a/_temp/msys64/ucrt64/include/cairo',
53-
'D:/a/_temp/msys64/ucrt64/include/libpng16',
54-
'D:/a/_temp/msys64/ucrt64/include/glib-2.0',
55-
'D:/a/_temp/msys64/ucrt64/lib/glib-2.0/include',
56-
'D:/a/_temp/msys64/ucrt64/include/pixman-1',
57-
'D:/a/_temp/msys64/ucrt64/include/freetype2',
58-
'D:/a/_temp/msys64/ucrt64/include/fontconfig',
59-
'D:/a/_temp/msys64/ucrt64/include/librsvg-2.0',
60-
'D:/a/_temp/msys64/ucrt64/include/gdk-pixbuf-2.0',
61-
'D:/a/_temp/msys64/ucrt64/include/libgsf-1' # NEW
49+
'C:/a/_temp/msys64/ucrt64/include',
50+
'C:/a/_temp/msys64/ucrt64/include/harfbuzz',
51+
'C:/a/_temp/msys64/ucrt64/include/pango-1.0',
52+
'C:/a/_temp/msys64/ucrt64/include/cairo',
53+
'C:/a/_temp/msys64/ucrt64/include/libpng16',
54+
'C:/a/_temp/msys64/ucrt64/include/glib-2.0',
55+
'C:/a/_temp/msys64/ucrt64/lib/glib-2.0/include',
56+
'C:/a/_temp/msys64/ucrt64/include/pixman-1',
57+
'C:/a/_temp/msys64/ucrt64/include/freetype2',
58+
'C:/a/_temp/msys64/ucrt64/include/fontconfig',
59+
'C:/a/_temp/msys64/ucrt64/include/librsvg-2.0',
60+
'C:/a/_temp/msys64/ucrt64/include/gdk-pixbuf-2.0',
61+
'C:/a/_temp/msys64/ucrt64/include/libgsf-1' # NEW
6262
],
6363
'configurations': {
6464
'Debug': {

0 commit comments

Comments
 (0)