Get the game working on macOS again (without PR 754 changes)

.github/workflows/Windows-CI.yml

@@ -35,7 +35,7 @@ jobs:
     steps:
       # Checks-out your repository under $GITHUB_WORKSPACE, so your job can access it
       - name: checkout
-        uses: actions/checkout@ac593985615ec2ede58e132d2e21d2b1cbd6127c #v3.3.0
+        uses: actions/checkout@8e5e7e5ab8b370d6c329ec480221332ada57f0ab #v3.5.2
 
       - name: install-cmake
         uses: lukka/[email protected]
@@ -94,7 +94,7 @@ jobs:
         run: ctest -V -C Release
 
       - name: Upload test results
-        uses: actions/upload-artifact@v2
+        uses: actions/upload-artifact@0b7f8abb1508181956e8e162db84b466c27e18ce #v3.1.2
         if: failure()
         with:
             name: test_results_xml

.github/workflows/codeql.yml

@@ -16,22 +16,18 @@ jobs:
 
     strategy:
       fail-fast: false
-      # matrix:
-        # Override automatic language detection by changing the below list
-        # Supported options are ['csharp', 'cpp', 'go', 'java', 'javascript', 'python']
-        # language: ['cpp', 'python']
-        # Learn more...
-        # https://docs.github.com/en/github/finding-security-vulnerabilities-and-errors-in-your-code/configuring-code-scanning#overriding-automatic-language-detection
+      matrix:
+        language: ['cpp', 'python']
 
     steps:
     - name: Checkout repository
-      uses: actions/checkout@ac593985615ec2ede58e132d2e21d2b1cbd6127c #v3.3.0
+      uses: actions/checkout@8e5e7e5ab8b370d6c329ec480221332ada57f0ab #v3.5.2
       with:
         fetch-depth: 2
 
     # Initializes the CodeQL tools for scanning.
     - name: Initialize CodeQL
-      uses: github/codeql-action/init@v1
+      uses: github/codeql-action/init@0225834cc549ee0ca93cb085b92954821a145866 #v2.3.5
       # with:
         # languages: ${{ matrix.language }}
         # If you wish to specify custom queries, you can do so here or in a config file.
@@ -45,4 +41,4 @@ jobs:
         script/build
 
     - name: Perform CodeQL Analysis
-      uses: github/codeql-action/analyze@v1
+      uses: github/codeql-action/analyze@0225834cc549ee0ca93cb085b92954821a145866 #v2.3.5

.github/workflows/fortify-on-demand-scan.yml

@@ -16,7 +16,7 @@ jobs:
     # Steps represent a sequence of tasks that will be executed as part of the job
     steps:
       # Checks-out your repository under $GITHUB_WORKSPACE, so your job can access it
-      - uses: actions/checkout@ac593985615ec2ede58e132d2e21d2b1cbd6127c #v3.3.0
+      - uses: actions/checkout@8e5e7e5ab8b370d6c329ec480221332ada57f0ab #v3.5.2
 
       - name: Fortify on Demand Scan
         # You may pin to the exact commit or the version.

.github/workflows/gh-actions-pr.yml

@@ -145,7 +145,7 @@ jobs:
 
     steps:
     - name: Checkout repository
-      uses: actions/checkout@ac593985615ec2ede58e132d2e21d2b1cbd6127c #v3.3.0
+      uses: actions/checkout@8e5e7e5ab8b370d6c329ec480221332ada57f0ab #v3.5.2
       with:
         fetch-depth: 2
         submodules: false
@@ -181,7 +181,7 @@ jobs:
     #   run: ctest -V
 
     - name: Upload test results
-      uses: actions/upload-artifact@v2
+      uses: actions/upload-artifact@0b7f8abb1508181956e8e162db84b466c27e18ce #v3.1.2
       if: failure()
       with:
         name: test_results_xml

.github/workflows/gh-actions-release.yml

@@ -159,7 +159,7 @@ jobs:
 
     steps:
     - name: Checkout repository
-      uses: actions/checkout@ac593985615ec2ede58e132d2e21d2b1cbd6127c #v3.3.0
+      uses: actions/checkout@8e5e7e5ab8b370d6c329ec480221332ada57f0ab #v3.5.2
       with:
         fetch-depth: 2
         submodules: false

.github/workflows/macos-ci.yml

@@ -11,6 +11,7 @@ jobs:
   build:
     name: Build
     runs-on: ${{ matrix.os }}
+    continue-on-error: true
 
     defaults:
       run:
@@ -20,7 +21,8 @@ jobs:
       fail-fast: false
       matrix:
         os:
-          - macos-10.15
+          - macos-11
+          - macos-12
         compiler:
           - clang
           - gcc
@@ -33,68 +35,64 @@ jobs:
 
     steps:
 
-    # The following dependencies are already present within macos-* images:
-    # - clang (llvm 12)
-    # - cmake
-    # - expat
-    # - gcc (9, 10, 11)
-    # - git
-    # - jpeg
-    # - libpng
-    # - libvorbis
-    # - python (3.8, 3.9)
-    - name: Install dependencies using homebrew
-      run: brew install boost-python3 gtk+3 gtkglext sdl
+      # The following dependencies are already present within macos-* images:
+      # - clang (llvm)
+      # - cmake
+      # - expat
+      # - gcc
+      # - git
+      # - jpeg
+      # - libpng
+      # - libvorbis
+      # - python
+      - name: Install dependencies using homebrew
+        run: brew install boost-python3 gtk+3 gtkglext sdl
 
