Skip to content

Commit

Permalink
build: cleanup CI workflow
Browse files Browse the repository at this point in the history
  • Loading branch information
diamante0018 committed Jan 12, 2024
1 parent d4fad5d commit 9f68a0e
Show file tree
Hide file tree
Showing 2 changed files with 25 additions and 39 deletions.
62 changes: 24 additions & 38 deletions .github/workflows/build.yml
Original file line number Diff line number Diff line change
Expand Up @@ -21,24 +21,24 @@ jobs:
fail-fast: false
matrix:
configuration:
- Debug
- Release
- debug
- release
arch:
- x64
include:
- arch: x64
platform: x64
steps:
- name: Check out files
uses: actions/checkout@v4
uses: actions/checkout@main
with:
submodules: true
fetch-depth: 0
# NOTE - If LFS ever starts getting used during builds, switch this to true!
lfs: false

- name: Add msbuild to PATH
uses: microsoft/setup-msbuild@v1.3.1
uses: microsoft/setup-msbuild@main

- name: Install Premake5
uses: abel0b/[email protected]
Expand All @@ -51,13 +51,13 @@ jobs:
- name: Set up problem matching
uses: ammaraskar/msvc-problem-matcher@master

- name: Build ${{matrix.configuration}} ${{matrix.arch}} binaries
- name: Build ${{matrix.arch}} ${{matrix.configuration}} binaries
run: msbuild /m /v:minimal /p:Configuration=${{matrix.configuration}} /p:Platform=${{matrix.platform}} build/alterware-master.sln

- name: Upload ${{matrix.configuration}} ${{matrix.arch}} binaries
uses: actions/upload-artifact@v3.1.3
- 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}}/alterware-master.exe
build/bin/${{matrix.arch}}/${{matrix.configuration}}/alterware-master.pdb
Expand All @@ -69,18 +69,13 @@ 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@v4
uses: actions/checkout@main
with:
submodules: true
fetch-depth: 0
Expand All @@ -104,18 +99,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
uses: actions/upload-artifact@v3.1.3
- 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}}/alterware-master
Expand All @@ -126,23 +121,14 @@ 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@v4
uses: actions/checkout@main
with:
submodules: true
fetch-depth: 0
Expand All @@ -160,14 +146,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
uses: actions/upload-artifact@v3.1.3
- name: Upload ${{matrix.arch}} ${{matrix.configuration}} binaries
uses: actions/upload-artifact@main
with:
name: macOS ${{matrix.configuration}} ${{matrix.arch}} binaries
name: macos-${{matrix.arch}}-${{matrix.configuration}}
path: |
build/bin/${{matrix.arch}}/${{matrix.configuration}}/alterware-master
2 changes: 1 addition & 1 deletion premake5.lua
Original file line number Diff line number Diff line change
Expand Up @@ -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"
Expand Down

0 comments on commit 9f68a0e

Please sign in to comment.