modbase merge

.github/workflows/build-matrix.yaml

@@ -3,42 +3,46 @@ name: Build
 on:
   push:
     branches:
-      - master
+      - main
   pull_request:
     branches:
-      - master
+      - main
   merge_group: {}
 
 jobs:
   # Windows
   build_windows_clang:
-    name: "🖥️ Windows"
+    name: "🖥️ Windows (Clang)"
     uses: ./.github/workflows/windows-build-clang.yaml
+    if: github.repository == 'OpenGOAL-Mods/OG-Mod-Base'
     with:
       cmakePreset: "Release-windows-clang"
       cachePrefix: ""
     secrets: inherit
 
   build_windows_msvc:
-    name: "🖥️ Windows"
+    name: "🖥️ Windows (MSVC)"
     uses: ./.github/workflows/windows-build-msvc.yaml
+    if: github.repository == 'OpenGOAL-Mods/OG-Mod-Base'
     with:
       cmakePreset: "Release-windows-msvc"
       cachePrefix: ""
     secrets: inherit
 
   # Linux
   build_linux_clang:
-    name: "🐧 Linux"
+    name: "🐧 Linux (Clang)"
     uses: ./.github/workflows/linux-build-clang.yaml
+    if: github.repository == 'OpenGOAL-Mods/OG-Mod-Base'
     with:
       cmakePreset: "Release-linux-clang-asan"
       cachePrefix: ""
     secrets: inherit
 
   build_linux_gcc:
-    name: "🐧 Linux"
+    name: "🐧 Linux (GCC)"
     uses: ./.github/workflows/linux-build-gcc.yaml
+    if: github.repository == 'OpenGOAL-Mods/OG-Mod-Base'
     with:
       cmakePreset: "Release-linux-gcc"
       cachePrefix: ""
@@ -48,11 +52,12 @@ jobs:
   build_macos_intel:
     name: "🍎 MacOS"
     uses: ./.github/workflows/macos-build.yaml
+    if: github.repository == 'OpenGOAL-Mods/OG-Mod-Base'
     with:
       cmakePreset: "Release-macos-clang"
       cachePrefix: ""
 
-  # Q4 2023 there will hopefully be native arm64 runners 
+  # Q4 2023 there will hopefully be native arm64 runners
   # https://github.com/github/roadmap/issues/528
   # build_macos_arm:
   #   name: "🍎 MacOS"

.github/workflows/compiler-output-check.yaml

@@ -0,0 +1,98 @@
+name: Compilation Check
+
+on:
+  pull_request:
+    branches:
+      - master
+
+jobs:
+  build:
+    name: Compare
+    runs-on: ubuntu-20.04
+    timeout-minutes: 60
+
+    steps:
+      - name: Checkout Repository
+        uses: actions/checkout@v4
+        with:
+          ref: master
+
+      - name: Install Package Dependencies
+        run: |
+          sudo apt update
+          sudo apt install build-essential cmake \
+            clang gcc g++ lcov make nasm libxrandr-dev \
+            libxinerama-dev libxcursor-dev libpulse-dev \
+            libxi-dev zip ninja-build libgl1-mesa-dev libssl-dev
+
+      - name: Setup sccache
+        uses: hendrikmuhs/[email protected]
+        with:
+          variant: sccache
+          key: linux-ubuntu-20.04--Release-linux-clang-asan-${{ github.sha }}
+          restore-keys: linux-ubuntu-20.04--Release-linux-clang-asan
+          max-size: 1000M
+
+      - name: CMake Generation (master)
+        env:
+          CC: clang
+          CXX: clang++
+        run: |
+          cmake -B build --preset=Release-linux-clang-asan \
+            -DCMAKE_C_COMPILER_LAUNCHER=sccache \
+            -DCMAKE_CXX_COMPILER_LAUNCHER=sccache
+
+      - name: Build goalc (master)
+        run: |
+          cmake --build build --parallel $((`nproc`)) --target goalc
+          mv ./build ./build.master
+
+      - name: Checkout PR
+        uses: actions/checkout@v4
+        with:
+          clean: "false"
+
+      - name: CMake Generation (PR)
+        env:
+          CC: clang
+          CXX: clang++
+        run: |
+          cmake -B build --preset=Release-linux-clang-asan \
+            -DCMAKE_C_COMPILER_LAUNCHER=sccache \
+            -DCMAKE_CXX_COMPILER_LAUNCHER=sccache
+
+      - name: Build goalc (PR)
+        run: cmake --build build --parallel $((`nproc`)) --target goalc
+
+      - name: Compile and preserve (master)
+        run: |
+          ./build.master/goalc/goalc --game jak1 --cmd "(make-group \"all-code\")"
+          ./build.master/goalc/goalc --game jak2 --cmd "(make-group \"all-code\")"
+          ./build.master/goalc/goalc --game jak3 --cmd "(make-group \"all-code\")"
+          mv ./out/jak1/obj ./out/jak1/obj.master
+          mv ./out/jak2/obj ./out/jak2/obj.master
+          mv ./out/jak3/obj ./out/jak3/obj.master
+
+      - name: Compile and preserve (PR)
+        run: |
+          ./build/goalc/goalc --game jak1 --cmd "(make-group \"all-code\")"
+          ./build/goalc/goalc --game jak2 --cmd "(make-group \"all-code\")"
+          ./build/goalc/goalc --game jak3 --cmd "(make-group \"all-code\")"
+          mv ./out/jak1/obj ./out/jak1/obj.pr
+          mv ./out/jak2/obj ./out/jak2/obj.pr
+          mv ./out/jak3/obj ./out/jak3/obj.pr
+
+      - name: Compare Results and Produce Report
+        run: |
+          ls -l ./out/jak1
+          ls -l ./out/jak2
+          ls -l ./out/jak3
+          set +e
+          python ./scripts/gsrc/compare-compilation-outputs.py --base "./out/jak1/obj.master,./out/jak2/obj.master,./out/jak3/obj.master" --compare "./out/jak1/obj.pr,./out/jak2/obj.pr,./out/jak3/obj.pr" --markdown
+          SCRIPT_EXIT_CODE=$?
+          cat ./comp-diff-report.md >> $GITHUB_STEP_SUMMARY
+          if [ "$SCRIPT_EXIT_CODE" -ne 0 ]; then
+            exit 1
+          fi
+
+

