From a7f8cdca1aa471f738f468f6015186bd2f1dbf4f Mon Sep 17 00:00:00 2001
From: UnknownShadow200 <unknownshadow200@gmail.com>
Date: Sat, 10 Aug 2024 16:55:52 +1000
Subject: [PATCH] test

---
 .github/workflows/build_mac22.yml | 50 -------------------------------
 .github/workflows/build_mac32.yml | 17 ++++++-----
 2 files changed, 9 insertions(+), 58 deletions(-)
 delete mode 100644 .github/workflows/build_mac22.yml

diff --git a/.github/workflows/build_mac22.yml b/.github/workflows/build_mac22.yml
deleted file mode 100644
index 412d5da..0000000
--- a/.github/workflows/build_mac22.yml
+++ /dev/null
@@ -1,50 +0,0 @@
-name: Build latest (macOS 32 bit)
-on: [push]
-
-concurrency:
-  group: ${{ github.ref }}-mac32
-  cancel-in-progress: true
-
-jobs:
-  build:
-    if: github.ref_name == github.event.repository.default_branch
-    runs-on: ubuntu-latest
-    container:
-      image: ghcr.io/classicube/minimal-osxcross:latest
-      credentials:
-        username: UnknownShadow200
-        password: ${{ secrets.GHCR_ACCESS_KEY }}
-    steps:
-      - uses: actions/checkout@v4
-      - name: Compile 32 bit macOS builds
-        shell: bash
-        id: compile
-        env: 
-          COMMON_FLAGS: "-O1 -s -fno-stack-protector -fno-math-errno -Qn -fvisibility=hidden -rdynamic -DCC_BUILD_ICON"
-        run: |
-          LATEST_FLAG=-DCC_COMMIT_SHA=\"${GITHUB_SHA::9}\"
- 
-          cd src
-          PATH=$PATH:/usr/local/compiler/target/bin
-          i386-apple-darwin8-clang *.c Window_cocoa.m ${{ env.COMMON_FLAGS }} $LATEST_FLAG -o cc-mac32-gl1 -framework Cocoa -framework OpenGL -framework IOKit -lobjc -lgcc_s.1
-          i386-apple-darwin8-clang *.c Window_cocoa.m ${{ env.COMMON_FLAGS }} $LATEST_FLAG -DCC_GFX_BACKEND=CC_GFX_BACKEND_GL2 -o cc-mac32-gl2 -framework Cocoa -framework OpenGL -framework IOKit -lobjc -lgcc_s.1
-
-
-      - uses: ./.github/actions/notify_failure
-        if: ${{ always() && steps.compile.outcome == 'failure' }}
-        with:
-          NOTIFY_MESSAGE: 'Failed to compile 32 bit macOS build'
-          WEBHOOK_URL: '${{ secrets.WEBHOOK_URL }}'
-          
-          
-      - uses: ./.github/actions/upload_build
-        if: ${{ always() && steps.compile.outcome == 'success' }}
-        with:
-          SOURCE_FILE: 'src/cc-mac32-gl1'
-          DEST_NAME: 'ClassiCube-mac32-Intel'
-          
-      - uses: ./.github/actions/upload_build
-        if: ${{ always() && steps.compile.outcome == 'success' }}
-        with:
-          SOURCE_FILE: 'src/cc-mac32-gl2'
-          DEST_NAME: 'ClassiCube-mac32-Intel-ModernGL'
diff --git a/.github/workflows/build_mac32.yml b/.github/workflows/build_mac32.yml
index 02086e7..d732585 100644
--- a/.github/workflows/build_mac32.yml
+++ b/.github/workflows/build_mac32.yml
@@ -30,10 +30,10 @@ jobs:
           LATEST_FLAG=-DCC_COMMIT_SHA=\"${GITHUB_SHA::9}\"
  
           cd src
-          /usr/local/compiler/target/bin/i386-apple-darwin8-clang *.c Window_cocoa.m ${{ env.COMMON_FLAGS }} $LATEST_FLAG -o cc-mac32-gl1 -framework Cocoa -framework OpenGL -framework IOKit -lobjc -lgcc_s.1
-          /usr/local/compiler/target/bin/i386-apple-darwin8-clang *.c Window_cocoa.m ${{ env.COMMON_FLAGS }} $LATEST_FLAG -DCC_GFX_BACKEND=CC_GFX_BACKEND_GL2 -o cc-mac32-gl2 -framework Cocoa -framework OpenGL -framework IOKit -lobjc -lgcc_s.1
+          PATH=$PATH:/usr/local/compiler/target/bin
+          i386-apple-darwin8-clang *.c Window_cocoa.m ${{ env.COMMON_FLAGS }} $LATEST_FLAG -o cc-mac32-gl1 -framework Cocoa -framework OpenGL -framework IOKit -lobjc -static-libgcc
+          i386-apple-darwin8-clang *.c Window_cocoa.m ${{ env.COMMON_FLAGS }} $LATEST_FLAG -DCC_GFX_BACKEND=CC_GFX_BACKEND_GL2 -o cc-mac32-gl2 -framework Cocoa -framework OpenGL -framework IOKit -lobjc -static-libgcc
 
-/usr/local/compiler/ppc/target/bin/powerpc-apple-darwin9-base-gcc *.c Window_cocoa.m ${{ env.COMMON_FLAGS }} $LATEST_FLAG -o cc-mac32-ppc  -static-libgcc -static-libstdc++ -Wl,-no_compact_unwind -isystem /usr/local/compiler/ppc/target/SDK/MacOSX10.5.sdk -mmacosx-version-min=10.3.0 -m32 -framework Cocoa -framework OpenGL -framework IOKit -lobjc -lgcc_s.1
 
       - uses: ./.github/actions/notify_failure
         if: ${{ always() && steps.compile.outcome == 'failure' }}
@@ -46,16 +46,17 @@ jobs:
         if: ${{ always() && steps.compile.outcome == 'success' }}
         with:
           SOURCE_FILE: 'src/cc-mac32-gl1'
-          DEST_NAME: 'ClassiCube-mac32-Intel'
+          DEST_NAME: 'ClassiCube-mac32-OpenGL'
           
       - uses: ./.github/actions/upload_build
         if: ${{ always() && steps.compile.outcome == 'success' }}
         with:
           SOURCE_FILE: 'src/cc-mac32-gl2'
-          DEST_NAME: 'ClassiCube-mac32-Intel-ModernGL'
+          DEST_NAME: 'ClassiCube-mac32-ModernGL'
           
-      - uses: ./.github/actions/upload_build
+          
+      - uses: ./.github/actions/notify_success
         if: ${{ always() && steps.compile.outcome == 'success' }}
         with:
-          SOURCE_FILE: 'src/cc-mac32-ppc'
-          DEST_NAME: 'ClassiCube-mac32-PPC'
+          DESTINATION_URL: '${{ secrets.NOTIFY_URL }}'
+          WORKFLOW_NAME: 'mac32'
\ No newline at end of file