Skip to content

Commit 5dfe77c

Browse files
committed
fix: corrections of GitHub Actions related to problem with Cairo library
correct setting of path to MSYS2 instance of Cairo library, setting is dynamic so switch to MSYS2 UCRT64 from MINGW64 should be easy
1 parent 4b628b1 commit 5dfe77c

2 files changed

Lines changed: 13 additions & 10 deletions

File tree

.github/workflows/documentation.yml

Lines changed: 6 additions & 5 deletions
Original file line numberDiff line numberDiff line change
@@ -42,15 +42,16 @@ jobs:
4242
- name: Install Cairo via MSYS2
4343
uses: msys2/setup-msys2@v2
4444
with:
45+
msystem: MINGW64
46+
path-type: inherit
4547
update: true
4648
install: mingw-w64-x86_64-cairo
4749
- name: Add MSYS2 Cairo to PATH to make cairocffi libraries like libcairo-2.dll discoverable
48-
shell: powershell
49-
# "C:\msys64\mingw64\bin" did not work, try "C:\Program Files\Unity Hub\resources\app.asar.unpacked\node_modules\canvas\build\Release"
50-
# found using Get-ChildItem -Path C:\ -Filter "*libcairo*.d*" -File -Recurse -ErrorAction SilentlyContinue in Log step
50+
shell: msys2 {0}
5151
run: |
52-
echo "C:\Program Files\Unity Hub\resources\app.asar.unpacked\node_modules\canvas\build\Release" | Out-File -FilePath $env:GITHUB_PATH -Encoding utf8 -Append
53-
echo "CAIROCFFI_DLL_DIRECTORIES=C:\Program Files\Unity Hub\resources\app.asar.unpacked\node_modules\canvas\build\Release" | Out-File -FilePath $env:GITHUB_ENV -Encoding utf8 -Append
52+
echo "CAIRO_DLL=$(cygpath -w /${MSYSTEM,,}/bin/libcairo-2.dll)" >> $GITHUB_ENV
53+
echo "CAIROCFFI_DLL_DIRECTORIES=$(cygpath -w /${MSYSTEM,,}/bin)" >> $GITHUB_ENV
54+
echo "$(cygpath -w /${MSYSTEM,,}/bin)" >> $GITHUB_PATH
5455
- name: Log environment variable updates
5556
shell: powershell
5657
run: |

.github/workflows/documentation_testbuild.yml

Lines changed: 7 additions & 5 deletions
Original file line numberDiff line numberDiff line change
@@ -1,6 +1,7 @@
11
name: Test Documentation Build
22

33
on:
4+
workflow_dispatch:
45
push:
56
branches:
67
- '*'
@@ -29,15 +30,16 @@ jobs:
2930
- name: Install Cairo via MSYS2
3031
uses: msys2/setup-msys2@v2
3132
with:
33+
msystem: MINGW64
34+
path-type: inherit
3235
update: true
3336
install: mingw-w64-x86_64-cairo
3437
- name: Add MSYS2 Cairo to PATH to make cairocffi libraries like libcairo-2.dll discoverable
35-
shell: powershell
36-
# "C:\msys64\mingw64\bin" did not work, try "C:\Program Files\Unity Hub\resources\app.asar.unpacked\node_modules\canvas\build\Release"
37-
# found using Get-ChildItem -Path C:\ -Filter "*libcairo*.d*" -File -Recurse -ErrorAction SilentlyContinue in Log step
38+
shell: msys2 {0}
3839
run: |
39-
echo "C:\Program Files\Unity Hub\resources\app.asar.unpacked\node_modules\canvas\build\Release" | Out-File -FilePath $env:GITHUB_PATH -Encoding utf8 -Append
40-
echo "CAIROCFFI_DLL_DIRECTORIES=C:\Program Files\Unity Hub\resources\app.asar.unpacked\node_modules\canvas\build\Release" | Out-File -FilePath $env:GITHUB_ENV -Encoding utf8 -Append
40+
echo "CAIRO_DLL=$(cygpath -w /${MSYSTEM,,}/bin/libcairo-2.dll)" >> $GITHUB_ENV
41+
echo "CAIROCFFI_DLL_DIRECTORIES=$(cygpath -w /${MSYSTEM,,}/bin)" >> $GITHUB_ENV
42+
echo "$(cygpath -w /${MSYSTEM,,}/bin)" >> $GITHUB_PATH
4143
- name: Log environment variable updates
4244
shell: powershell
4345
run: |

0 commit comments

Comments
 (0)