testing x86 arch

savaughn · Oct 1, 2023 · abb89dd · abb89dd
1 parent 9228e69
commit abb89dd
Showing 1 changed file with 63 additions and 56 deletions.
diff --git a/.github/workflows/build-test.yml b/.github/workflows/build-test.yml
@@ -1,17 +1,57 @@
-name: Build and Test
+name: Build and Bundle macOS (x64 and arm64)
 
 on:
   push:
     branches:
       - main
 
 jobs:
-  build:
+  build_x64:
     runs-on: macos-latest
     strategy:
       matrix:
-        arch: [arm64]  # Specify the desired architectures here
+        arch: [x64]
+    steps:
+    - name: Checkout Code
+      uses: actions/checkout@v3
+
+    - name: Build pksav
+      run: |
+        cd deps/pksav/
+        mkdir build
+        cd build
+        cmake ..
+        make 
 
+    - name: Build raylib
+      run: |
+        cd deps/raylib/src/
+        make PLATFORM=PLATFORM_DESKTOP
+
+    - name: Build Project
+      run: |
+        make all
+
+    - name: Bundle Executable with Library
+      run: |
+        # Copy libpksav.dylib to the same directory as the executable
+        mkdir build_x64
+        cp deps/pksav/build/lib/libpksav.dylib build_x64/
+        
+        # Update the library path in the executable
+        install_name_tool -change /Users/runner/work/pokerom-trader/pokerom-trader/deps/pksav/build/lib/libpksav.dylib @executable_path/libpksav.dylib build_x64/pokeromtrader
+
+    - name: Publish Build Artifacts (x64)
+      uses: actions/upload-artifact@v3
+      with:
+        name: pokeromtrader-artifacts-x64  # Specify a name for your x64 artifacts
+        path: build_x64/  # Specify the directory containing your x64 build artifacts
+
+  build_arm64:
+    runs-on: macos-latest
+    strategy:
+      matrix:
+        arch: [arm64]
     steps:
     - name: Checkout Code
       uses: actions/checkout@v3
@@ -36,79 +76,46 @@ jobs:
     - name: Bundle Executable with Library
       run: |
         # Copy libpksav.dylib to the same directory as the executable
-        cp deps/pksav/build/lib/libpksav.dylib build/
+        mkdir build_arm64
+        cp deps/pksav/build/lib/libpksav.dylib build_arm64/
         
         # Update the library path in the executable
-        install_name_tool -change /Users/runner/work/pokerom-trader/pokerom-trader/deps/pksav/build/lib/libpksav.dylib @rpath/libpksav.dylib build/pokeromtrader
-        install_name_tool -add_rpath @executable_path/../Frameworks build/pokeromtrader
+        install_name_tool -change /Users/runner/work/pokerom-trader/pokerom-trader/deps/pksav/build/lib/libpksav.dylib @executable_path/libpksav.dylib build_arm64/pokeromtrader
 
-    - name: Publish Build Artifacts
+    - name: Publish Build Artifacts (arm64)
       uses: actions/upload-artifact@v3
       with:
-        name: pokeromtrader-artifacts  # Specify a name for your artifacts
-        path: build/  # Specify the directory containing your build artifacts
+        name: pokeromtrader-artifacts-arm64  # Specify a name for your arm64 artifacts
+        path: build_arm64/  # Specify the directory containing your arm64 build artifacts
 
   bundle_macos_release:
     runs-on: macos-latest
-    needs: build  # Ensure that the 'build' job is completed before this one starts
+    needs: [build_x64, build_arm64]  # Ensure that both the 'build_x64' and 'build_arm64' jobs are completed before this one starts
 
     steps:
     - name: Checkout Code
       uses: actions/checkout@v3
 
-    - name: Download Build Artifact
-      # Download the build artifact from the 'build' job
+    - name: Download Build Artifact (x64)
       uses: actions/download-artifact@v2
       with:
-        name: pokeromtrader-artifacts  # Specify the name of the build artifact
+        name: pokeromtrader-artifacts-x64  
 
-    - name: Bundle macOS Release
-      run: |
-        # You can access the downloaded artifact in the current directory
-        BUILD_DIR="build"
-        MACOS_DESTINATION="${BUILD_DIR}/macos/PokeromTrader.app/Contents/MacOS"
-        MACOS_FRAMEWORKS_DESTINATION="${BUILD_DIR}/macos/PokeromTrader.app/Contents/Frameworks"
-        APP_BUNDLE_EXECUTABLE="pokeromtrader"
-        APP_BUNDLE_ID="com.yourcompany.pokeromtrader"
-        APP_BUNDLE_NAME="PokeromTrader"
-        INFO_PLIST="${BUILD_DIR}/macos/PokeromTrader.app/Contents/Info.plist"
-        
-        # Create the build directory if it doesn't exist
-        mkdir -p "${BUILD_DIR}"
-        
-        # Create the directory structure
-        mkdir -p "${MACOS_DESTINATION}"
-        mkdir -p "${MACOS_FRAMEWORKS_DESTINATION}"
-        
-        # Copy the executable to the .app bundle
-        cp "${{ github.workspace }}/pokeromtrader" "${MACOS_DESTINATION}/pokeromtrader"
-        cp "${{ github.workspace }}/libpksav.dylib" "${MACOS_FRAMEWORKS_DESTINATION}/libpksav.dylib"
-        
-        # Create Info.plist file
-        echo '<?xml version="1.0" encoding="UTF-8"?>' > "${INFO_PLIST}"
-        echo '<!DOCTYPE plist PUBLIC "-//Apple Computer//DTD PLIST 1.0//EN" "http://www.apple.com/DTDs/PropertyList-1.0.dtd">' >> "${INFO_PLIST}"
-        echo '<plist version="1.0">' >> "${INFO_PLIST}"
-        echo '<dict>' >> "${INFO_PLIST}"
-        echo '    <key>CFBundleExecutable</key>' >> "${INFO_PLIST}"
-        echo "    <string>${APP_BUNDLE_EXECUTABLE}</string>" >> "${INFO_PLIST}"
-        echo '    <key>CFBundleIdentifier</key>' >> "${INFO_PLIST}"
-        echo "    <string>${APP_BUNDLE_ID}</string>" >> "${INFO_PLIST}"
-        echo '    <key>CFBundleName</key>' >> "${INFO_PLIST}"
-        echo "    <string>${APP_BUNDLE_NAME}</string>" >> "${INFO_PLIST}"
-        echo '</dict>' >> "${INFO_PLIST}"
-        echo '</plist>' >> "${INFO_PLIST}"
-        
-        echo "macOS release bundle created"
+    - name: Download Build Artifact (arm64)
+      uses: actions/download-artifact@v2
+      with:
+        name: pokeromtrader-artifacts-arm64  
 
-    - name: Make App Executable
-      run: |
-        chmod +x build/macos/PokeromTrader.app/Contents/MacOS/pokeromtrader
-      working-directory: ${{ github.workspace }}
+    - name: Upload macOS Release (x64)
+      uses: actions/upload-artifact@v2
+      with:
+        name: pokeromtrader-x64 
+        path: build_x86/macos 
 
-    - name: Upload macOS Release
+    - name: Upload macOS Release (arm64)
       uses: actions/upload-artifact@v2
       with:
-        name: pokeromtrader  # Specify a name for your macOS release
+        name: pokeromtrader-arm64
         path: build/macos 
 
     - name: Clean Up