Skip to content

Commit 5230f4a

Browse files
committed
last try today
1 parent 88f19ac commit 5230f4a

File tree

6 files changed

+15
-41
lines changed

6 files changed

+15
-41
lines changed

.github/workflows/freebsd-ci.yml

Lines changed: 2 additions & 8 deletions
Original file line numberDiff line numberDiff line change
@@ -14,7 +14,6 @@ jobs:
1414
env:
1515
BUILD_TYPE: RelWithDebInfo
1616
INSTALL_LOCATION: ${{github.workspace}}/SonivoxV3
17-
TEMP: ${{github.workspace}}/temp
1817

1918
steps:
2019
- uses: actions/checkout@v4
@@ -27,16 +26,11 @@ jobs:
2726
cache-key: cached.soundfont.dls
2827
enable-cross-os-archive: true
2928

30-
- name: 'Link to TEMP directory: ${{env.TEMP}}'
31-
run: |
32-
mkdir -p $TEMP
33-
ln -s soundfont.dls $TEMP/soundfont.dls
34-
3529
- name: FreeBSD test
3630
id: test
3731
uses: vmactions/freebsd-vm@v1
3832
with:
39-
envs: 'BUILD_TYPE INSTALL_LOCATION TEMP'
33+
envs: 'BUILD_TYPE INSTALL_LOCATION'
4034
usesh: true
4135
prepare: |
4236
pkg install -y \
@@ -46,7 +40,7 @@ jobs:
4640
googletest
4741
run: |
4842
set -e -x
49-
cmake -B ${{github.workspace}}/build -DCMAKE_BUILD_TYPE=${{env.BUILD_TYPE}} -DCMAKE_INSTALL_PREFIX=${{env.INSTALL_LOCATION}} -DNEW_HOST_WRAPPER=NO
43+
cmake -B ${{github.workspace}}/build -DCMAKE_BUILD_TYPE=${{env.BUILD_TYPE}} -DCMAKE_INSTALL_PREFIX=${{env.INSTALL_LOCATION}} -DNEW_HOST_WRAPPER=NO -DSOUNDFONT=soundfont.dls
5044
cmake --build ${{github.workspace}}/build --config ${{env.BUILD_TYPE}}
5145
cd ${{github.workspace}}/build
5246
ctest -C ${{env.BUILD_TYPE}} --verbose

.github/workflows/linux-ci.yml

Lines changed: 1 addition & 7 deletions
Original file line numberDiff line numberDiff line change
@@ -10,7 +10,6 @@ on:
1010
env:
1111
BUILD_TYPE: RelWithDebInfo
1212
INSTALL_LOCATION: ${{github.workspace}}/SonivoxV3
13-
TEMP: ${{github.workspace}}/temp
1413

1514
jobs:
1615
build:
@@ -44,13 +43,8 @@ jobs:
4443
cache-key: cached.soundfont.dls
4544
enable-cross-os-archive: true
4645

47-
- name: '${{ matrix.icon }} Link to the TEMP directory: ${{env.TEMP}}'
48-
run: |
49-
mkdir -p $TEMP
50-
ln -s soundfont.dls $TEMP/soundfont.dls
51-
5246
- name: '${{ matrix.icon }} Configure CMake with USE_44KHZ=${{ matrix.USE_44KHZ }} and USE_16BITS_SAMPLES=${{ matrix.USE_16BITS_SAMPLES }}'
53-
run: cmake -B ${{github.workspace}}/build -DCMAKE_BUILD_TYPE=${{env.BUILD_TYPE}} -DCMAKE_INSTALL_PREFIX=${{env.INSTALL_LOCATION}} -DUSE_44KHZ=${{ matrix.USE_44KHZ }} -DUSE_16BITS_SAMPLES=${{ matrix.USE_16BITS_SAMPLES }}
47+
run: cmake -B ${{github.workspace}}/build -DCMAKE_BUILD_TYPE=${{env.BUILD_TYPE}} -DCMAKE_INSTALL_PREFIX=${{env.INSTALL_LOCATION}} -DUSE_44KHZ=${{ matrix.USE_44KHZ }} -DUSE_16BITS_SAMPLES=${{ matrix.USE_16BITS_SAMPLES }} -DSOUNDFONT=soundfont.dls
5448

5549
- name: '${{ matrix.icon }} Build'
5650
run: cmake --build ${{github.workspace}}/build --config ${{env.BUILD_TYPE}}

.github/workflows/mac-ci.yml

Lines changed: 1 addition & 7 deletions
Original file line numberDiff line numberDiff line change
@@ -10,7 +10,6 @@ on:
1010
env:
1111
BUILD_TYPE: RelWithDebInfo
1212
INSTALL_LOCATION: ${{github.workspace}}/SonivoxV3
13-
TEMP: ${{github.workspace}}/temp
1413

1514
jobs:
1615
build:
@@ -28,13 +27,8 @@ jobs:
2827
cache-key: cached.soundfont.dls
2928
enable-cross-os-archive: true
3029

