diff --git a/.github/workflows/dockerhub-publish.yml b/.github/workflows/dockerhub-publish.yml index 57b8d34..00ae561 100644 --- a/.github/workflows/dockerhub-publish.yml +++ b/.github/workflows/dockerhub-publish.yml @@ -119,60 +119,10 @@ jobs: build-args: | APP_VERSION=${{ needs.prepare.outputs.version }} - build_arm64_native: - name: Build (arm64 native) - # Native ARM64 GitHub hosted runner; if unavailable replace with self-hosted label - runs-on: ubuntu-24.04-arm64 - needs: prepare - permissions: - contents: read - timeout-minutes: 10 - continue-on-error: true - steps: - - name: Checkout - uses: actions/checkout@v5.0.0 - - - name: Prepare arm64 tag list - id: arch_tags - shell: bash - run: | - echo "Generating arm64 tag variants (native)" >&2 - TAGS='${{ needs.prepare.outputs.tags }}' - # Exclude 'latest' so only final manifest produces plain 'latest' - echo "$TAGS" | grep -v ':latest$' | sed 's/$/-arm64/' | grep . > tags.txt - echo "Computed tags:" >&2; cat tags.txt >&2 - echo "tags<> $GITHUB_OUTPUT - cat tags.txt >> $GITHUB_OUTPUT - echo "EOF" >> $GITHUB_OUTPUT - - - name: Docker Hub login - uses: docker/login-action@v3.5.0 - with: - username: ${{ secrets.DOCKERHUB_USERNAME }} - password: ${{ secrets.DOCKERHUB_TOKEN }} - - - name: Set up Docker Buildx - uses: docker/setup-buildx-action@v3.11.1 - - - name: Build & push arch image (arm64 native) - id: build - uses: docker/build-push-action@v6.18.0 - with: - context: . - file: ./Dockerfile - push: true - platforms: linux/arm64 - tags: ${{ steps.arch_tags.outputs.tags }} - labels: ${{ needs.prepare.outputs.labels }} - build-args: | - APP_VERSION=${{ needs.prepare.outputs.version }} - - build_arm64_emulated: - name: Build (arm64 emulated fallback) + build_arm64: + name: Build (arm64) runs-on: ubuntu-latest - needs: [prepare, build_arm64_native] - # Run if native arm64 did NOT succeed (failure, cancelled, or skipped) - if: needs.build_arm64_native.result != 'success' + needs: prepare permissions: contents: read steps: @@ -218,7 +168,7 @@ jobs: manifest: name: Create multi-arch manifests runs-on: ubuntu-latest - needs: [prepare, build_amd64, build_arm64_native, build_arm64_emulated] + needs: [prepare, build_amd64, build_arm64] steps: - name: Docker Hub login uses: docker/login-action@v3.5.0 @@ -231,7 +181,7 @@ jobs: env: TAGS: ${{ needs.prepare.outputs.tags }} run: | - echo "Creating multi-arch manifests (native preferred, fallback if needed)..." + echo "Creating multi-arch manifests (amd64 + arm64)..." VERSION_PRIMARY=$(echo "$TAGS" | grep -v ':latest$' | head -n1) echo "$TAGS" | while read -r tag; do [ -z "$tag" ] && continue diff --git a/CHANGELOG.md b/CHANGELOG.md index 7aa566a..9604c08 100644 --- a/CHANGELOG.md +++ b/CHANGELOG.md @@ -21,6 +21,17 @@ This format follows Keep a Changelog principles and aims for Semantic Versioning ### Fixed - (placeholder) +## [2.2.8] - 2025-09-10 + +### Added +- (placeholder) + +### Changed +- (placeholder) + +### Fixed +- (placeholder) + ## [2.2.7] - 2025-09-10 ### Added diff --git a/docker-compose.yml b/docker-compose.yml index 39afc1d..79b5ca5 100644 --- a/docker-compose.yml +++ b/docker-compose.yml @@ -30,7 +30,7 @@ services: # Compliance/exports WEB_AUTO_ENFORCE: "0" # 1=auto-apply bracket enforcement and re-export - APP_VERSION: "v2.2.7" # Optional label shown in footer + APP_VERSION: "v2.2.8" # Optional label shown in footer # WEB_CUSTOM_EXPORT_BASE: "" # Optional custom export basename # Paths (optional overrides) diff --git a/dockerhub-docker-compose.yml b/dockerhub-docker-compose.yml index 5246750..9d898fd 100644 --- a/dockerhub-docker-compose.yml +++ b/dockerhub-docker-compose.yml @@ -32,7 +32,7 @@ services: # Compliance/exports WEB_AUTO_ENFORCE: "0" - APP_VERSION: "v2.2.7" + APP_VERSION: "v2.2.8" # WEB_CUSTOM_EXPORT_BASE: "" # Paths (optional overrides) diff --git a/pyproject.toml b/pyproject.toml index 0eb006c..ff5b3ea 100644 --- a/pyproject.toml +++ b/pyproject.toml @@ -1,10 +1,11 @@ [build-system] -requires = ["setuptools>=61.0", "wheel"] +# Bumped setuptools minimum to avoid older vulnerable releases; wheel bumped for newer build metadata support +requires = ["setuptools>=70.0.0", "wheel>=0.43.0"] build-backend = "setuptools.build_meta" [project] name = "mtg-deckbuilder" -version = "2.2.7" +version = "2.2.8" description = "A command-line tool for building and analyzing Magic: The Gathering decks" readme = "README.md" license = {file = "LICENSE"}