diff --git a/.github/workflows/build.yml b/.github/workflows/build.yml index a009ffe..d20ba94 100644 --- a/.github/workflows/build.yml +++ b/.github/workflows/build.yml @@ -24,8 +24,8 @@ jobs: fail-fast: false matrix: configuration: - - Debug - - Release + - debug + - release arch: - x64 include: @@ -57,10 +57,10 @@ jobs: - name: Build ${{matrix.configuration}} ${{matrix.arch}} binaries run: msbuild /m /v:minimal /p:Configuration=${{matrix.configuration}} /p:Platform=${{matrix.platform}} build/aw-installer.sln - - name: Upload ${{matrix.configuration}} ${{matrix.arch}} binaries + - name: Upload ${{matrix.arch}} ${{matrix.configuration}} binaries uses: actions/upload-artifact@main with: - name: Windows ${{matrix.configuration}} ${{matrix.arch}} binaries + name: windows-${{matrix.arch}}-${{matrix.configuration}} path: | build/bin/${{matrix.arch}}/${{matrix.configuration}}/aw-installer.exe build/bin/${{matrix.arch}}/${{matrix.configuration}}/aw-installer.pdb @@ -72,15 +72,10 @@ jobs: fail-fast: false matrix: configuration: - - Debug - - Release + - debug + - release arch: - x64 - include: - - configuration: Debug - config: debug - - configuration: Release - config: release steps: - name: Check out files uses: actions/checkout@main @@ -107,18 +102,18 @@ jobs: - name: Set up problem matching uses: ammaraskar/gcc-problem-matcher@master - - name: Build ${{matrix.configuration}} ${{matrix.arch}} binaries + - name: Build ${{matrix.arch}} ${{matrix.configuration}} binaries run: | pushd build - make config=${{matrix.config}}_${{matrix.arch}} -j$(nproc) + make config=${{matrix.configuration}}_${{matrix.arch}} -j$(nproc) env: CC: clang CXX: clang++ - - name: Upload ${{matrix.configuration}} ${{matrix.arch}} binaries + - name: Upload ${{matrix.arch}} ${{matrix.configuration}} binaries uses: actions/upload-artifact@main with: - name: Linux ${{matrix.configuration}} ${{matrix.arch}} binaries + name: linux-${{matrix.arch}}-${{matrix.configuration}} path: | build/bin/${{matrix.arch}}/${{matrix.configuration}}/aw-installer @@ -129,20 +124,11 @@ jobs: fail-fast: false matrix: configuration: - - Debug - - Release + - debug + - release arch: - x64 - arm64 - include: - - configuration: Debug - config: debug - - configuration: Release - config: release - - arch: x64 - platform: x64 - - arch: arm64 - platform: arm64 steps: - name: Check out files uses: actions/checkout@main @@ -163,14 +149,14 @@ jobs: - name: Set up problem matching uses: ammaraskar/gcc-problem-matcher@master - - name: Build ${{matrix.configuration}} ${{matrix.arch}} binaries + - name: Build ${{matrix.arch}} ${{matrix.configuration}} binaries run: | pushd build - make config=${{matrix.config}}_${{matrix.arch}} -j$(sysctl -n hw.logicalcpu) + make config=${{matrix.configuration}}_${{matrix.arch}} -j$(sysctl -n hw.logicalcpu) - - name: Upload ${{matrix.configuration}} ${{matrix.arch}} binaries + - name: Upload ${{matrix.arch}} ${{matrix.configuration}} binaries uses: actions/upload-artifact@v3.1.3 with: - name: macOS ${{matrix.configuration}} ${{matrix.arch}} binaries + name: macos-${{matrix.arch}}-${{matrix.configuration}} path: | build/bin/${{matrix.arch}}/${{matrix.configuration}}/aw-installer diff --git a/premake5.lua b/premake5.lua index c239cec..e4b9b85 100644 --- a/premake5.lua +++ b/premake5.lua @@ -36,7 +36,7 @@ location "./build" objdir "%{wks.location}/obj" targetdir "%{wks.location}/bin/%{cfg.platform}/%{cfg.buildcfg}" -configurations {"Debug", "Release"} +configurations {"debug", "release"} language "C++" cppdialect "C++20" diff --git a/src/updater/updater.cpp b/src/updater/updater.cpp index ced0b1a..8ab6d22 100644 --- a/src/updater/updater.cpp +++ b/src/updater/updater.cpp @@ -19,7 +19,7 @@ namespace updater const auto iw4_install = utils::properties::load("iw4-install"); if (!iw4_install) { - console::error("Failed to load properties file"); + console::error("Failed to load the properties file"); return false; }