31-
- name: 'Link to TEMP directory: ${{env.TEMP}}'
32-
run: |
33-
mkdir -p $TEMP
34-
ln -s soundfont.dls $TEMP/soundfont.dls
35-
3630
- name: Configure CMake
37-
run: cmake -B ${{github.workspace}}/build -DCMAKE_BUILD_TYPE=${{env.BUILD_TYPE}} -DCMAKE_INSTALL_PREFIX=${{env.INSTALL_LOCATION}}
31+
run: cmake -B ${{github.workspace}}/build -DCMAKE_BUILD_TYPE=${{env.BUILD_TYPE}} -DCMAKE_INSTALL_PREFIX=${{env.INSTALL_LOCATION}} -DSOUNDFONT=soundfont.dls
3832

3933
- name: Build
4034
run: cmake --build ${{github.workspace}}/build --config ${{env.BUILD_TYPE}}

.github/workflows/win-msvc.yml

Lines changed: 1 addition & 7 deletions
Original file line numberDiff line numberDiff line change
@@ -10,7 +10,6 @@ on:
1010
env:
1111
BUILD_TYPE: RelWithDebInfo
1212
INSTALL_LOCATION: ${{github.workspace}}/SonivoxV3
13-
TEMP: ${{github.workspace}}/temp
1413

1514
jobs:
1615
build:
@@ -39,13 +38,8 @@ jobs:
3938
cache-key: cached.soundfont.dls
4039
enable-cross-os-archive: true
4140

42-
- name: '${{ matrix.icon }} Link to TEMP directory: ${{env.TEMP}}'
43-
run: |
44-
mkdir ${{env.TEMP}}
45-
mklink /D ${{env.TEMP}}/soundfont.dls soundfont.dls
46-
4741
- name: '${{ matrix.icon }} Configure CMake'
48-
run: cmake -B ${{github.workspace}}/build -DCMAKE_BUILD_TYPE=${{env.BUILD_TYPE}} -DCMAKE_INSTALL_PREFIX=${{env.INSTALL_LOCATION}} -G Ninja
42+
run: cmake -B ${{github.workspace}}/build -DCMAKE_BUILD_TYPE=${{env.BUILD_TYPE}} -DCMAKE_INSTALL_PREFIX=${{env.INSTALL_LOCATION}} -G Ninja -DSOUNDFONT=soundfont.dls
4943

5044
- name: '${{ matrix.icon }} Build'
5145
run: cmake --build ${{github.workspace}}/build --config ${{env.BUILD_TYPE}}

.github/workflows/win-msys2.yml

Lines changed: 1 addition & 5 deletions
Original file line numberDiff line numberDiff line change
@@ -53,12 +53,8 @@ jobs:
5353
cache-key: cached.soundfont.dls
5454
enable-cross-os-archive: true
5555

56-
- name: '${{ matrix.icon }} Link to TEMP directory: ${{env.TEMP}}'
57-
run: |
58-
ln -s soundfont.dls $TEMP/soundfont.dls
59-
6056
- name: '${{ matrix.icon }} Configure CMake'
61-
run: cmake -B build -DCMAKE_BUILD_TYPE=${{env.BUILD_TYPE}} -DCMAKE_INSTALL_PREFIX=${{env.INSTALL_LOCATION}} -G Ninja
57+
run: cmake -B build -DCMAKE_BUILD_TYPE=${{env.BUILD_TYPE}} -DCMAKE_INSTALL_PREFIX=${{env.INSTALL_LOCATION}} -G Ninja -DSOUNDFONT=soundfont.dls
6258

6359
- name: '${{ matrix.icon }} Build'
6460
run: cmake --build build --config ${{env.BUILD_TYPE}}

CMakeLists.txt

Lines changed: 9 additions & 7 deletions
Original file line numberDiff line numberDiff line change
@@ -339,15 +339,17 @@ if (BUILD_TESTING)
339339
)
340340
endif()
341341

342-
if(DEFINED ENV{TEMP})
343-
set(TEMPDIR "$ENV{TEMP}")
344-
elseif(DEFINED ENV{XDG_RUNTIME_DIR})
345-
set(TEMPDIR "$ENV{XDG_RUNTIME_DIR}")
346-
else()
347-
message(FATAL_ERROR "Cannot find a temporary directory. Define the TEMP environment variable.")
342+
if(NOT SOUNDFONT)
343+
if(DEFINED ENV{TEMP})
344+
set(TEMPDIR "$ENV{TEMP}")
345+
elseif(DEFINED ENV{XDG_RUNTIME_DIR})
346+
set(TEMPDIR "$ENV{XDG_RUNTIME_DIR}")
347+
else()
348+
message(FATAL_ERROR "Cannot find a temporary directory. Define the TEMP environment variable.")
349+
endif()
350+
set(SOUNDFONT "${TEMPDIR}/soundfont.dls")
348351
endif()
349352

350-
set(SOUNDFONT "${TEMPDIR}/soundfont.dls")
351353
if (NOT EXISTS ${SOUNDFONT})
352354
message(STATUS "Downloading DLS file for testing to ${SOUNDFONT}")
353355
file(DOWNLOAD "http://www.ronimusic.com/sf2/Airfont_340.dls" ${SOUNDFONT})

0 commit comments

Comments
 (0)