Skip to content

Commit f46c9e4

Browse files
authored
Merge pull request #20 from pedrolcl/fix-msys2-github-action
2 parents 0abe1d4 + 4696045 commit f46c9e4

1 file changed

Lines changed: 6 additions & 5 deletions

File tree

.github/workflows/win-msys2.yml

Lines changed: 6 additions & 5 deletions
Original file line numberDiff line numberDiff line change
@@ -10,7 +10,6 @@ on:
1010
env:
1111
BUILD_TYPE: RelWithDebInfo
1212
INSTALL_LOCATION: SonivoxV4
13-
TEMP: temp
1413

1514
jobs:
1615
build:
@@ -53,26 +52,28 @@ jobs:
5352
gtest:p
5453
5554
- name: '${{ matrix.icon }} TEMP Environment Variable'
55+
id: tmp
5656
run: |
57-
mkdir temp
57+
echo "cache_path=$(cygpath -m $TEMP)" >> $GITHUB_OUTPUT
58+
echo "dependencies=$(cygpath -m $MSYSTEM_PREFIX/bin)" >> $GITHUB_OUTPUT
5859
5960
- name: '${{ matrix.icon }} Downloading a DLS file for testing'
6061
uses: ethanjli/cached-download-action@v0.1.3
6162
with:
6263
url: http://www.ronimusic.com/sf2/Airfont_340.dls
63-
destination: temp/soundfont.dls
64+
destination: ${{steps.tmp.outputs.cache_path}}/soundfont.dls
6465
cache-key: cached.soundfont.dls
6566
enable-cross-os-archive: true
6667

6768
- name: '${{ matrix.icon }} Configure CMake'
69+
id: configuration
6870
run: >
6971
cmake -B build -G Ninja
7072
-DCMAKE_BUILD_TYPE=${{env.BUILD_TYPE}}
7173
-DCMAKE_INSTALL_PREFIX=${{env.INSTALL_LOCATION}}
72-
-DDEPENDENCY_DIRS=${{steps.msys2.outputs.msys2-location}}/${{matrix.sys}}/bin
74+
-DDEPENDENCY_DIRS=${{steps.tmp.outputs.dependencies}}
7375
-DCPACK_SYSTEM_NAME=${{matrix.sys}}
7476
-DINSTALL_DEPENDENCIES=ON
75-
id: configuration
7677
7778
- name: '${{ matrix.icon }} Build'
7879
run: cmake --build build --config ${{env.BUILD_TYPE}}

0 commit comments

Comments
 (0)