From 0a45e26c507f3eca2c11fcb6d51df5c9ba7295d0 Mon Sep 17 00:00:00 2001 From: Ryan Carsten Schmidt Date: Tue, 5 Dec 2023 11:41:43 -0600 Subject: [PATCH 1/6] Rename workflow job to Build SDL UI --- .github/workflows/ccpp.yml | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/.github/workflows/ccpp.yml b/.github/workflows/ccpp.yml index 0a54aa4ee..c50d4a6ee 100644 --- a/.github/workflows/ccpp.yml +++ b/.github/workflows/ccpp.yml @@ -3,8 +3,8 @@ name: SDL/Ubuntu on: [pull_request] jobs: - build: - + build-sdl: + name: Build SDL UI runs-on: ubuntu-latest steps: From d1bfbac59eba699373521ebe00049e29abf1fd30 Mon Sep 17 00:00:00 2001 From: Ryan Carsten Schmidt Date: Tue, 5 Dec 2023 11:42:30 -0600 Subject: [PATCH 2/6] Rename workflow job step to Checkout --- .github/workflows/ccpp.yml | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/.github/workflows/ccpp.yml b/.github/workflows/ccpp.yml index c50d4a6ee..aeb4ae47e 100644 --- a/.github/workflows/ccpp.yml +++ b/.github/workflows/ccpp.yml @@ -6,9 +6,9 @@ jobs: build-sdl: name: Build SDL UI runs-on: ubuntu-latest - steps: - - uses: actions/checkout@v3 + - name: Checkout + uses: actions/checkout@v3 - name: Install dependencies run: sudo apt-get --allow-releaseinfo-change update && sudo apt-get --fix-missing install gcc-10 libsdl2-dev scons - name: Make From b1b4404b481f50c893968434879f87905c2acfc1 Mon Sep 17 00:00:00 2001 From: Ryan Carsten Schmidt Date: Tue, 5 Dec 2023 11:44:01 -0600 Subject: [PATCH 3/6] Use checkout@v4 in workflow --- .github/workflows/ccpp.yml | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/.github/workflows/ccpp.yml b/.github/workflows/ccpp.yml index aeb4ae47e..57aa69861 100644 --- a/.github/workflows/ccpp.yml +++ b/.github/workflows/ccpp.yml @@ -8,7 +8,7 @@ jobs: runs-on: ubuntu-latest steps: - name: Checkout - uses: actions/checkout@v3 + uses: actions/checkout@v4 - name: Install dependencies run: sudo apt-get --allow-releaseinfo-change update && sudo apt-get --fix-missing install gcc-10 libsdl2-dev scons - name: Make From 54f25b3e4e2821d6aa805e07fde3691981e43b37 Mon Sep 17 00:00:00 2001 From: Ryan Carsten Schmidt Date: Tue, 5 Dec 2023 11:44:37 -0600 Subject: [PATCH 4/6] Split workflow step commands onto two lines --- .github/workflows/ccpp.yml | 4 +++- 1 file changed, 3 insertions(+), 1 deletion(-) diff --git a/.github/workflows/ccpp.yml b/.github/workflows/ccpp.yml index 57aa69861..62e9b7a14 100644 --- a/.github/workflows/ccpp.yml +++ b/.github/workflows/ccpp.yml @@ -10,7 +10,9 @@ jobs: - name: Checkout uses: actions/checkout@v4 - name: Install dependencies - run: sudo apt-get --allow-releaseinfo-change update && sudo apt-get --fix-missing install gcc-10 libsdl2-dev scons + run: | + sudo apt-get --allow-releaseinfo-change update + sudo apt-get --fix-missing install gcc-10 libsdl2-dev scons - name: Make working-directory: OSBindings/SDL run: scons -j$(nproc --all) From 452e32ca4ed6b4e8b5136328bc2d11f65d4eabf5 Mon Sep 17 00:00:00 2001 From: Ryan Carsten Schmidt Date: Tue, 5 Dec 2023 11:49:54 -0600 Subject: [PATCH 5/6] Add macOS build job to workflow Closes #1244 --- .github/workflows/ccpp.yml | 9 +++++++++ 1 file changed, 9 insertions(+) diff --git a/.github/workflows/ccpp.yml b/.github/workflows/ccpp.yml index 62e9b7a14..b3814d95c 100644 --- a/.github/workflows/ccpp.yml +++ b/.github/workflows/ccpp.yml @@ -3,6 +3,15 @@ name: SDL/Ubuntu on: [pull_request] jobs: + build-mac: + name: Build Mac UI + runs-on: macos-latest + steps: + - name: Checkout + uses: actions/checkout@v4 + - name: Make + working-directory: OSBindings/Mac + run: xcodebuild CODE_SIGN_IDENTITY=- build-sdl: name: Build SDL UI runs-on: ubuntu-latest From 2ee062ea9e78a45bfc6dcbae708afc6f82fd2317 Mon Sep 17 00:00:00 2001 From: Ryan Carsten Schmidt Date: Tue, 5 Dec 2023 12:11:22 -0600 Subject: [PATCH 6/6] Rename workflow to Build --- .github/workflows/{ccpp.yml => build.yml} | 4 +--- 1 file changed, 1 insertion(+), 3 deletions(-) rename .github/workflows/{ccpp.yml => build.yml} (97%) diff --git a/.github/workflows/ccpp.yml b/.github/workflows/build.yml similarity index 97% rename from .github/workflows/ccpp.yml rename to .github/workflows/build.yml index b3814d95c..579ce3dc4 100644 --- a/.github/workflows/ccpp.yml +++ b/.github/workflows/build.yml @@ -1,7 +1,5 @@ -name: SDL/Ubuntu - +name: Build on: [pull_request] - jobs: build-mac: name: Build Mac UI