From ae83520b9479abbdf5db0c8edad0351c4b880703 Mon Sep 17 00:00:00 2001 From: Simon <9295182+grimsi@users.noreply.github.com> Date: Thu, 13 Oct 2022 23:43:01 +0200 Subject: [PATCH 01/11] Update release.yml --- .github/workflows/release.yml | 50 +++++++++++++++++++++++++++++++++++ 1 file changed, 50 insertions(+) diff --git a/.github/workflows/release.yml b/.github/workflows/release.yml index 442acd8..a3baa4f 100644 --- a/.github/workflows/release.yml +++ b/.github/workflows/release.yml @@ -61,3 +61,53 @@ jobs: LICENSE.md backend/target/gameyfin-*.jar config/gameyfin.properties + + - name: Docker meta + id: meta + uses: docker/metadata-action@v4 + with: + images: | + girmsi/gameyfin + tags: | + type=semver,pattern={{version}} + type=semver,pattern={{major}}.{{minor}} + type=semver,pattern={{major}} + + - name: Set up QEMU + uses: docker/setup-qemu-action@v2 + + - name: Set up Docker Buildx + uses: docker/setup-buildx-action@v2 + + - name: Cache Docker layers + uses: actions/cache@v3 + with: + path: /tmp/.buildx-cache + key: ${{ runner.os }}-buildx-${{ github.sha }} + restore-keys: | + ${{ runner.os }}-buildx- + + - name: Login to Docker Hub + uses: docker/login-action@v2 + with: + username: ${{ secrets.DOCKERHUB_USERNAME }} + password: ${{ secrets.DOCKERHUB_TOKEN }} + + - name: Build and push + uses: docker/build-push-action@v3 + with: + context: . + file: ./docker/Dockerfile + push: true + tags: ${{ steps.meta.outputs.tags }} + labels: ${{ steps.meta.outputs.labels }} + cache-from: type=local,src=/tmp/.buildx-cache + cache-to: type=local,dest=/tmp/.buildx-cache-new,mode=max + + - # Temp fix + # https://github.com/docker/build-push-action/issues/252 + # https://github.com/moby/buildkit/issues/1896 + name: Move Docker cache (temp fix) + run: | + rm -rf /tmp/.buildx-cache + mv /tmp/.buildx-cache-new /tmp/.buildx-cache From db2b59597af4ac80e8f4eec052b3cbe269f0face Mon Sep 17 00:00:00 2001 From: GitHub Actions Date: Thu, 13 Oct 2022 21:47:28 +0000 Subject: [PATCH 02/11] [ci skip]prepare release v1.2.2 --- backend/pom.xml | 2 +- frontend/pom.xml | 2 +- pom.xml | 4 ++-- 3 files changed, 4 insertions(+), 4 deletions(-) diff --git a/backend/pom.xml b/backend/pom.xml index e94de98..f8cea77 100644 --- a/backend/pom.xml +++ b/backend/pom.xml @@ -5,7 +5,7 @@ gameyfin de.grimsi - 1.2.3-SNAPSHOT + 1.2.2 gameyfin-backend diff --git a/frontend/pom.xml b/frontend/pom.xml index 1ac08a1..3edd174 100644 --- a/frontend/pom.xml +++ b/frontend/pom.xml @@ -3,7 +3,7 @@ gameyfin de.grimsi - 1.2.3-SNAPSHOT + 1.2.2 4.0.0 diff --git a/pom.xml b/pom.xml index 9bf1b4d..44d1762 100644 --- a/pom.xml +++ b/pom.xml @@ -4,7 +4,7 @@ de.grimsi gameyfin - 1.2.3-SNAPSHOT + 1.2.2 gameyfin gameyfin @@ -26,7 +26,7 @@ scm:git:https://github.com/grimsi/gameyfin.git scm:git:https://github.com/grimsi/gameyfin.git scm:git:https://github.com/grimsi/gameyfin.git - HEAD + v1.2.2 From 4278cdcb1775fef63fc5bdb47155ce647214ed14 Mon Sep 17 00:00:00 2001 From: GitHub Actions Date: Thu, 13 Oct 2022 21:47:30 +0000 Subject: [PATCH 03/11] [ci skip]prepare for next development iteration --- backend/pom.xml | 2 +- frontend/pom.xml | 2 +- pom.xml | 4 ++-- 3 files changed, 4 insertions(+), 4 deletions(-) diff --git a/backend/pom.xml b/backend/pom.xml index f8cea77..e94de98 100644 --- a/backend/pom.xml +++ b/backend/pom.xml @@ -5,7 +5,7 @@ gameyfin de.grimsi - 1.2.2 + 1.2.3-SNAPSHOT gameyfin-backend diff --git a/frontend/pom.xml b/frontend/pom.xml index 3edd174..1ac08a1 100644 --- a/frontend/pom.xml +++ b/frontend/pom.xml @@ -3,7 +3,7 @@ gameyfin de.grimsi - 1.2.2 + 1.2.3-SNAPSHOT 4.0.0 diff --git a/pom.xml b/pom.xml index 44d1762..9bf1b4d 100644 --- a/pom.xml +++ b/pom.xml @@ -4,7 +4,7 @@ de.grimsi gameyfin - 1.2.2 + 1.2.3-SNAPSHOT gameyfin gameyfin @@ -26,7 +26,7 @@ scm:git:https://github.com/grimsi/gameyfin.git scm:git:https://github.com/grimsi/gameyfin.git scm:git:https://github.com/grimsi/gameyfin.git - v1.2.2 + HEAD From 32202d6c63cbbb632a6077c0fcc2951352843dda Mon Sep 17 00:00:00 2001 From: Simon <9295182+grimsi@users.noreply.github.com> Date: Fri, 14 Oct 2022 00:00:33 +0200 Subject: [PATCH 04/11] Update release.yml --- .github/workflows/release.yml | 6 +++--- 1 file changed, 3 insertions(+), 3 deletions(-) diff --git a/.github/workflows/release.yml b/.github/workflows/release.yml index a3baa4f..b0205aa 100644 --- a/.github/workflows/release.yml +++ b/.github/workflows/release.yml @@ -69,9 +69,9 @@ jobs: images: | girmsi/gameyfin tags: | - type=semver,pattern={{version}} - type=semver,pattern={{major}}.{{minor}} - type=semver,pattern={{major}} + type=semver,pattern={{version}},value=${{ github.event.inputs.releaseVersion }} + type=semver,pattern={{major}}.{{minor}},value=${{ github.event.inputs.releaseVersion }} + type=semver,pattern={{major}},value=${{ github.event.inputs.releaseVersion }} - name: Set up QEMU uses: docker/setup-qemu-action@v2 From b5472f007081beefe917dc1a9ec97965089b2470 Mon Sep 17 00:00:00 2001 From: GitHub Actions Date: Thu, 13 Oct 2022 22:03:03 +0000 Subject: [PATCH 05/11] [ci skip]prepare release v1.2.2 --- backend/pom.xml | 2 +- frontend/pom.xml | 2 +- pom.xml | 4 ++-- 3 files changed, 4 insertions(+), 4 deletions(-) diff --git a/backend/pom.xml b/backend/pom.xml index e94de98..f8cea77 100644 --- a/backend/pom.xml +++ b/backend/pom.xml @@ -5,7 +5,7 @@ gameyfin de.grimsi - 1.2.3-SNAPSHOT + 1.2.2 gameyfin-backend diff --git a/frontend/pom.xml b/frontend/pom.xml index 1ac08a1..3edd174 100644 --- a/frontend/pom.xml +++ b/frontend/pom.xml @@ -3,7 +3,7 @@ gameyfin de.grimsi - 1.2.3-SNAPSHOT + 1.2.2 4.0.0 diff --git a/pom.xml b/pom.xml index 9bf1b4d..44d1762 100644 --- a/pom.xml +++ b/pom.xml @@ -4,7 +4,7 @@ de.grimsi gameyfin - 1.2.3-SNAPSHOT + 1.2.2 gameyfin gameyfin @@ -26,7 +26,7 @@ scm:git:https://github.com/grimsi/gameyfin.git scm:git:https://github.com/grimsi/gameyfin.git scm:git:https://github.com/grimsi/gameyfin.git - HEAD + v1.2.2 From 1970fdf0180ade12ee8220ce24b8d517f0451f00 Mon Sep 17 00:00:00 2001 From: GitHub Actions Date: Thu, 13 Oct 2022 22:03:04 +0000 Subject: [PATCH 06/11] [ci skip]prepare for next development iteration --- backend/pom.xml | 2 +- frontend/pom.xml | 2 +- pom.xml | 4 ++-- 3 files changed, 4 insertions(+), 4 deletions(-) diff --git a/backend/pom.xml b/backend/pom.xml index f8cea77..e94de98 100644 --- a/backend/pom.xml +++ b/backend/pom.xml @@ -5,7 +5,7 @@ gameyfin de.grimsi - 1.2.2 + 1.2.3-SNAPSHOT gameyfin-backend diff --git a/frontend/pom.xml b/frontend/pom.xml index 3edd174..1ac08a1 100644 --- a/frontend/pom.xml +++ b/frontend/pom.xml @@ -3,7 +3,7 @@ gameyfin de.grimsi - 1.2.2 + 1.2.3-SNAPSHOT 4.0.0 diff --git a/pom.xml b/pom.xml index 44d1762..9bf1b4d 100644 --- a/pom.xml +++ b/pom.xml @@ -4,7 +4,7 @@ de.grimsi gameyfin - 1.2.2 + 1.2.3-SNAPSHOT gameyfin gameyfin @@ -26,7 +26,7 @@ scm:git:https://github.com/grimsi/gameyfin.git scm:git:https://github.com/grimsi/gameyfin.git scm:git:https://github.com/grimsi/gameyfin.git - v1.2.2 + HEAD From 32acebbf2a1aa54ba5f7d5f1ede89767c5274e1a Mon Sep 17 00:00:00 2001 From: Simon <9295182+grimsi@users.noreply.github.com> Date: Fri, 14 Oct 2022 00:11:16 +0200 Subject: [PATCH 07/11] Fix typo --- .github/workflows/release.yml | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/.github/workflows/release.yml b/.github/workflows/release.yml index b0205aa..99d9ef3 100644 --- a/.github/workflows/release.yml +++ b/.github/workflows/release.yml @@ -67,7 +67,7 @@ jobs: uses: docker/metadata-action@v4 with: images: | - girmsi/gameyfin + grimsi/gameyfin tags: | type=semver,pattern={{version}},value=${{ github.event.inputs.releaseVersion }} type=semver,pattern={{major}}.{{minor}},value=${{ github.event.inputs.releaseVersion }} From 8bc7b04f5a33469d63b2959c5cfc639a95b2e1b8 Mon Sep 17 00:00:00 2001 From: GitHub Actions Date: Thu, 13 Oct 2022 22:13:28 +0000 Subject: [PATCH 08/11] [ci skip]prepare release v1.2.2 --- backend/pom.xml | 2 +- frontend/pom.xml | 2 +- pom.xml | 4 ++-- 3 files changed, 4 insertions(+), 4 deletions(-) diff --git a/backend/pom.xml b/backend/pom.xml index e94de98..f8cea77 100644 --- a/backend/pom.xml +++ b/backend/pom.xml @@ -5,7 +5,7 @@ gameyfin de.grimsi - 1.2.3-SNAPSHOT + 1.2.2 gameyfin-backend diff --git a/frontend/pom.xml b/frontend/pom.xml index 1ac08a1..3edd174 100644 --- a/frontend/pom.xml +++ b/frontend/pom.xml @@ -3,7 +3,7 @@ gameyfin de.grimsi - 1.2.3-SNAPSHOT + 1.2.2 4.0.0 diff --git a/pom.xml b/pom.xml index 9bf1b4d..44d1762 100644 --- a/pom.xml +++ b/pom.xml @@ -4,7 +4,7 @@ de.grimsi gameyfin - 1.2.3-SNAPSHOT + 1.2.2 gameyfin gameyfin @@ -26,7 +26,7 @@ scm:git:https://github.com/grimsi/gameyfin.git scm:git:https://github.com/grimsi/gameyfin.git scm:git:https://github.com/grimsi/gameyfin.git - HEAD + v1.2.2 From ff108c6d6aeba26eb0a0e33e894265eadfe294de Mon Sep 17 00:00:00 2001 From: Simon Grimme <9295182+grimsi@users.noreply.github.com> Date: Fri, 14 Oct 2022 00:20:41 +0200 Subject: [PATCH 09/11] Fix versions --- backend/pom.xml | 2 +- frontend/pom.xml | 2 +- pom.xml | 2 +- 3 files changed, 3 insertions(+), 3 deletions(-) diff --git a/backend/pom.xml b/backend/pom.xml index f8cea77..b13792a 100644 --- a/backend/pom.xml +++ b/backend/pom.xml @@ -5,7 +5,7 @@ gameyfin de.grimsi - 1.2.2 + 1.2.2-SNAPSHOT gameyfin-backend diff --git a/frontend/pom.xml b/frontend/pom.xml index 3edd174..b1331e0 100644 --- a/frontend/pom.xml +++ b/frontend/pom.xml @@ -3,7 +3,7 @@ gameyfin de.grimsi - 1.2.2 + 1.2.2-SNAPSHOT 4.0.0 diff --git a/pom.xml b/pom.xml index 44d1762..a4adc63 100644 --- a/pom.xml +++ b/pom.xml @@ -4,7 +4,7 @@ de.grimsi gameyfin - 1.2.2 + 1.2.2-SNAPSHOT gameyfin gameyfin From ac74d5e4d7350a955891150df02b06175a3b0dcf Mon Sep 17 00:00:00 2001 From: GitHub Actions Date: Thu, 13 Oct 2022 22:23:16 +0000 Subject: [PATCH 10/11] [ci skip]prepare release v1.2.2 --- backend/pom.xml | 2 +- frontend/pom.xml | 2 +- pom.xml | 2 +- 3 files changed, 3 insertions(+), 3 deletions(-) diff --git a/backend/pom.xml b/backend/pom.xml index b13792a..f8cea77 100644 --- a/backend/pom.xml +++ b/backend/pom.xml @@ -5,7 +5,7 @@ gameyfin de.grimsi - 1.2.2-SNAPSHOT + 1.2.2 gameyfin-backend diff --git a/frontend/pom.xml b/frontend/pom.xml index b1331e0..3edd174 100644 --- a/frontend/pom.xml +++ b/frontend/pom.xml @@ -3,7 +3,7 @@ gameyfin de.grimsi - 1.2.2-SNAPSHOT + 1.2.2 4.0.0 diff --git a/pom.xml b/pom.xml index a4adc63..44d1762 100644 --- a/pom.xml +++ b/pom.xml @@ -4,7 +4,7 @@ de.grimsi gameyfin - 1.2.2-SNAPSHOT + 1.2.2 gameyfin gameyfin From ad051dae6ebd960a5da2df154954287734c26128 Mon Sep 17 00:00:00 2001 From: GitHub Actions Date: Thu, 13 Oct 2022 22:23:17 +0000 Subject: [PATCH 11/11] [ci skip]prepare for next development iteration --- backend/pom.xml | 2 +- frontend/pom.xml | 2 +- pom.xml | 2 +- 3 files changed, 3 insertions(+), 3 deletions(-) diff --git a/backend/pom.xml b/backend/pom.xml index f8cea77..e94de98 100644 --- a/backend/pom.xml +++ b/backend/pom.xml @@ -5,7 +5,7 @@ gameyfin de.grimsi - 1.2.2 + 1.2.3-SNAPSHOT gameyfin-backend diff --git a/frontend/pom.xml b/frontend/pom.xml index 3edd174..1ac08a1 100644 --- a/frontend/pom.xml +++ b/frontend/pom.xml @@ -3,7 +3,7 @@ gameyfin de.grimsi - 1.2.2 + 1.2.3-SNAPSHOT 4.0.0 diff --git a/pom.xml b/pom.xml index 44d1762..8eced1d 100644 --- a/pom.xml +++ b/pom.xml @@ -4,7 +4,7 @@ de.grimsi gameyfin - 1.2.2 + 1.2.3-SNAPSHOT gameyfin gameyfin