From 3a137e6d483f18715b9d631b30e4b9174191123d Mon Sep 17 00:00:00 2001 From: Diavolo Date: Fri, 8 Dec 2023 17:26:54 +0100 Subject: [PATCH] build: update --- .github/workflows/build.yml | 10 +++++----- premake5.lua | 9 +-------- 2 files changed, 6 insertions(+), 13 deletions(-) diff --git a/.github/workflows/build.yml b/.github/workflows/build.yml index 7e58574..40e890e 100644 --- a/.github/workflows/build.yml +++ b/.github/workflows/build.yml @@ -29,7 +29,7 @@ jobs: platform: x64 steps: - name: Check out files - uses: actions/checkout@v3.5.3 + uses: actions/checkout@v4 with: submodules: true fetch-depth: 0 @@ -53,7 +53,7 @@ jobs: run: msbuild /m /v:minimal /p:Configuration=${{matrix.configuration}} /p:Platform=${{matrix.platform}} build/iw4-validator.sln - name: Upload ${{matrix.configuration}} ${{matrix.arch}} binaries - uses: actions/upload-artifact@v3.1.2 + uses: actions/upload-artifact@v3.1.3 with: name: Windows ${{matrix.configuration}} ${{matrix.arch}} binaries path: | @@ -76,7 +76,7 @@ jobs: config: release steps: - name: Check out files - uses: actions/checkout@v3.5.3 + uses: actions/checkout@v4 with: submodules: true fetch-depth: 0 @@ -115,7 +115,7 @@ jobs: make config=${{matrix.config}}_${{matrix.arch}} -j$(nproc) - name: Upload ${{matrix.configuration}} ${{matrix.arch}} binaries - uses: actions/upload-artifact@v3.1.2 + uses: actions/upload-artifact@v3.1.3 with: name: Linux ${{matrix.configuration}} ${{matrix.arch}} binaries path: | @@ -138,7 +138,7 @@ jobs: # Set up committer info and GPG key - name: Install SSH key - uses: shimataro/ssh-key-action@v2.5.1 + uses: shimataro/ssh-key-action@v2.6.1 with: key: ${{ secrets.ALTERWARE_MASTER_SSH_PRIVATE_KEY }} known_hosts: 'just-a-placeholder-so-we-dont-get-errors' diff --git a/premake5.lua b/premake5.lua index 73ab622..7570745 100644 --- a/premake5.lua +++ b/premake5.lua @@ -24,14 +24,6 @@ filter "platforms:arm64" architecture "ARM64" filter {} -filter {"language:C++", "toolset:not msc*"} - buildoptions "-std=c++20" -filter {} - -filter "toolset:msc*" - buildoptions "/std:c++20" -filter {} - filter {"system:windows"} systemversion "latest" filter {} @@ -72,6 +64,7 @@ filter {} project "iw4-validator" kind "ConsoleApp" language "C++" +cppdialect "C++20" targetname "iw4-validator"