From 4d7967f55d6cd007b74ef14dd07c25e9014ca0dc Mon Sep 17 00:00:00 2001 From: Chris Thrasher Date: Fri, 7 Jul 2023 21:01:27 -0600 Subject: [PATCH 1/4] Build as non-superuser on macOS --- .github/workflows/ci.yml | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/.github/workflows/ci.yml b/.github/workflows/ci.yml index 279484a4..5429f965 100644 --- a/.github/workflows/ci.yml +++ b/.github/workflows/ci.yml @@ -15,7 +15,7 @@ jobs: - { name: Windows VS2022, os: windows-2022 } - { name: Linux GCC, os: ubuntu-latest } - { name: Linux Clang, os: ubuntu-latest, flags: -DCMAKE_C_COMPILER=clang -DCMAKE_CXX_COMPILER=clang++ } - - { name: MacOS, os: macos-12, flags: -DSFML_BUILD_FRAMEWORKS=FALSE, prefix: sudo } + - { name: MacOS, os: macos-12, flags: -DSFML_BUILD_FRAMEWORKS=FALSE } steps: - name: Install Linux Dependencies if: runner.os == 'Linux' @@ -34,7 +34,7 @@ jobs: - name: Build SFML shell: bash - run: ${{matrix.platform.prefix}} cmake --build $GITHUB_WORKSPACE/SFML/build --config Release --target install + run: cmake --build $GITHUB_WORKSPACE/SFML/build --config Release --target install - name: Checkout CSFML uses: actions/checkout@v3 From 839aa7bd9b264feaaf5ed3ffff16f23776222b2c Mon Sep 17 00:00:00 2001 From: Chris Thrasher Date: Fri, 7 Jul 2023 20:56:27 -0600 Subject: [PATCH 2/4] Add Windows ClangCL CI job --- .github/workflows/ci.yml | 1 + 1 file changed, 1 insertion(+) diff --git a/.github/workflows/ci.yml b/.github/workflows/ci.yml index 5429f965..58bc6f96 100644 --- a/.github/workflows/ci.yml +++ b/.github/workflows/ci.yml @@ -13,6 +13,7 @@ jobs: platform: - { name: Windows VS2019, os: windows-2019 } - { name: Windows VS2022, os: windows-2022 } + - { name: Windows ClangCL, os: windows-2022, flags: -T ClangCL } - { name: Linux GCC, os: ubuntu-latest } - { name: Linux Clang, os: ubuntu-latest, flags: -DCMAKE_C_COMPILER=clang -DCMAKE_CXX_COMPILER=clang++ } - { name: MacOS, os: macos-12, flags: -DSFML_BUILD_FRAMEWORKS=FALSE } From 4eeaa60ee34c0a78db85ff984f3b330a2345640d Mon Sep 17 00:00:00 2001 From: Chris Thrasher Date: Fri, 7 Jul 2023 21:11:03 -0600 Subject: [PATCH 3/4] Add Windows Clang CI job --- .github/workflows/ci.yml | 1 + 1 file changed, 1 insertion(+) diff --git a/.github/workflows/ci.yml b/.github/workflows/ci.yml index 58bc6f96..e00b88ba 100644 --- a/.github/workflows/ci.yml +++ b/.github/workflows/ci.yml @@ -14,6 +14,7 @@ jobs: - { name: Windows VS2019, os: windows-2019 } - { name: Windows VS2022, os: windows-2022 } - { name: Windows ClangCL, os: windows-2022, flags: -T ClangCL } + - { name: Windows Clang, os: windows-2022, flags: -DCMAKE_C_COMPILER=clang -DCMAKE_CXX_COMPILER=clang++ -GNinja } - { name: Linux GCC, os: ubuntu-latest } - { name: Linux Clang, os: ubuntu-latest, flags: -DCMAKE_C_COMPILER=clang -DCMAKE_CXX_COMPILER=clang++ } - { name: MacOS, os: macos-12, flags: -DSFML_BUILD_FRAMEWORKS=FALSE } From cfee450b7bd8a49292f474dbb358f9f34fc7bef2 Mon Sep 17 00:00:00 2001 From: Chris Thrasher Date: Fri, 7 Jul 2023 21:18:24 -0600 Subject: [PATCH 4/4] Add Windows MinGW CI job --- .github/workflows/ci.yml | 1 + 1 file changed, 1 insertion(+) diff --git a/.github/workflows/ci.yml b/.github/workflows/ci.yml index e00b88ba..83466b20 100644 --- a/.github/workflows/ci.yml +++ b/.github/workflows/ci.yml @@ -15,6 +15,7 @@ jobs: - { name: Windows VS2022, os: windows-2022 } - { name: Windows ClangCL, os: windows-2022, flags: -T ClangCL } - { name: Windows Clang, os: windows-2022, flags: -DCMAKE_C_COMPILER=clang -DCMAKE_CXX_COMPILER=clang++ -GNinja } + - { name: Windows MinGW, os: windows-2022, flags: -DCMAKE_C_COMPILER=gcc -DCMAKE_CXX_COMPILER=g++ -GNinja } - { name: Linux GCC, os: ubuntu-latest } - { name: Linux Clang, os: ubuntu-latest, flags: -DCMAKE_C_COMPILER=clang -DCMAKE_CXX_COMPILER=clang++ } - { name: MacOS, os: macos-12, flags: -DSFML_BUILD_FRAMEWORKS=FALSE }