diff --git a/.github/workflows/build.yml b/.github/workflows/build.yml index ab44344..91b1a4a 100644 --- a/.github/workflows/build.yml +++ b/.github/workflows/build.yml @@ -40,39 +40,6 @@ jobs: name: SavvyCAN-Linux_x64.AppImage path: SavvyCAN-*x86_64.AppImage - buildmacos86: - name: macOS x64 - runs-on: macos-15-intel - - steps: - - name: Prepare macOS Environment - run: | - brew install qt@5 - brew link qt@5 --force - - - name: Clone - uses: actions/checkout@v3 - - - name: Compile - run: | - qmake CONFIG+=release CONFIG+=sdk_no_version_check SavvyCAN.pro - make -j`sysctl kern.aioprocmax | awk '{print $2}'` - lrelease translations/*.ts - - - name: Package - run: | - mkdir -p SavvyCAN.app/Contents/MacOS/translations - mkdir -p SavvyCAN.app/Contents/MacOS/help - cp -R translations/*.qm SavvyCAN.app/Contents/MacOS/translations - cp -R help/* SavvyCAN.app/Contents/MacOS/help - macdeployqt SavvyCAN.app -dmg - mv SavvyCAN.dmg SavvyCAN_x64.dmg - - - uses: actions/upload-artifact@v4 - with: - name: SavvyCAN-macOS_x64.dmg - path: SavvyCAN_x64.dmg - buildmacos-arm64: name: macOS ARM64 runs-on: macos-15 @@ -160,7 +127,7 @@ jobs: pre-release: name: "pre-release" runs-on: "ubuntu-latest" - needs: [buildwindows, buildmacos86, buildmacos-arm64, buildlinux] + needs: [buildwindows, buildmacos-arm64, buildlinux] if: github.ref == 'refs/heads/master' steps: @@ -179,13 +146,12 @@ jobs: files: | SavvyCAN-Linux_x64.AppImage/SavvyCAN-*x86_64.AppImage SavvyCAN-Windows_x64_CIBuild.zip - SavvyCAN-macOS_x64.dmg/SavvyCAN_x64.dmg SavvyCAN-macOS_ARM64.dmg/SavvyCAN_arm64.dmg release: name: "release" runs-on: "ubuntu-latest" - needs: [buildwindows, buildmacos86, buildmacos-arm64, buildlinux] + needs: [buildwindows, buildmacos-arm64, buildlinux] if: startsWith(github.ref, 'refs/tags/') steps: @@ -204,5 +170,4 @@ jobs: files: | SavvyCAN-Linux_x64.AppImage/SavvyCAN-*x86_64.AppImage SavvyCAN-Windows_x64_CIBuild.zip - SavvyCAN-macOS_x64.dmg/SavvyCAN_x64.dmg SavvyCAN-macOS_ARM64.dmg/SavvyCAN_arm64.dmg