From b9c56ce5a76bd52865a260ff3f0975ea1b273da1 Mon Sep 17 00:00:00 2001 From: a dinosaur Date: Fri, 22 Mar 2024 14:49:09 +1100 Subject: [PATCH] actions: fix windows & universal artifacts --- .github/workflows/cmake.yml | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/.github/workflows/cmake.yml b/.github/workflows/cmake.yml index c6a8b88..ae20b09 100644 --- a/.github/workflows/cmake.yml +++ b/.github/workflows/cmake.yml @@ -35,7 +35,7 @@ jobs: run: >- cmake -B build -G "${{startsWith(matrix.config.os, 'windows') && 'NMake Makefiles' || 'Ninja'}}" - ${{(startsWith(matrix.config.os, 'macos') && matrix.config.arch) && join('-DCMAKE_OSX_ARCHITECTURES=', matrix.config.arch) || ''}} + ${{(startsWith(matrix.config.os, 'macos') && matrix.config.arch) && format('-DCMAKE_OSX_ARCHITECTURES="{0}"', matrix.config.arch) || ''}} ${{matrix.config.extra}} -DCMAKE_BUILD_TYPE=${{env.BUILD_TYPE}} - name: Build @@ -44,4 +44,4 @@ jobs: - uses: actions/upload-artifact@v4 with: name: ${{env.ARTIFACT_NAME}}-${{matrix.config.artifact}} - path: build/src/${{join(env.ARTIFACT_NAME, startsWith(matrix.config.os, 'windows') && '.exe' || '')}} + path: build/src/${{env.ARTIFACT_NAME}}${{startsWith(matrix.config.os, 'windows') && '.exe' || ''}}