mirror of
https://github.com/mwisnowski/mtg_python_deckbuilder.git
synced 2025-12-16 15:40:12 +01:00
chore(release): v2.2.9 misc land variety, land alternatives randomization, scroll flicker fix
This commit is contained in:
matt
parent
52457f6a25
commit
07a92eb47f
22 changed files with 889 additions and 248 deletions
77
.github/workflows/dockerhub-publish.yml
vendored
77
.github/workflows/dockerhub-publish.yml
vendored
|
|
@ -15,7 +15,6 @@ jobs:
|
|||
outputs:
|
||||
version: ${{ steps.notes.outputs.version }}
|
||||
desc: ${{ steps.notes.outputs.desc }}
|
||||
tags: ${{ steps.meta.outputs.tags }}
|
||||
labels: ${{ steps.meta.outputs.labels }}
|
||||
steps:
|
||||
- name: Checkout
|
||||
|
|
@ -38,14 +37,13 @@ jobs:
|
|||
echo "desc=$DESC" >> $GITHUB_OUTPUT
|
||||
echo "version=$VERSION_REF" >> $GITHUB_OUTPUT
|
||||
|
||||
- name: Extract Docker metadata
|
||||
- name: Extract Docker metadata (latest only)
|
||||
id: meta
|
||||
uses: docker/metadata-action@v5.8.0
|
||||
with:
|
||||
images: |
|
||||
mwisnowski/mtg-python-deckbuilder
|
||||
tags: |
|
||||
type=semver,pattern={{version}}
|
||||
type=raw,value=latest
|
||||
labels: |
|
||||
org.opencontainers.image.title=MTG Python Deckbuilder
|
||||
|
|
@ -65,18 +63,11 @@ jobs:
|
|||
- name: Checkout
|
||||
uses: actions/checkout@v5.0.0
|
||||
|
||||
- name: Prepare amd64 tag list
|
||||
id: arch_tags
|
||||
- name: Compute amd64 tag
|
||||
id: arch_tag
|
||||
shell: bash
|
||||
run: |
|
||||
echo "Generating amd64 tag variants" >&2
|
||||
TAGS='${{ needs.prepare.outputs.tags }}'
|
||||
# Exclude 'latest' so we don't leave latest-amd64 dangling; only final manifest will produce plain 'latest'
|
||||
echo "$TAGS" | grep -v ':latest$' | sed 's/$/-amd64/' | grep . > tags.txt
|
||||
echo "Computed tags:" >&2; cat tags.txt >&2
|
||||
echo "tags<<EOF" >> $GITHUB_OUTPUT
|
||||
cat tags.txt >> $GITHUB_OUTPUT
|
||||
echo "EOF" >> $GITHUB_OUTPUT
|
||||
echo "tag=mwisnowski/mtg-python-deckbuilder:${{ needs.prepare.outputs.version }}-amd64" >> $GITHUB_OUTPUT
|
||||
|
||||
- name: Docker Hub login
|
||||
uses: docker/login-action@v3.5.0
|
||||
|
|
@ -114,7 +105,7 @@ jobs:
|
|||
file: ./Dockerfile
|
||||
push: true
|
||||
platforms: linux/amd64
|
||||
tags: ${{ steps.arch_tags.outputs.tags }}
|
||||
tags: ${{ steps.arch_tag.outputs.tag }}
|
||||
labels: ${{ needs.prepare.outputs.labels }}
|
||||
build-args: |
|
||||
APP_VERSION=${{ needs.prepare.outputs.version }}
|
||||
|
|
@ -129,17 +120,11 @@ jobs:
|
|||
- name: Checkout
|
||||
uses: actions/checkout@v5.0.0
|
||||
|
||||
- name: Prepare arm64 tag list (fallback)
|
||||
id: arch_tags
|
||||
- name: Compute arm64 tag
|
||||
id: arch_tag
|
||||
shell: bash
|
||||
run: |
|
||||
echo "Generating arm64 tag variants (fallback)" >&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 "tags<<EOF" >> $GITHUB_OUTPUT
|
||||
cat tags.txt >> $GITHUB_OUTPUT
|
||||
echo "EOF" >> $GITHUB_OUTPUT
|
||||
echo "tag=mwisnowski/mtg-python-deckbuilder:${{ needs.prepare.outputs.version }}-arm64" >> $GITHUB_OUTPUT
|
||||
|
||||
- name: Docker Hub login
|
||||
uses: docker/login-action@v3.5.0
|
||||
|
|
@ -153,20 +138,20 @@ jobs:
|
|||
- name: Set up Buildx
|
||||
uses: docker/setup-buildx-action@v3.11.1
|
||||
|
||||
- name: Build & push arch image (arm64 emulated)
|
||||
- name: Build & push arch image (arm64)
|
||||
uses: docker/build-push-action@v6.18.0
|
||||
with:
|
||||
context: .
|
||||
file: ./Dockerfile
|
||||
push: true
|
||||
platforms: linux/arm64
|
||||
tags: ${{ steps.arch_tags.outputs.tags }}
|
||||
tags: ${{ steps.arch_tag.outputs.tag }}
|
||||
labels: ${{ needs.prepare.outputs.labels }}
|
||||
build-args: |
|
||||
APP_VERSION=${{ needs.prepare.outputs.version }}
|
||||
|
||||
manifest:
|
||||
name: Create multi-arch manifests
|
||||
name: Create latest multi-arch manifest
|
||||
runs-on: ubuntu-latest
|
||||
needs: [prepare, build_amd64, build_arm64]
|
||||
steps:
|
||||
|
|
@ -175,36 +160,16 @@ jobs:
|
|||
with:
|
||||
username: ${{ secrets.DOCKERHUB_USERNAME }}
|
||||
password: ${{ secrets.DOCKERHUB_TOKEN }}
|
||||
|
||||
- name: Create & push manifests
|
||||
- name: Create & push latest multi-arch manifest
|
||||
shell: bash
|
||||
env:
|
||||
TAGS: ${{ needs.prepare.outputs.tags }}
|
||||
run: |
|
||||
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
|
||||
echo "Processing $tag"
|
||||
# For 'latest', reuse the version tag's arch images (we did not push latest-amd64/-arm64)
|
||||
if [[ "$tag" == *":latest" ]]; then
|
||||
BASE="$VERSION_PRIMARY"
|
||||
else
|
||||
BASE="$tag"
|
||||
fi
|
||||
SOURCES="${BASE}-amd64"
|
||||
if docker buildx imagetools inspect "${BASE}-arm64" >/dev/null 2>&1; then
|
||||
echo "Found arm64 image tag: ${BASE}-arm64"
|
||||
SOURCES="$SOURCES ${BASE}-arm64"
|
||||
else
|
||||
echo "No arm64 image found for $tag (skipping arm64 in manifest)" >&2
|
||||
fi
|
||||
docker buildx imagetools create -t "$tag" $SOURCES
|
||||
done
|
||||
echo "Done."
|
||||
|
||||
- name: Inspect primary tag
|
||||
run: |
|
||||
FIRST=$(echo "$TAGS" | head -n1)
|
||||
docker buildx imagetools inspect "$FIRST"
|
||||
set -euo pipefail
|
||||
VERSION='${{ needs.prepare.outputs.version }}'
|
||||
AMD_TAG="mwisnowski/mtg-python-deckbuilder:${VERSION}-amd64"
|
||||
ARM_TAG="mwisnowski/mtg-python-deckbuilder:${VERSION}-arm64"
|
||||
echo "Creating manifest: latest -> ${AMD_TAG} + ${ARM_TAG}"
|
||||
SOURCES="$AMD_TAG $ARM_TAG"
|
||||
docker buildx imagetools create -t mwisnowski/mtg-python-deckbuilder:latest $SOURCES
|
||||
echo "Inspecting latest"
|
||||
docker buildx imagetools inspect mwisnowski/mtg-python-deckbuilder:latest
|
||||
|
||||
|
|
|
|||
Loading…
Add table
Add a link
Reference in a new issue