|
56 | 56 | if: matrix.os == 'macos-latest' |
57 | 57 | run: | |
58 | 58 | brew update |
59 | | - brew install openssl@3 rustup-init pkg-config llvm create-dmg |
| 59 | + brew install openssl@3 rustup-init pkg-config llvm |
| 60 | + xcode-select --install |
60 | 61 | echo "OPENSSL_DIR=$(brew --prefix openssl@3)" >> $GITHUB_ENV |
61 | 62 | echo "OPENSSL_LIB_DIR=$(brew --prefix openssl@3)/lib" >> $GITHUB_ENV |
62 | 63 | echo "OPENSSL_INCLUDE_DIR=$(brew --prefix openssl@3)/include" >> $GITHUB_ENV |
@@ -113,31 +114,22 @@ jobs: |
113 | 114 | mv app/target/wix/*.msi artifacts/ |
114 | 115 | shell: bash |
115 | 116 |
|
116 | | - - name: Package macOS (.dmg) |
| 117 | + - name: Package macOS (.pkg) |
117 | 118 | if: matrix.package_type == 'mac' |
118 | 119 | run: | |
119 | | - cd app |
120 | | - cargo install cargo-bundle --force |
121 | | - cargo bundle --release --target ${{ matrix.target }} |
122 | | - cd .. |
| 120 | + mkdir -p ~/gitswift-installer/user/local/bin |
| 121 | + cp app/target/${{ matrix.target }}/release/gitswift ~/gitswift-installer/user/local/bin/ |
| 122 | + pkgbuild --identifier com.singhropar.gitswift --version 1.0 --install-location/ --root ~/gitswift-installer artifacts/gitswift.pkg |
123 | 123 | env: |
124 | 124 | BUNDLE_ID: com.singhropar.gitswift |
125 | 125 | BUNDLE_NAME: gitswift |
126 | | - MACOSX_DEPLOYMENT_TARGET: 10.12 |
| 126 | + MACOSX_DEPLOYMENT_TARGET: 11.0 |
127 | 127 | OPENSSL_DIR: ${{ env.OPENSSL_DIR }} |
128 | 128 | OPENSSL_LIB_DIR: ${{ env.OPENSSL_LIB_DIR }} |
129 | 129 | OPENSSL_INCLUDE_DIR: ${{ env.OPENSSL_INCLUDE_DIR }} |
130 | 130 | CC: ${{ env.CC }} |
131 | 131 | CXX: ${{ env.CXX }} |
132 | 132 |
|
133 | | - - name: Convert .app to .dmg |
134 | | - if: matrix.package_type == 'mac' |
135 | | - run: | |
136 | | - mkdir -p dist |
137 | | - create-dmg "app/target/aarch64-apple-darwin/release/bundle/osx/gitswift.app" "dist/" |
138 | | - mkdir -p artifacts |
139 | | - mv dist/*.dmg artifacts/ |
140 | | -
|
141 | 133 |
|
142 | 134 | - name: Upload Artifacts |
143 | 135 | uses: actions/upload-artifact@v4 |
|
0 commit comments