diff --git a/.github/workflows/build.yml b/.github/workflows/build.yml index 61feb833f..f3561b7dd 100644 --- a/.github/workflows/build.yml +++ b/.github/workflows/build.yml @@ -91,7 +91,8 @@ jobs: - name: Compile for all supported platforms run: | docker exec -t build /bin/bash -c "make cross-compile-windows" - docker exec -t build /bin/bash -c "make cross-compile-macos" + docker exec -t build /bin/bash -c "make cross-compile-macos-intel" + docker exec -t build /bin/bash -c "make cross-compile-macos-applesilicon" docker exec -t build /bin/bash -c "make cross-compile-linux" docker exec -t build /bin/bash -c "make cross-compile-linux-arm64v8" docker exec -t build /bin/bash -c "make cross-compile-linux-arm32v7" @@ -120,8 +121,8 @@ jobs: if: ${{ github.event_name == 'pull_request' && github.base_ref != 'refs/heads/develop' && github.base_ref != 'refs/heads/master'}} uses: actions/upload-artifact@v2 with: - name: Stash-macos.zip - path: dist/Stash-macos.zip + name: stash-macos-intel + path: dist/stash-macos-intel - name: Upload Linux binary # only upload binaries for pull requests @@ -144,7 +145,8 @@ jobs: automatic_release_tag: latest_develop title: "${{ env.STASH_VERSION }}: Latest development build" files: | - dist/Stash-macos.zip + dist/stash-macos-intel + dist/stash-macos-applesilicon dist/stash-win.exe dist/stash-linux dist/stash-linux-arm64v8 @@ -159,7 +161,8 @@ jobs: token: "${{ secrets.GITHUB_TOKEN }}" allow_override: true files: | - dist/Stash-macos.zip + dist/stash-macos-intel + dist/stash-macos-applesilicon dist/stash-win.exe dist/stash-linux dist/stash-linux-arm64v8 diff --git a/README.md b/README.md index a92bede52..998498ff4 100644 --- a/README.md +++ b/README.md @@ -22,13 +22,11 @@ For further information you can [read the in-app manual](ui/v2.5/src/docs/en). Windows | MacOS| Linux | Docker :---:|:---:|:---:|:---: -[Latest Release](https://github.com/stashapp/stash/releases/latest/download/stash-win.exe)
[Development Preview](https://github.com/stashapp/stash/releases/download/latest_develop/stash-win.exe) | [Latest Release](https://github.com/stashapp/stash/releases/latest/download/Stash-macos.zip)
[Development Preview](https://github.com/stashapp/stash/releases/download/latest_develop/Stash-macos.zip) | [Latest Release (amd64)](https://github.com/stashapp/stash/releases/latest/download/stash-linux)
[Development Preview (amd64)](https://github.com/stashapp/stash/releases/download/latest_develop/stash-linux)
[More Architectures...](https://github.com/stashapp/stash/releases/latest) | [Instructions](docker/production/README.md)
[Sample docker-compose.yml](docker/production/docker-compose.yml) +[Latest Release](https://github.com/stashapp/stash/releases/latest/download/stash-win.exe)
[Development Preview](https://github.com/stashapp/stash/releases/download/latest_develop/stash-win.exe) | [Latest Release (Apple Silicon)](https://github.com/stashapp/stash/releases/latest/download/stash-macos-applesilicon)
[Development Preview (Apple Silicon)](https://github.com/stashapp/stash/releases/download/latest_develop/stash-macos-applesilicon)
[Latest Release (Intel)](https://github.com/stashapp/stash/releases/latest/download/stash-macos-intel)
[Development Preview (Intel)](https://github.com/stashapp/stash/releases/download/latest_develop/stash-macos-intel) | [Latest Release (amd64)](https://github.com/stashapp/stash/releases/latest/download/stash-linux)
[Development Preview (amd64)](https://github.com/stashapp/stash/releases/download/latest_develop/stash-linux)
[More Architectures...](https://github.com/stashapp/stash/releases/latest) | [Instructions](docker/production/README.md)
[Sample docker-compose.yml](docker/production/docker-compose.yml) ## First Run #### Windows Users: Security Prompt Running the app might present a security prompt since the binary isn't yet signed. Bypass this by clicking "more info" and then the "run anyway" button. -#### macOS Users: Security Prompt -Running the app will present a security prompt since the binary isn't yet signed. Bypass this by right (ctrl) clicking on the app and hitting "Open", then "Open" in the next popup. #### FFMPEG Stash requires ffmpeg. If you don't have it installed, Stash will download a copy for you. It is recommended that Linux users install `ffmpeg` from their distro's package manager.