Merge branch 'master' into develop

scallyw4g · Dec 23, 2023 · 06991a7 · 06991a7
2 parents 5959927 + bf0dba7
commit 06991a7
Show file tree

Hide file tree

Showing 2 changed files with 20 additions and 8 deletions.
diff --git a/.github/workflows/build.yml b/.github/workflows/build.yml
@@ -1,20 +1,31 @@
-name: C/C++ CI
+name: CI
 
 on:
   push:
-    branches: [ "jesse/feature/test-ci-cd" ]
+    branches: [ "master", "develop" ]
   pull_request:
-    branches: [ "master" ]
+    branches: [ "master", "develop" ]
 
 jobs:
-  build-linux:
-    runs-on: ubuntu-latest
+  build-ubuntu-20:
+    runs-on: ubuntu-20.04
     steps:
     - uses: actions/checkout@v3
     - name: Checkout submodules
       run: git submodule update --init --recursive
     - name: Install Deps
-      run: sudo apt install freeglut3-dev libx11-dev clang-15
+      run: sudo apt update && sudo apt install freeglut3-dev libx11-dev clang
+    - name: Build
+      run: ./make.sh
+
+  build-ubuntu-22:
+    runs-on: ubuntu-22.04
+    steps:
+    - uses: actions/checkout@v3
+    - name: Checkout submodules
+      run: git submodule update --init --recursive
+    - name: Install Deps
+      run: sudo apt update && sudo apt install freeglut3-dev libx11-dev clang-15
     - name: Build
       run: ./make.sh
 
@@ -25,6 +36,7 @@ jobs:
       uses: egor-tensin/setup-mingw@v2
       with:
         platform: x64
+        version: 12.2.0
     - uses: actions/checkout@v3
     - name: Checkout submodules
       run: git submodule update --init --recursive

diff --git a/jesse.make.sh b/jesse.make.sh
@@ -10,7 +10,7 @@
 # ./make.sh -O2 BuildSingleExample examples/the_wanderer
 # ./make.sh     BuildSingleExample examples/the_wanderer
 
-./make.sh BuildTests
+# ./make.sh BuildTests
 
 
 
@@ -44,4 +44,4 @@
   # BuildSingleExample examples/the_wanderer \
   # BuildTests \
 
-# ./make.sh $OPT BuildAll
+./make.sh $OPT BuildAll