-    # The following Apple-provided libraries are deprecated:
-    # * OpenGL as of MacOS 10.14
-    # * GLUT as of MacOS 10.9
-    - name: Optionally install homebrewed OpenGL and GLUT
-      if: ${{ matrix.homebrew-gl }}
-      run: |
-        brew install mesa mesa-glu freeglut
-        ln -s /usr/local/include/GL /usr/local/include/OpenGL
-        ln -s /usr/local/include/GL /usr/local/include/GLUT
-      # ln -s /usr/local/lib/libGL.dylib /usr/local/lib/libOpenGL.dylib
-      # find /usr/local/lib/ -iname '*gl*.dylib'
+      # The following Apple-provided libraries are deprecated:
+      # * OpenGL as of MacOS 10.14
+      # * GLUT as of MacOS 10.9
+      - name: Optionally install homebrewed OpenGL and GLUT
+        if: ${{ matrix.homebrew-gl }}
+        run: |
+          brew install mesa mesa-glu freeglut
+          ln -s /usr/local/include/GL /usr/local/include/OpenGL
+          ln -s /usr/local/include/GL /usr/local/include/GLUT
+        # ln -s /usr/local/lib/libGL.dylib /usr/local/lib/libOpenGL.dylib
+        # find /usr/local/lib/ -iname '*gl*.dylib'
 
-    # The Apple-provided OpenAL is deprecated as of MacOS 10.15
-    - name: Optionally install homebrewed OpenAL
-      if: ${{ matrix.homebrew-al }}
-      run: brew install openal-soft
+      # The Apple-provided OpenAL is deprecated as of MacOS 10.15
+      - name: Optionally install homebrewed OpenAL
+        if: ${{ matrix.homebrew-al }}
+        run: brew install openal-soft
 
-    - name: Checkout repository
-      uses: actions/checkout@ac593985615ec2ede58e132d2e21d2b1cbd6127c #v3.3.0
-      with:
-        # We must fetch at least the immediate parents so that if this is
-        # a pull request then we can checkout the head.
-        fetch-depth: 2
-        submodules: false
+      - name: Check out repository
+        uses: actions/checkout@8e5e7e5ab8b370d6c329ec480221332ada57f0ab #v3.5.2
+        with:
+          fetch-depth: 2
+          submodules: false
 
-    # Ensure PRs are built against the PR Head
-    # As opposed to the merge commit
-    - name: Conditionally relocate to PR HEAD
-      if: github.event.pull_request
-      run: git checkout HEAD^2
+      - name: Conditionally relocate to PR HEAD
+        if: github.event.pull_request
+        run: git checkout HEAD^2
 
-    - name: Build it
-      env:
-        MY_OS_NAME: macos
-        COMPILER:   ${{ matrix.compiler }}
-        FLAGS:      -DCMAKE_FIND_FRAMEWORK=LAST
-        OPENALDIR:  "/usr/local/opt/openal-soft"
-      run: script/cibuild $FLAGS
+      - name: Build it
+        env:
+          MY_OS_NAME: macos
+          COMPILER:   ${{ matrix.compiler }}
+          FLAGS:      -DCMAKE_FIND_FRAMEWORK=LAST
+          OPENALDIR:  "/usr/local/opt/openal-soft"
+        run: script/cibuild $FLAGS
 
-    - name: Test
-      working-directory: ${{github.workspace}}/build
-      env:
-        GTEST_OUTPUT: xml
-        GTEST_COLOR: 1
-      run: ctest -V
+      - name: Test
+        working-directory: ${{github.workspace}}/build
+        env:
+          GTEST_OUTPUT: xml
+          GTEST_COLOR: 1
+        run: ctest -V
 
-    - name: Upload test results
-      uses: actions/upload-artifact@v2
-      if: failure()
-      with:
-        name: test_results_xml
-        path: ${{github.workspace}}/build/test-results/**/*.xml
+      - name: Upload test results
+        uses: actions/upload-artifact@0b7f8abb1508181956e8e162db84b466c27e18ce #v3.1.2
+        if: failure()
+        with:
+          name: test_results_xml
+          path: ${{github.workspace}}/build/test-results/**/*.xml

.github/workflows/scorecards-analysis.yml

@@ -22,7 +22,7 @@ jobs:
 
     steps:
       - name: "Checkout code"
-        uses: actions/checkout@ec3a7ce113134d7a93b817d10a8272cb61118579 # v2.4.0
+        uses: actions/checkout@8e5e7e5ab8b370d6c329ec480221332ada57f0ab #v3.5.2
         with:
           persist-credentials: false
 
@@ -42,7 +42,7 @@ jobs:
 
       # Upload the results as artifacts (optional).
       - name: "Upload artifact"
-        uses: actions/upload-artifact@82c141cc518b40d92cc801eee768e7aafc9c2fa2 # v2.3.1
+        uses: actions/upload-artifact@0b7f8abb1508181956e8e162db84b466c27e18ce #v3.1.2
         with:
           name: SARIF file
           path: results.sarif

.gitignore

@@ -1,6 +1,8 @@
 bin/
 build/
 build-*/
+cmake-build/
+cmake-build-*/
 data/
 ext/
 *.pyc