.github/workflows/cut-release.yaml

@@ -28,10 +28,7 @@ jobs:
       metadataAuthors: "bintendo42,barg"
       metadataTags: "speedrunning,challenge,gameplay-mod"
       metadataWebsiteUrl: "https://jakmods.dev/bugged/buglist.html"
-      skipMacOS: true
-      skipLinux: true
-      toolingBinaryDir: "out/build/Release/bin"
+      toolingRepo: "OpenGOAL-Mods/OG-Mod-Base"
       gameAssetsDir: "game/assets"
-      copyEntireBinaryDir: true
     secrets:
       token: ${{ secrets.GITHUB_TOKEN }}

.github/workflows/linux-build-clang.yaml

@@ -35,7 +35,7 @@ jobs:
             libudev-dev libopenal-dev libflac-dev libogg-dev libvorbis-dev
 
       - name: Setup sccache
-        uses: hendrikmuhs/[email protected].13
+        uses: hendrikmuhs/[email protected].14
         with:
           variant: sccache
           key: linux-ubuntu-20.04-${{ inputs.cachePrefix }}-${{ inputs.cmakePreset }}-${{ github.sha }}

.github/workflows/linux-build-gcc.yaml

@@ -34,7 +34,7 @@ jobs:
             sudo update-alternatives --set g++ /usr/bin/g++-10
 
       - name: Setup sccache
-        uses: hendrikmuhs/[email protected].13
+        uses: hendrikmuhs/[email protected].14
         with:
           variant: sccache
           key: linux-ubuntu-20.04-${{ inputs.cachePrefix }}-${{ inputs.cmakePreset }}-${{ github.sha }}
@@ -54,5 +54,5 @@ jobs:
       - name: Build Project
         run: cmake --build build --parallel $((`nproc`)) -- -w dupbuild=warn
 
-      - name: Run Tests
-        run: ./test.sh
+      # - name: Run Tests
+      #   run: ./test.sh

.github/workflows/macos-build-arm.yaml

@@ -27,7 +27,7 @@ jobs:
         run: arch -arm64 brew install cmake ninja
 
       - name: Setup sccache
-        uses: hendrikmuhs/[email protected].13
+        uses: hendrikmuhs/[email protected].14
         with:
           variant: sccache
           key: macos-12-${{ inputs.cachePrefix }}-${{ inputs.cmakePreset }}-${{ github.sha }}

.github/workflows/macos-build.yaml

@@ -28,7 +28,7 @@ jobs:
         run: brew install cmake nasm ninja
 
       - name: Setup sccache
-        uses: hendrikmuhs/[email protected].13
+        uses: hendrikmuhs/[email protected].14
         with:
           variant: sccache
           key: macos-12-${{ inputs.cachePrefix }}-${{ inputs.cmakePreset }}-${{ github.sha }}
@@ -47,8 +47,8 @@ jobs:
       - name: Build Project
         run: cmake --build build --parallel $((`sysctl -n hw.logicalcpu`))
 
-      - name: Run Tests
-        run: ./test.sh
+      # - name: Run Tests
+      #   run: ./test.sh
 
       - name: Prepare artifacts
         if: ${{ inputs.uploadArtifacts }}