From 1bca76c7e9b8a2ba9110afec5328d14954db0445 Mon Sep 17 00:00:00 2001 From: Simon Grimme Date: Thu, 13 Oct 2022 18:08:03 +0200 Subject: [PATCH 01/11] Try to fix CI --- .github/workflows/release.yml | 2 +- pom.xml | 1 + 2 files changed, 2 insertions(+), 1 deletion(-) diff --git a/.github/workflows/release.yml b/.github/workflows/release.yml index 11002f4..689a162 100644 --- a/.github/workflows/release.yml +++ b/.github/workflows/release.yml @@ -42,7 +42,7 @@ jobs: git config user.name "GitHub Actions" - name: Maven Release - run: mvn release:prepare release:perform -B -s .maven_settings.xml -DreleaseVersion=${{ github.event.inputs.releaseVersion }} -DdevelopmentVersion=${{ github.event.inputs.developmentVersion }} + run: mvn release:prepare release:perform -B -s .maven_settings.xml -DreleaseVersion=${{ github.event.inputs.releaseVersion }} -DdevelopmentVersion=${{ github.event.inputs.developmentVersion }} -Darguments="-Dmaven.deploy.skip=true" env: GITHUB_ACTOR: ${{ github.actor }} GITHUB_TOKEN: ${{ github.token }} diff --git a/pom.xml b/pom.xml index 2a6ec46..fdf7593 100644 --- a/pom.xml +++ b/pom.xml @@ -37,6 +37,7 @@ 2.5.3 [ci skip] + v@{project.version} From 2015db04f9248129ae2d018d31298308abd8a092 Mon Sep 17 00:00:00 2001 From: Simon Grimme Date: Thu, 13 Oct 2022 18:15:53 +0200 Subject: [PATCH 02/11] Try to fix CI --- pom.xml | 4 ++++ 1 file changed, 4 insertions(+) diff --git a/pom.xml b/pom.xml index fdf7593..e000e39 100644 --- a/pom.xml +++ b/pom.xml @@ -38,6 +38,10 @@ [ci skip] v@{project.version} + + package.json + package-lock.json + From a6256aab206257b737d6213e08e454e5b9fd6f75 Mon Sep 17 00:00:00 2001 From: Simon Grimme Date: Thu, 13 Oct 2022 18:23:37 +0200 Subject: [PATCH 03/11] Try to fix CI --- pom.xml | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/pom.xml b/pom.xml index e000e39..61034e5 100644 --- a/pom.xml +++ b/pom.xml @@ -39,8 +39,8 @@ [ci skip] v@{project.version} - package.json - package-lock.json + frontend/package.json + frontend/package-lock.json From 4a2c0493428d4a579390aa44ccf467ee5e261850 Mon Sep 17 00:00:00 2001 From: GitHub Actions Date: Thu, 13 Oct 2022 16:27:28 +0000 Subject: [PATCH 04/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 61034e5..39ac9eb 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 e4039632d6ca64750c3c3d9b7de25cb9a27f5137 Mon Sep 17 00:00:00 2001 From: GitHub Actions Date: Thu, 13 Oct 2022 16:27:30 +0000 Subject: [PATCH 05/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 39ac9eb..61034e5 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 634abbf6fbdb02e6cc51d88b5686a7e4d6e8ae0d Mon Sep 17 00:00:00 2001 From: Simon Grimme Date: Thu, 13 Oct 2022 18:31:07 +0200 Subject: [PATCH 06/11] Try to fix CI --- .github/workflows/release.yml | 1 + pom.xml | 2 +- 2 files changed, 2 insertions(+), 1 deletion(-) diff --git a/.github/workflows/release.yml b/.github/workflows/release.yml index 689a162..d66b5cf 100644 --- a/.github/workflows/release.yml +++ b/.github/workflows/release.yml @@ -59,6 +59,7 @@ jobs: with: repo_token: ${{ github.token }} prerelease: false + automatic_release_tag: v${{ github.event.inputs.releaseVersion }} files: | LICENSE.md backend/target/gameyfin-*.jar diff --git a/pom.xml b/pom.xml index 61034e5..9bf1b4d 100644 --- a/pom.xml +++ b/pom.xml @@ -36,7 +36,7 @@ maven-release-plugin 2.5.3 - [ci skip] + [ci skip] v@{project.version} frontend/package.json From ba6b98de9b5513ad68a572c80a9dc823ad764b32 Mon Sep 17 00:00:00 2001 From: GitHub Actions Date: Thu, 13 Oct 2022 16:34:44 +0000 Subject: [PATCH 07/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 7b693ce8e7779348c98a3a08b2b989fb63f72c89 Mon Sep 17 00:00:00 2001 From: Simon Grimme Date: Thu, 13 Oct 2022 18:38:20 +0200 Subject: [PATCH 08/11] Try to fix CI --- .github/workflows/release.yml | 5 +---- 1 file changed, 1 insertion(+), 4 deletions(-) diff --git a/.github/workflows/release.yml b/.github/workflows/release.yml index d66b5cf..442acd8 100644 --- a/.github/workflows/release.yml +++ b/.github/workflows/release.yml @@ -33,16 +33,13 @@ jobs: distribution: 'temurin' cache: 'maven' - - name: Maven build - run: mvn --batch-mode --update-snapshots package -Dmaven.test.skip=true - - name: Configure Git User run: | git config user.email "actions@github.com" git config user.name "GitHub Actions" - name: Maven Release - run: mvn release:prepare release:perform -B -s .maven_settings.xml -DreleaseVersion=${{ github.event.inputs.releaseVersion }} -DdevelopmentVersion=${{ github.event.inputs.developmentVersion }} -Darguments="-Dmaven.deploy.skip=true" + run: mvn release:prepare release:perform -B -s .maven_settings.xml -DreleaseVersion=${{ github.event.inputs.releaseVersion }} -DdevelopmentVersion=${{ github.event.inputs.developmentVersion }} -Darguments="-Dmaven.deploy.skip=true -Dmaven.test.skip=true" env: GITHUB_ACTOR: ${{ github.actor }} GITHUB_TOKEN: ${{ github.token }} From 2e0cd6ed754505063f9e7ff460602655ef949aba Mon Sep 17 00:00:00 2001 From: Simon Grimme Date: Thu, 13 Oct 2022 18:42:34 +0200 Subject: [PATCH 09/11] Try to fix CI --- 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..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..6f0896a 100644 --- a/pom.xml +++ b/pom.xml @@ -4,7 +4,7 @@ de.grimsi gameyfin - 1.2.2 + 1.2.2-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 d05494a9eff071e3ff715ba33e3acb7b5fa18110 Mon Sep 17 00:00:00 2001 From: GitHub Actions Date: Thu, 13 Oct 2022 16:44:53 +0000 Subject: [PATCH 10/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 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 6f0896a..44d1762 100644 --- a/pom.xml +++ b/pom.xml @@ -4,7 +4,7 @@ de.grimsi gameyfin - 1.2.2-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 c159396995778bebf7308868a69dd4446e9fa26b Mon Sep 17 00:00:00 2001 From: GitHub Actions Date: Thu, 13 Oct 2022 16:44:55 +0000 Subject: [PATCH 11/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