diff --git a/.github/workflows/docker_build.yml b/.github/workflows/docker_build.yml deleted file mode 100644 index eab2ede3..00000000 --- a/.github/workflows/docker_build.yml +++ /dev/null @@ -1,101 +0,0 @@ -name: Build Containers -on: - push: - tags: - - 'v*' - -jobs: - build-client: - runs-on: ubuntu-latest - steps: - - - name: Checkout - uses: actions/checkout@v4 - - - name: Docker meta - id: docker_meta - uses: docker/metadata-action@v5 - with: - images: | - ghcr.io/${{ github.repository }} - tags: | - type=ref,event=tag - labels: | - org.opencontainers.image.title=Hydrus Network - org.opencontainers.image.description=A personal booru-style media tagger that can import files and tags from your hard drive and popular websites. - org.opencontainers.image.vendor=hydrusnetwork - - - name: Set up QEMU - uses: docker/setup-qemu-action@v3 - - - name: Set up Docker Buildx - uses: docker/setup-buildx-action@v3 - - - name: Login to GHCR - if: github.event_name != 'pull_request' - uses: docker/login-action@v3 - with: - registry: ghcr.io - username: ${{ github.actor }} - password: ${{ secrets.GITHUB_TOKEN }} - - - name: Build - uses: docker/build-push-action@v5 - with: - context: . - push: ${{ github.event_name != 'pull_request' }} - file: ./static/build_files/docker/client/Dockerfile - platforms: linux/amd64,linux/386,linux/arm/v6,linux/arm/v7,linux/arm64 - tags: ${{ steps.docker_meta.outputs.tags }} - labels: ${{ steps.docker_meta.outputs.labels }} - cache-from: type=gha - cache-to: type=gha,mode=max - - build-server: - runs-on: ubuntu-latest - steps: - - - name: Checkout - uses: actions/checkout@v4 - - - name: Docker meta - id: docker_meta - uses: docker/metadata-action@v5 - with: - images: | - ghcr.io/${{ github.repository }} - tags: | - type=ref,event=tag,prefix=server- - type=raw,enable=true,prefix=,suffix=,value=server - flavor: | - latest=false - labels: | - org.opencontainers.image.title=Hydrus Network Server - org.opencontainers.image.description=A personal booru-style media tagger that can import files and tags from your hard drive and popular websites. - org.opencontainers.image.vendor=hydrusnetwork - - - name: Set up QEMU - uses: docker/setup-qemu-action@v3 - - - name: Set up Docker Buildx - uses: docker/setup-buildx-action@v3 - - - name: Login to GHCR - if: github.event_name != 'pull_request' - uses: docker/login-action@v3 - with: - registry: ghcr.io - username: ${{ github.actor }} - password: ${{ secrets.GITHUB_TOKEN }} - - - name: Build - uses: docker/build-push-action@v5 - with: - context: . - push: ${{ github.event_name != 'pull_request' }} - file: ./static/build_files/docker/server/Dockerfile - platforms: linux/amd64,linux/386,linux/arm/v6,linux/arm/v7,linux/arm64 - tags: ${{ steps.docker_meta.outputs.tags }} - labels: ${{ steps.docker_meta.outputs.labels }} - cache-from: type=gha - cache-to: type=gha,mode=max diff --git a/.github/workflows/release_linux.yml b/.github/workflows/release_linux.yml index a9b96e6a..865ec088 100644 --- a/.github/workflows/release_linux.yml +++ b/.github/workflows/release_linux.yml @@ -17,7 +17,7 @@ jobs: name: Setup Python uses: actions/setup-python@v5 with: - python-version: '3.10' + python-version: '3.11' architecture: x64 - name: APT Install diff --git a/.github/workflows/release_macos.yml b/.github/workflows/release_macos.yml index 46d57318..4f618d78 100644 --- a/.github/workflows/release_macos.yml +++ b/.github/workflows/release_macos.yml @@ -15,7 +15,7 @@ jobs: name: Setup Python uses: actions/setup-python@v5 with: - python-version: '3.10' + python-version: '3.11' - name: Build docs to /help run: | @@ -71,7 +71,7 @@ jobs: run: | cd $GITHUB_WORKSPACE temp_dmg="$(mktemp).dmg" - hdiutil create "$temp_dmg" -ov -volname "HydrusNetwork" -fs HFS+ -format UDZO -srcfolder "$GITHUB_WORKSPACE/build/$(head -n 1 triple.txt)/release" + hdiutil create "$temp_dmg" -ov -volname "HydrusNetwork" -fs HFS+ -format ULFO -srcfolder "$GITHUB_WORKSPACE/build/$(head -n 1 triple.txt)/release" mv "$temp_dmg" Hydrus.Network.${{ env.version_short }}.-.macOS.-.App.dmg - name: Upload Files diff --git a/.github/workflows/release_win.yml b/.github/workflows/release_win.yml index 52869697..cae0b9ff 100644 --- a/.github/workflows/release_win.yml +++ b/.github/workflows/release_win.yml @@ -17,7 +17,7 @@ jobs: name: Setup Python uses: actions/setup-python@v5 with: - python-version: '3.10' + python-version: '3.11' architecture: x64 - name: Pip Install diff --git a/static/build_files/linux/hydrus_client.spec b/static/build_files/linux/hydrus_client.spec index dc8a46bf..b4c70520 100644 --- a/static/build_files/linux/hydrus_client.spec +++ b/static/build_files/linux/hydrus_client.spec @@ -36,6 +36,7 @@ exe = EXE(pyz, [], exclude_binaries=True, name='hydrus_client', + contents_directory='.', debug=False, bootloader_ignore_signals=False, strip=False, diff --git a/static/build_files/linux/hydrus_server.spec b/static/build_files/linux/hydrus_server.spec index d8bec447..7b2b838e 100644 --- a/static/build_files/linux/hydrus_server.spec +++ b/static/build_files/linux/hydrus_server.spec @@ -22,6 +22,7 @@ exe = EXE(pyz, [], exclude_binaries=True, name='hydrus_server', + contents_directory='.', debug=False, bootloader_ignore_signals=False, strip=False, diff --git a/static/build_files/windows/hydrus_client.spec b/static/build_files/windows/hydrus_client.spec index c09b5a88..cc565886 100644 --- a/static/build_files/windows/hydrus_client.spec +++ b/static/build_files/windows/hydrus_client.spec @@ -41,6 +41,7 @@ exe = EXE(pyz, [], exclude_binaries=True, name='hydrus_client', + contents_directory='.', debug=False, bootloader_ignore_signals=False, strip=False, diff --git a/static/build_files/windows/hydrus_server.spec b/static/build_files/windows/hydrus_server.spec index 1fb207b2..3a564e2c 100644 --- a/static/build_files/windows/hydrus_server.spec +++ b/static/build_files/windows/hydrus_server.spec @@ -22,6 +22,7 @@ exe = EXE(pyz, [], exclude_binaries=True, name='hydrus_server', + contents_directory='.', debug=False, bootloader_ignore_signals=False, strip=False,