diff --git a/.github/workflows/desktop-build.yml b/.github/workflows/desktop-build.yml index d11334da82..edaef56bc9 100644 --- a/.github/workflows/desktop-build.yml +++ b/.github/workflows/desktop-build.yml @@ -44,9 +44,6 @@ jobs: - os: macos runner: macos-latest arch: amd64 - - os: macos - runner: macos-latest - arch: arm64 runs-on: ${{ matrix.runner }} continue-on-error: true steps: @@ -88,26 +85,8 @@ jobs: - name: Upload dmg uses: actions/upload-artifact@v3 - if: matrix.os == 'macos' && matrix.arch == 'amd64' + if: matrix.os == 'macos' with: name: teritori-${{ github.sha }}-${{ matrix.os }}-${{ matrix.arch }}-dmg path: electron/dist/artifacts/local/*.dmg if-no-files-found: error - - - name: Set up Homebrew - if: matrix.os == 'macos' && matrix.arch == 'arm64' - uses: Homebrew/actions/setup-homebrew@master - - - name: Extract and sign app - if: matrix.os == 'macos' && matrix.arch == 'arm64' - run: | - brew install create-dmg - make sign-macos-app - - - name: Upload signed dmg - uses: actions/upload-artifact@v3 - if: matrix.os == 'macos' && matrix.arch == 'arm64' - with: - name: teritori-${{ github.sha }}-${{ matrix.os }}-${{ matrix.arch }}-dmg - path: Teritori.dmg - if-no-files-found: error diff --git a/.gitignore b/.gitignore index 49722ed2b2..36f6adb856 100644 --- a/.gitignore +++ b/.gitignore @@ -89,7 +89,3 @@ buck-out/ # eslint /.eslintcache - -# build -/volume -/Teritori.dmg diff --git a/Makefile b/Makefile index 88ca33126c..0e537c5060 100644 --- a/Makefile +++ b/Makefile @@ -305,23 +305,3 @@ build-electron-linux-amd64: cd ./electron && npm i cd ./electron && GOOS=linux GOARCH=amd64 $(GO) build -tags noNativeLogger -o ./build/linux ./prod.go cd ./electron && node ./builder/linux.js - -.PHONY: sign-macos-app -sign-macos-app: - rm -fr electron/dist/artifacts/local/signed - mkdir -p electron/dist/artifacts/local/signed - hdiutil attach $(wildcard electron/dist/artifacts/local/Teritori-*.dmg) -mountpoint ./volume - cp -r ./volume/Teritori.app electron/dist/artifacts/local/signed/Teritori.app - codesign -s - electron/dist/artifacts/local/signed/Teritori.app - create-dmg \ - --volname "Teritori" \ - --volicon "electron/dist/artifacts/local/signed/Teritori.app/Contents/Resources/icon.icns" \ - --window-pos 200 120 \ - --window-size 800 400 \ - --icon-size 100 \ - --icon "Application.app" 200 190 \ - --hide-extension "Application.app" \ - --app-drop-link 600 185 \ - --skip-jenkins \ - "Teritori.dmg" \ - "electron/dist/artifacts/local/signed"