From 675d456f970a264c5dffe7093252090378a6f84e Mon Sep 17 00:00:00 2001 From: Thom van den Akker Date: Sat, 24 Aug 2024 19:21:23 +0200 Subject: [PATCH 01/70] Updates actions files for testing --- .github/workflows/build.yaml | 33 ++++++++++++++++++--------------- .github/workflows/release.yml | 21 +++++++-------------- 2 files changed, 25 insertions(+), 29 deletions(-) diff --git a/.github/workflows/build.yaml b/.github/workflows/build.yaml index e97360cb102..dcf314a749b 100644 --- a/.github/workflows/build.yaml +++ b/.github/workflows/build.yaml @@ -1,31 +1,34 @@ -name: Build and Test PRs or General Branches +name: Build and Pre-release on: pull_request: types: - - synchronize - opened - - ready_for_review - - reopened + - edited + - synchronize + - labeled + - unlabeled push: branches: - - 'feature/**' - - 'bugfix/**' - - 'hotfix/**' - - 'fix/**' - - 'features/**' + - "version/*" + - "release/*" + - "testing/*" workflow_dispatch: permissions: - contents: write + contents: read statuses: write packages: write jobs: - release: - uses: ldtteam/operapublicacreator/.github/workflows/gradle.build.yaml@ng7 + build: + uses: Thodor12/operapublicacreator/.github/workflows/gradle.build.yaml@port/gh_updates_ng7 + with: + java: 21 + secrets: inherit + pre-release: + uses: Thodor12/operapublicacreator/.github/workflows/gradle.prerelease.yaml@port/gh_updates_ng7 + if: github.event_name == 'pull_request' && github.event.pull_request.head.repo.full_name == github.repository && contains( github.event.pull_request.labels.*.name, 'Pre-release') with: java: 21 - secrets: - CROWDIN_API_KEY: ${{ secrets.CROWDIN_API_KEY }} - GRADLE_ENCRYPTION_KEY: ${{ secrets.GRADLE_ENCRYPTION_KEY }} \ No newline at end of file + secrets: inherit \ No newline at end of file diff --git a/.github/workflows/release.yml b/.github/workflows/release.yml index 4c5b568d783..0f7cd6ce450 100644 --- a/.github/workflows/release.yml +++ b/.github/workflows/release.yml @@ -2,11 +2,10 @@ name: Release on: push: - branches: [ - "version/*", - "release/*", - "testing/*", - ] + branches: + - "version/*" + - "release/*" + - "testing/*" permissions: contents: write @@ -14,14 +13,8 @@ permissions: jobs: release: - uses: ldtteam/operapublicacreator/.github/workflows/gradle.publish.yaml@ng7 + uses: Thodor12/operapublicacreator/.github/workflows/gradle.release.yaml@port/gh_updates_ng7 with: - java: 21 + java: 17 curse_release_type: ${{ contains(github.ref, 'release') && 'release' || 'beta' }} - secrets: - DISCORD_WEBHOOK: ${{ secrets.DISCORD_WEBHOOK }} - MAVEN_USER: ${{ secrets.MAVEN_USER }} - MAVEN_PASSWORD: ${{ secrets.MAVEN_PASSWORD }} - CROWDIN_API_KEY: ${{ secrets.CROWDIN_API_KEY }} - CURSE_API_KEY: ${{ secrets.CURSE_API_KEY }} - GRADLE_ENCRYPTION_KEY: ${{ secrets.GRADLE_ENCRYPTION_KEY }} \ No newline at end of file + secrets: inherit \ No newline at end of file From ae3236f361655d862de71ac18f6639b5f2a71c82 Mon Sep 17 00:00:00 2001 From: Thom van den Akker Date: Sat, 24 Aug 2024 19:25:42 +0200 Subject: [PATCH 02/70] Update build.gradle to reference correct OPC test branch --- build.gradle | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/build.gradle b/build.gradle index 9533ff9dfbc..ab4d312b419 100755 --- a/build.gradle +++ b/build.gradle @@ -2,7 +2,7 @@ plugins { id "org.sonarqube" version "3.0" } -apply from: 'https://raw.githubusercontent.com/ldtteam/OperaPublicaCreator/ng7/gradle/mod.gradle' +apply from: 'https://raw.githubusercontent.com/Thodor12/OperaPublicaCreator/gh_updates_ng7/gradle/mod.gradle' idea { module { From 8aa9aa2f3cde177f7f7ede59538119f818f0bc61 Mon Sep 17 00:00:00 2001 From: Thom van den Akker Date: Sat, 24 Aug 2024 19:28:25 +0200 Subject: [PATCH 03/70] Fix wrong path --- build.gradle | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/build.gradle b/build.gradle index ab4d312b419..7f01a73d2a8 100755 --- a/build.gradle +++ b/build.gradle @@ -2,7 +2,7 @@ plugins { id "org.sonarqube" version "3.0" } -apply from: 'https://raw.githubusercontent.com/Thodor12/OperaPublicaCreator/gh_updates_ng7/gradle/mod.gradle' +apply from: 'https://raw.githubusercontent.com/Thodor12/OperaPublicaCreator/port/gh_updates_ng7/gradle/mod.gradle' idea { module { From 79224cb89c629887847fff6eed5aa90afc611323 Mon Sep 17 00:00:00 2001 From: Thom van den Akker Date: Sat, 24 Aug 2024 19:32:25 +0200 Subject: [PATCH 04/70] Retry build From d84594f4a50e952254b6632be7308a528f60fde0 Mon Sep 17 00:00:00 2001 From: Thom van den Akker Date: Sat, 24 Aug 2024 19:39:10 +0200 Subject: [PATCH 05/70] Retry build From a31536cc33ea797436169ba1094f5719243168f4 Mon Sep 17 00:00:00 2001 From: Thom van den Akker Date: Sun, 25 Aug 2024 15:20:22 +0200 Subject: [PATCH 06/70] Test gradle props --- gradle.properties | 5 ++++- 1 file changed, 4 insertions(+), 1 deletion(-) diff --git a/gradle.properties b/gradle.properties index be36983659f..4119aa61c2d 100755 --- a/gradle.properties +++ b/gradle.properties @@ -1,5 +1,8 @@ org.gradle.jvmargs=-Xmx3G -org.gradle.daemon=false +org.gradle.daemon=true +org.gradle.parallel=true +org.gradle.caching=true +org.gradle.configuration-cache=true modId=minecolonies modGroup=com.ldtteam From 3ce24485d9f712018597f8a007ef650ebac06cde Mon Sep 17 00:00:00 2001 From: Thom van den Akker Date: Sun, 25 Aug 2024 15:23:32 +0200 Subject: [PATCH 07/70] Undo --- gradle.properties | 5 +---- 1 file changed, 1 insertion(+), 4 deletions(-) diff --git a/gradle.properties b/gradle.properties index 4119aa61c2d..be36983659f 100755 --- a/gradle.properties +++ b/gradle.properties @@ -1,8 +1,5 @@ org.gradle.jvmargs=-Xmx3G -org.gradle.daemon=true -org.gradle.parallel=true -org.gradle.caching=true -org.gradle.configuration-cache=true +org.gradle.daemon=false modId=minecolonies modGroup=com.ldtteam From fd6a7a9e368cf5497f8b8407c96e69cbcabf18b1 Mon Sep 17 00:00:00 2001 From: Thom van den Akker Date: Sun, 25 Aug 2024 16:41:50 +0200 Subject: [PATCH 08/70] Test gradle props --- gradle.properties | 5 ++++- gradle/wrapper/gradle-wrapper.properties | 2 +- 2 files changed, 5 insertions(+), 2 deletions(-) diff --git a/gradle.properties b/gradle.properties index be36983659f..4119aa61c2d 100755 --- a/gradle.properties +++ b/gradle.properties @@ -1,5 +1,8 @@ org.gradle.jvmargs=-Xmx3G -org.gradle.daemon=false +org.gradle.daemon=true +org.gradle.parallel=true +org.gradle.caching=true +org.gradle.configuration-cache=true modId=minecolonies modGroup=com.ldtteam diff --git a/gradle/wrapper/gradle-wrapper.properties b/gradle/wrapper/gradle-wrapper.properties index 9355b415575..09523c0e549 100644 --- a/gradle/wrapper/gradle-wrapper.properties +++ b/gradle/wrapper/gradle-wrapper.properties @@ -1,6 +1,6 @@ distributionBase=GRADLE_USER_HOME distributionPath=wrapper/dists -distributionUrl=https\://services.gradle.org/distributions/gradle-8.10-bin.zip +distributionUrl=https\://services.gradle.org/distributions/gradle-8.9-bin.zip networkTimeout=10000 validateDistributionUrl=true zipStoreBase=GRADLE_USER_HOME From 40e3c85e711d833392ad2e43d155bc67c0b1c727 Mon Sep 17 00:00:00 2001 From: Thom van den Akker Date: Sun, 25 Aug 2024 16:50:06 +0200 Subject: [PATCH 09/70] Retry build From 92e8acf2ee62bc842bd19878666f69ca4873175e Mon Sep 17 00:00:00 2001 From: Thom van den Akker Date: Sun, 25 Aug 2024 18:22:11 +0200 Subject: [PATCH 10/70] Set correct java version and undo gradle properties again --- .github/workflows/release.yml | 2 +- gradle.properties | 5 +---- gradle/wrapper/gradle-wrapper.properties | 2 +- 3 files changed, 3 insertions(+), 6 deletions(-) diff --git a/.github/workflows/release.yml b/.github/workflows/release.yml index 0f7cd6ce450..de3e2ef796d 100644 --- a/.github/workflows/release.yml +++ b/.github/workflows/release.yml @@ -15,6 +15,6 @@ jobs: release: uses: Thodor12/operapublicacreator/.github/workflows/gradle.release.yaml@port/gh_updates_ng7 with: - java: 17 + java: 21 curse_release_type: ${{ contains(github.ref, 'release') && 'release' || 'beta' }} secrets: inherit \ No newline at end of file diff --git a/gradle.properties b/gradle.properties index 4119aa61c2d..be36983659f 100755 --- a/gradle.properties +++ b/gradle.properties @@ -1,8 +1,5 @@ org.gradle.jvmargs=-Xmx3G -org.gradle.daemon=true -org.gradle.parallel=true -org.gradle.caching=true -org.gradle.configuration-cache=true +org.gradle.daemon=false modId=minecolonies modGroup=com.ldtteam diff --git a/gradle/wrapper/gradle-wrapper.properties b/gradle/wrapper/gradle-wrapper.properties index 09523c0e549..9355b415575 100644 --- a/gradle/wrapper/gradle-wrapper.properties +++ b/gradle/wrapper/gradle-wrapper.properties @@ -1,6 +1,6 @@ distributionBase=GRADLE_USER_HOME distributionPath=wrapper/dists -distributionUrl=https\://services.gradle.org/distributions/gradle-8.9-bin.zip +distributionUrl=https\://services.gradle.org/distributions/gradle-8.10-bin.zip networkTimeout=10000 validateDistributionUrl=true zipStoreBase=GRADLE_USER_HOME From 805def606984e78379b61389728b255eb580b3d0 Mon Sep 17 00:00:00 2001 From: Thom van den Akker Date: Sun, 25 Aug 2024 18:59:48 +0200 Subject: [PATCH 11/70] Retry build From eff0fad63746f26cbbaa5fad631a6fb634a1592c Mon Sep 17 00:00:00 2001 From: Thom van den Akker Date: Sun, 25 Aug 2024 19:23:49 +0200 Subject: [PATCH 12/70] Retry build From 002ed0f6157f2913bc7c9d76cf2c38885d5406fb Mon Sep 17 00:00:00 2001 From: Thom van den Akker Date: Sun, 25 Aug 2024 19:28:45 +0200 Subject: [PATCH 13/70] Retry build From 5c4076db0b63e6f20e0910ade6a0f26dd27e76c2 Mon Sep 17 00:00:00 2001 From: Thom van den Akker Date: Mon, 26 Aug 2024 22:18:53 +0200 Subject: [PATCH 14/70] Update --- .github/workflows/build.yaml | 4 ++-- .github/workflows/release.yml | 2 +- 2 files changed, 3 insertions(+), 3 deletions(-) diff --git a/.github/workflows/build.yaml b/.github/workflows/build.yaml index dcf314a749b..e303f880ac2 100644 --- a/.github/workflows/build.yaml +++ b/.github/workflows/build.yaml @@ -22,12 +22,12 @@ permissions: jobs: build: - uses: Thodor12/operapublicacreator/.github/workflows/gradle.build.yaml@port/gh_updates_ng7 + uses: ldtteam/operapublicacreator/.github/workflows/gradle.build.yaml@ng7 with: java: 21 secrets: inherit pre-release: - uses: Thodor12/operapublicacreator/.github/workflows/gradle.prerelease.yaml@port/gh_updates_ng7 + uses: ldtteam/operapublicacreator/.github/workflows/gradle.prerelease.yaml@ng7 if: github.event_name == 'pull_request' && github.event.pull_request.head.repo.full_name == github.repository && contains( github.event.pull_request.labels.*.name, 'Pre-release') with: java: 21 diff --git a/.github/workflows/release.yml b/.github/workflows/release.yml index de3e2ef796d..7235e118452 100644 --- a/.github/workflows/release.yml +++ b/.github/workflows/release.yml @@ -13,7 +13,7 @@ permissions: jobs: release: - uses: Thodor12/operapublicacreator/.github/workflows/gradle.release.yaml@port/gh_updates_ng7 + uses: ldtteam/operapublicacreator/.github/workflows/gradle.release.yaml@ng7 with: java: 21 curse_release_type: ${{ contains(github.ref, 'release') && 'release' || 'beta' }} From 4fd210b3b0c11e2942ab540656e8c6dc703ac26b Mon Sep 17 00:00:00 2001 From: Thom van den Akker Date: Mon, 26 Aug 2024 22:21:20 +0200 Subject: [PATCH 15/70] Fix OPC path --- build.gradle | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/build.gradle b/build.gradle index 7f01a73d2a8..9533ff9dfbc 100755 --- a/build.gradle +++ b/build.gradle @@ -2,7 +2,7 @@ plugins { id "org.sonarqube" version "3.0" } -apply from: 'https://raw.githubusercontent.com/Thodor12/OperaPublicaCreator/port/gh_updates_ng7/gradle/mod.gradle' +apply from: 'https://raw.githubusercontent.com/ldtteam/OperaPublicaCreator/ng7/gradle/mod.gradle' idea { module { From faa612235d1ed7864e4665b6d2765763a5c65467 Mon Sep 17 00:00:00 2001 From: Thom van den Akker Date: Tue, 27 Aug 2024 10:39:06 +0200 Subject: [PATCH 16/70] Oops --- .github/workflows/release.yml | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/.github/workflows/release.yml b/.github/workflows/release.yml index 7235e118452..913d9a0edae 100644 --- a/.github/workflows/release.yml +++ b/.github/workflows/release.yml @@ -13,8 +13,8 @@ permissions: jobs: release: - uses: ldtteam/operapublicacreator/.github/workflows/gradle.release.yaml@ng7 + uses: ldtteam/operapublicacreator/.github/workflows/gradle.publish.yaml@ng7 with: java: 21 curse_release_type: ${{ contains(github.ref, 'release') && 'release' || 'beta' }} - secrets: inherit \ No newline at end of file + secrets: inherit From ec914fe6411a0b24c031bac723a39ffb3ed2eb99 Mon Sep 17 00:00:00 2001 From: Thom van den Akker Date: Wed, 28 Aug 2024 18:36:23 +0200 Subject: [PATCH 17/70] Update build.yaml --- .github/workflows/build.yaml | 6 +++--- 1 file changed, 3 insertions(+), 3 deletions(-) diff --git a/.github/workflows/build.yaml b/.github/workflows/build.yaml index e303f880ac2..684a73247ba 100644 --- a/.github/workflows/build.yaml +++ b/.github/workflows/build.yaml @@ -22,13 +22,13 @@ permissions: jobs: build: - uses: ldtteam/operapublicacreator/.github/workflows/gradle.build.yaml@ng7 + uses: Thodor12/operapublicacreator/.github/workflows/gradle.build.yaml@fix/changelog-merging with: java: 21 secrets: inherit pre-release: - uses: ldtteam/operapublicacreator/.github/workflows/gradle.prerelease.yaml@ng7 + uses: Thodor12/operapublicacreator/.github/workflows/gradle.prerelease.yaml@fix/changelog-merging if: github.event_name == 'pull_request' && github.event.pull_request.head.repo.full_name == github.repository && contains( github.event.pull_request.labels.*.name, 'Pre-release') with: java: 21 - secrets: inherit \ No newline at end of file + secrets: inherit From 3a5a49b53173d598cc6cd2e2561eca72b61b12b7 Mon Sep 17 00:00:00 2001 From: Thom van den Akker Date: Wed, 28 Aug 2024 18:36:49 +0200 Subject: [PATCH 18/70] Update release.yml --- .github/workflows/release.yml | 3 ++- 1 file changed, 2 insertions(+), 1 deletion(-) diff --git a/.github/workflows/release.yml b/.github/workflows/release.yml index 913d9a0edae..583d2f0d62c 100644 --- a/.github/workflows/release.yml +++ b/.github/workflows/release.yml @@ -6,6 +6,7 @@ on: - "version/*" - "release/*" - "testing/*" + workflow_dispatch: permissions: contents: write @@ -13,7 +14,7 @@ permissions: jobs: release: - uses: ldtteam/operapublicacreator/.github/workflows/gradle.publish.yaml@ng7 + uses: Thodor12/operapublicacreator/.github/workflows/gradle.publish.yaml@fix/changelog-merging with: java: 21 curse_release_type: ${{ contains(github.ref, 'release') && 'release' || 'beta' }} From 4ff3135d50d74a097a892c79c1f6d13c2132bd51 Mon Sep 17 00:00:00 2001 From: Thom van den Akker Date: Wed, 28 Aug 2024 19:01:56 +0200 Subject: [PATCH 19/70] Update release.yml --- .github/workflows/release.yml | 1 + 1 file changed, 1 insertion(+) diff --git a/.github/workflows/release.yml b/.github/workflows/release.yml index 583d2f0d62c..7961d0a2529 100644 --- a/.github/workflows/release.yml +++ b/.github/workflows/release.yml @@ -18,4 +18,5 @@ jobs: with: java: 21 curse_release_type: ${{ contains(github.ref, 'release') && 'release' || 'beta' }} + gradle_tasks: assemble secrets: inherit From 7a62051a777f292eb75ec31c24e74c11fb7ca89e Mon Sep 17 00:00:00 2001 From: Thom van den Akker Date: Wed, 28 Aug 2024 19:03:29 +0200 Subject: [PATCH 20/70] Update release.yml --- .github/workflows/release.yml | 9 ++++++++- 1 file changed, 8 insertions(+), 1 deletion(-) diff --git a/.github/workflows/release.yml b/.github/workflows/release.yml index 7961d0a2529..a13a5d52cc2 100644 --- a/.github/workflows/release.yml +++ b/.github/workflows/release.yml @@ -1,12 +1,19 @@ name: Release on: + pull_request: + types: + - synchronize + - opened + - reopened + - edited + - labeled + - unlabeled push: branches: - "version/*" - "release/*" - "testing/*" - workflow_dispatch: permissions: contents: write From 2ff0f5cf4715ea27fdb4c1310293878d25af6df8 Mon Sep 17 00:00:00 2001 From: Thom van den Akker Date: Wed, 28 Aug 2024 19:05:20 +0200 Subject: [PATCH 21/70] Retry build From f480b78afd0120436c42939c641fa09ac7551a6b Mon Sep 17 00:00:00 2001 From: Thom van den Akker Date: Wed, 28 Aug 2024 19:06:56 +0200 Subject: [PATCH 22/70] Retry build From 9ae31b264591334538a9d755bf5362c7a70da45e Mon Sep 17 00:00:00 2001 From: Thom van den Akker Date: Wed, 28 Aug 2024 19:07:29 +0200 Subject: [PATCH 23/70] Retry build From 6eb59d7be312ad109da7a1bb5b9b2c342e8bd53d Mon Sep 17 00:00:00 2001 From: Thom van den Akker Date: Wed, 28 Aug 2024 19:09:40 +0200 Subject: [PATCH 24/70] Retry build From f1901e97fa7182155223ae46a275af60f0a528a7 Mon Sep 17 00:00:00 2001 From: Thom van den Akker Date: Wed, 28 Aug 2024 19:20:19 +0200 Subject: [PATCH 25/70] Retry build From 9d7a885be3e146705664d6476017b99c198e4b8a Mon Sep 17 00:00:00 2001 From: Thom van den Akker Date: Wed, 28 Aug 2024 19:21:05 +0200 Subject: [PATCH 26/70] Stop running build on PR --- .github/workflows/build.yaml | 14 +++++++------- 1 file changed, 7 insertions(+), 7 deletions(-) diff --git a/.github/workflows/build.yaml b/.github/workflows/build.yaml index 684a73247ba..655cac80601 100644 --- a/.github/workflows/build.yaml +++ b/.github/workflows/build.yaml @@ -1,13 +1,13 @@ name: Build and Pre-release on: - pull_request: - types: - - opened - - edited - - synchronize - - labeled - - unlabeled +# pull_request: +# types: +# - opened +# - edited +# - synchronize +# - labeled +# - unlabeled push: branches: - "version/*" From 0baf506b7df322da6ebd2549f56b7cc0866e5864 Mon Sep 17 00:00:00 2001 From: Thom van den Akker Date: Wed, 28 Aug 2024 19:24:40 +0200 Subject: [PATCH 27/70] Retry build From 41efab6be70a05c3fd4e68c970515b0f0ca33504 Mon Sep 17 00:00:00 2001 From: Thom van den Akker Date: Wed, 28 Aug 2024 19:54:14 +0200 Subject: [PATCH 28/70] Retry build From f9753a72e75034d4e022ddd1c305d34c83a09694 Mon Sep 17 00:00:00 2001 From: Thom van den Akker Date: Wed, 28 Aug 2024 20:19:53 +0200 Subject: [PATCH 29/70] Undo some changes --- .github/workflows/build.yaml | 14 +++++++------- .github/workflows/release.yml | 9 --------- 2 files changed, 7 insertions(+), 16 deletions(-) diff --git a/.github/workflows/build.yaml b/.github/workflows/build.yaml index 655cac80601..684a73247ba 100644 --- a/.github/workflows/build.yaml +++ b/.github/workflows/build.yaml @@ -1,13 +1,13 @@ name: Build and Pre-release on: -# pull_request: -# types: -# - opened -# - edited -# - synchronize -# - labeled -# - unlabeled + pull_request: + types: + - opened + - edited + - synchronize + - labeled + - unlabeled push: branches: - "version/*" diff --git a/.github/workflows/release.yml b/.github/workflows/release.yml index a13a5d52cc2..237b5f22d27 100644 --- a/.github/workflows/release.yml +++ b/.github/workflows/release.yml @@ -1,14 +1,6 @@ name: Release on: - pull_request: - types: - - synchronize - - opened - - reopened - - edited - - labeled - - unlabeled push: branches: - "version/*" @@ -25,5 +17,4 @@ jobs: with: java: 21 curse_release_type: ${{ contains(github.ref, 'release') && 'release' || 'beta' }} - gradle_tasks: assemble secrets: inherit From 6e9c55bb66d849a3c6f5e9cf328774986a9cfcf3 Mon Sep 17 00:00:00 2001 From: Thom van den Akker Date: Wed, 28 Aug 2024 21:23:26 +0200 Subject: [PATCH 30/70] Try another run --- .github/workflows/build.yaml | 14 +++++++------- .github/workflows/release.yml | 16 +++++++++++++++- 2 files changed, 22 insertions(+), 8 deletions(-) diff --git a/.github/workflows/build.yaml b/.github/workflows/build.yaml index 684a73247ba..655cac80601 100644 --- a/.github/workflows/build.yaml +++ b/.github/workflows/build.yaml @@ -1,13 +1,13 @@ name: Build and Pre-release on: - pull_request: - types: - - opened - - edited - - synchronize - - labeled - - unlabeled +# pull_request: +# types: +# - opened +# - edited +# - synchronize +# - labeled +# - unlabeled push: branches: - "version/*" diff --git a/.github/workflows/release.yml b/.github/workflows/release.yml index 237b5f22d27..5d121293063 100644 --- a/.github/workflows/release.yml +++ b/.github/workflows/release.yml @@ -1,6 +1,13 @@ name: Release on: + pull_request: + types: + - opened + - edited + - synchronize + - labeled + - unlabeled push: branches: - "version/*" @@ -17,4 +24,11 @@ jobs: with: java: 21 curse_release_type: ${{ contains(github.ref, 'release') && 'release' || 'beta' }} - secrets: inherit + gradle_tasks: assemble + secrets: + DISCORD_WEBHOOK: ${{ secrets.DISCORD_WEBHOOK }} + MAVEN_USER: ${{ secrets.MAVEN_USER }} + MAVEN_PASSWORD: ${{ secrets.MAVEN_PASSWORD }} + CURSE_API_KEY: ${{ secrets.CURSE_API_KEY }} + CROWDIN_API_KEY: ${{ secrets.CROWDIN_API_KEY }} + GRADLE_ENCRYPTION_KEY: ${{ secrets.GRADLE_ENCRYPTION_KEY }} \ No newline at end of file From 32e256a776ee2e305fc13d5466bb7e68b4d6460f Mon Sep 17 00:00:00 2001 From: Thom van den Akker Date: Wed, 28 Aug 2024 21:25:30 +0200 Subject: [PATCH 31/70] Add github token --- .github/workflows/release.yml | 3 ++- 1 file changed, 2 insertions(+), 1 deletion(-) diff --git a/.github/workflows/release.yml b/.github/workflows/release.yml index 5d121293063..37a7f63ac19 100644 --- a/.github/workflows/release.yml +++ b/.github/workflows/release.yml @@ -31,4 +31,5 @@ jobs: MAVEN_PASSWORD: ${{ secrets.MAVEN_PASSWORD }} CURSE_API_KEY: ${{ secrets.CURSE_API_KEY }} CROWDIN_API_KEY: ${{ secrets.CROWDIN_API_KEY }} - GRADLE_ENCRYPTION_KEY: ${{ secrets.GRADLE_ENCRYPTION_KEY }} \ No newline at end of file + GRADLE_ENCRYPTION_KEY: ${{ secrets.GRADLE_ENCRYPTION_KEY }} + GITHUB_TOKEN: ${{ secrets.GITHUB_TOKEN }} \ No newline at end of file From 07d31f22774e37090e96acc318d99731760d8049 Mon Sep 17 00:00:00 2001 From: Thom van den Akker Date: Wed, 28 Aug 2024 21:26:30 +0200 Subject: [PATCH 32/70] Retry build From e22ddfcbd58ba9525e5e8651828bdaf96055596c Mon Sep 17 00:00:00 2001 From: Thom van den Akker Date: Wed, 28 Aug 2024 21:27:58 +0200 Subject: [PATCH 33/70] Rename --- .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 37a7f63ac19..bc649ccd721 100644 --- a/.github/workflows/release.yml +++ b/.github/workflows/release.yml @@ -32,4 +32,4 @@ jobs: CURSE_API_KEY: ${{ secrets.CURSE_API_KEY }} CROWDIN_API_KEY: ${{ secrets.CROWDIN_API_KEY }} GRADLE_ENCRYPTION_KEY: ${{ secrets.GRADLE_ENCRYPTION_KEY }} - GITHUB_TOKEN: ${{ secrets.GITHUB_TOKEN }} \ No newline at end of file + GH_TOKEN: ${{ secrets.GITHUB_TOKEN }} \ No newline at end of file From d384070800dcef772230c52cf51617a7ba306f75 Mon Sep 17 00:00:00 2001 From: Thom van den Akker Date: Wed, 28 Aug 2024 21:39:09 +0200 Subject: [PATCH 34/70] Remove GH token --- .github/workflows/release.yml | 3 +-- 1 file changed, 1 insertion(+), 2 deletions(-) diff --git a/.github/workflows/release.yml b/.github/workflows/release.yml index bc649ccd721..5d121293063 100644 --- a/.github/workflows/release.yml +++ b/.github/workflows/release.yml @@ -31,5 +31,4 @@ jobs: MAVEN_PASSWORD: ${{ secrets.MAVEN_PASSWORD }} CURSE_API_KEY: ${{ secrets.CURSE_API_KEY }} CROWDIN_API_KEY: ${{ secrets.CROWDIN_API_KEY }} - GRADLE_ENCRYPTION_KEY: ${{ secrets.GRADLE_ENCRYPTION_KEY }} - GH_TOKEN: ${{ secrets.GITHUB_TOKEN }} \ No newline at end of file + GRADLE_ENCRYPTION_KEY: ${{ secrets.GRADLE_ENCRYPTION_KEY }} \ No newline at end of file From ef506b60139ff83a4ed602246a7b31a6ec2449c8 Mon Sep 17 00:00:00 2001 From: Thom van den Akker Date: Wed, 28 Aug 2024 21:57:30 +0200 Subject: [PATCH 35/70] Retry build From 99dda2b16c113de2065230ec2f43a3cb24293e9c Mon Sep 17 00:00:00 2001 From: Thom van den Akker Date: Wed, 28 Aug 2024 22:29:00 +0200 Subject: [PATCH 36/70] Retry build From 5fb844a09fccad5590c4bfe8b51e1626c7e57826 Mon Sep 17 00:00:00 2001 From: Thom van den Akker Date: Wed, 28 Aug 2024 22:31:10 +0200 Subject: [PATCH 37/70] Retry build From bfd7a359cfb6d6d23540c773321e1e6b4ce4e02e Mon Sep 17 00:00:00 2001 From: Thom van den Akker Date: Wed, 28 Aug 2024 22:44:35 +0200 Subject: [PATCH 38/70] Retry build From d05c59aae07df34c7144152116059ee7d6c54998 Mon Sep 17 00:00:00 2001 From: Thom van den Akker Date: Wed, 28 Aug 2024 22:45:43 +0200 Subject: [PATCH 39/70] Retry build From 4830735d15ae7a8c49c97d77756981c3997c8bcb Mon Sep 17 00:00:00 2001 From: Thom van den Akker Date: Wed, 28 Aug 2024 22:48:41 +0200 Subject: [PATCH 40/70] Retry build From 550fb388369b09653f29f84bcd226367f5cb5043 Mon Sep 17 00:00:00 2001 From: Thom van den Akker Date: Wed, 28 Aug 2024 23:00:53 +0200 Subject: [PATCH 41/70] Retry build From b8ebba74f42f021dc2aeaf06706c70c8811d03d6 Mon Sep 17 00:00:00 2001 From: Thom van den Akker Date: Wed, 28 Aug 2024 23:06:49 +0200 Subject: [PATCH 42/70] Retry build From e6c4a37db7cf98a8b38b8687db7630839de22d80 Mon Sep 17 00:00:00 2001 From: Thom van den Akker Date: Wed, 28 Aug 2024 23:08:48 +0200 Subject: [PATCH 43/70] Retry build From f6b1832255c72f2b8c320ce218b4dd499282fc96 Mon Sep 17 00:00:00 2001 From: Thom van den Akker Date: Wed, 28 Aug 2024 23:15:59 +0200 Subject: [PATCH 44/70] Retry build From eaebac78ab293e757985dc2d96dfb5f10828701d Mon Sep 17 00:00:00 2001 From: Thom van den Akker Date: Wed, 28 Aug 2024 23:20:07 +0200 Subject: [PATCH 45/70] Retry build From 0ea6ba08589bd9e920574f228fd859ae94c394a4 Mon Sep 17 00:00:00 2001 From: Thom van den Akker Date: Wed, 28 Aug 2024 23:30:48 +0200 Subject: [PATCH 46/70] Retry build From e40c5d2e9c15e50eba63e6dd1e7669f6187b60cd Mon Sep 17 00:00:00 2001 From: Thom van den Akker Date: Thu, 29 Aug 2024 09:08:30 +0200 Subject: [PATCH 47/70] Retry build From 354ef3c0dbfb15b10f8ee78d0c27d576ee00eda4 Mon Sep 17 00:00:00 2001 From: Thom van den Akker Date: Thu, 29 Aug 2024 09:36:26 +0200 Subject: [PATCH 48/70] Retry build From 042fea500568ecb5554a9b4db3ac1c1a61c710d6 Mon Sep 17 00:00:00 2001 From: Thom van den Akker Date: Thu, 29 Aug 2024 09:38:35 +0200 Subject: [PATCH 49/70] Retry build From a563716b1efe359b64f0cd8d988ef057c26a41f6 Mon Sep 17 00:00:00 2001 From: Thom van den Akker Date: Thu, 29 Aug 2024 09:51:20 +0200 Subject: [PATCH 50/70] Retry build From 1fa31805f331ae40acc4dc83d621f48213c9ef58 Mon Sep 17 00:00:00 2001 From: Thom van den Akker Date: Thu, 29 Aug 2024 09:57:41 +0200 Subject: [PATCH 51/70] Retry build From fc66c8d1ce3eaec8c0289c28d737c7b5cc893ac3 Mon Sep 17 00:00:00 2001 From: Thom van den Akker Date: Thu, 29 Aug 2024 10:08:31 +0200 Subject: [PATCH 52/70] Retry build From 3839b36d1b3b86b8b986ab8cc131ef7697f30d61 Mon Sep 17 00:00:00 2001 From: Thom van den Akker Date: Thu, 29 Aug 2024 10:12:31 +0200 Subject: [PATCH 53/70] Retry build From 7db4b6ba232fdeb50da88b96a1988657e02abe39 Mon Sep 17 00:00:00 2001 From: Thom van den Akker Date: Thu, 29 Aug 2024 11:00:45 +0200 Subject: [PATCH 54/70] Retry build From a4dd26d510e570d858b5a250cf9c502574be989b Mon Sep 17 00:00:00 2001 From: Thom van den Akker Date: Thu, 29 Aug 2024 11:02:43 +0200 Subject: [PATCH 55/70] Retry build From 198b5fa189c1da698672f328e92ae4c85e1b73d8 Mon Sep 17 00:00:00 2001 From: Thom van den Akker Date: Thu, 29 Aug 2024 11:04:11 +0200 Subject: [PATCH 56/70] Retry build (#10000) From b7bd5c4ce85b20d69e26950778533683c14dd6cd Mon Sep 17 00:00:00 2001 From: Thom van den Akker Date: Thu, 29 Aug 2024 11:08:03 +0200 Subject: [PATCH 57/70] Retry build From fb2266470f77efccacf0ec023a1d4434710f7243 Mon Sep 17 00:00:00 2001 From: Thom van den Akker Date: Thu, 29 Aug 2024 11:24:13 +0200 Subject: [PATCH 58/70] Undo changes to actions files --- .github/workflows/build.yaml | 23 +++++++++-------------- .github/workflows/release.yml | 7 ------- 2 files changed, 9 insertions(+), 21 deletions(-) diff --git a/.github/workflows/build.yaml b/.github/workflows/build.yaml index 655cac80601..d0b4e396515 100644 --- a/.github/workflows/build.yaml +++ b/.github/workflows/build.yaml @@ -1,18 +1,13 @@ name: Build and Pre-release on: -# pull_request: -# types: -# - opened -# - edited -# - synchronize -# - labeled -# - unlabeled - push: - branches: - - "version/*" - - "release/*" - - "testing/*" + pull_request: + types: + - opened + - edited + - synchronize + - labeled + - unlabeled workflow_dispatch: permissions: @@ -22,12 +17,12 @@ permissions: jobs: build: - uses: Thodor12/operapublicacreator/.github/workflows/gradle.build.yaml@fix/changelog-merging + uses: ldtteam/operapublicacreator/.github/workflows/gradle.build.yaml@ng7 with: java: 21 secrets: inherit pre-release: - uses: Thodor12/operapublicacreator/.github/workflows/gradle.prerelease.yaml@fix/changelog-merging + uses: ldtteam/operapublicacreator/.github/workflows/gradle.prerelease.yaml@ng7 if: github.event_name == 'pull_request' && github.event.pull_request.head.repo.full_name == github.repository && contains( github.event.pull_request.labels.*.name, 'Pre-release') with: java: 21 diff --git a/.github/workflows/release.yml b/.github/workflows/release.yml index 5d121293063..d84b14520c5 100644 --- a/.github/workflows/release.yml +++ b/.github/workflows/release.yml @@ -1,13 +1,6 @@ name: Release on: - pull_request: - types: - - opened - - edited - - synchronize - - labeled - - unlabeled push: branches: - "version/*" From fc8766386f562c383a6de53fd370557e920ba1cb Mon Sep 17 00:00:00 2001 From: Thom van den Akker Date: Fri, 30 Aug 2024 12:30:06 +0200 Subject: [PATCH 59/70] Undo changes to actions files --- .github/workflows/release.yml | 10 ++-------- 1 file changed, 2 insertions(+), 8 deletions(-) diff --git a/.github/workflows/release.yml b/.github/workflows/release.yml index d84b14520c5..5220b4f0146 100644 --- a/.github/workflows/release.yml +++ b/.github/workflows/release.yml @@ -13,15 +13,9 @@ permissions: jobs: release: - uses: Thodor12/operapublicacreator/.github/workflows/gradle.publish.yaml@fix/changelog-merging + uses: ldtteam/operapublicacreator/.github/workflows/gradle.publish.yaml@ng7 with: java: 21 curse_release_type: ${{ contains(github.ref, 'release') && 'release' || 'beta' }} gradle_tasks: assemble - secrets: - DISCORD_WEBHOOK: ${{ secrets.DISCORD_WEBHOOK }} - MAVEN_USER: ${{ secrets.MAVEN_USER }} - MAVEN_PASSWORD: ${{ secrets.MAVEN_PASSWORD }} - CURSE_API_KEY: ${{ secrets.CURSE_API_KEY }} - CROWDIN_API_KEY: ${{ secrets.CROWDIN_API_KEY }} - GRADLE_ENCRYPTION_KEY: ${{ secrets.GRADLE_ENCRYPTION_KEY }} \ No newline at end of file + secrets: inherit \ No newline at end of file From 51c5acc052c344a2dc78551d90f46ca9edc5d8b0 Mon Sep 17 00:00:00 2001 From: Thom van den Akker Date: Fri, 30 Aug 2024 12:30:33 +0200 Subject: [PATCH 60/70] Remove assemble --- .github/workflows/release.yml | 1 - 1 file changed, 1 deletion(-) diff --git a/.github/workflows/release.yml b/.github/workflows/release.yml index 5220b4f0146..5a56898700c 100644 --- a/.github/workflows/release.yml +++ b/.github/workflows/release.yml @@ -17,5 +17,4 @@ jobs: with: java: 21 curse_release_type: ${{ contains(github.ref, 'release') && 'release' || 'beta' }} - gradle_tasks: assemble secrets: inherit \ No newline at end of file From af0be331273a369bd0819ffbed1a6b22294c9b67 Mon Sep 17 00:00:00 2001 From: Thom van den Akker Date: Fri, 30 Aug 2024 21:23:56 +0200 Subject: [PATCH 61/70] Try with custom changelog --- .github/workflows/build.yaml | 14 +++++++------- .github/workflows/release.yml | 12 ++++++++++-- 2 files changed, 17 insertions(+), 9 deletions(-) diff --git a/.github/workflows/build.yaml b/.github/workflows/build.yaml index d0b4e396515..6cf0e1eb39c 100644 --- a/.github/workflows/build.yaml +++ b/.github/workflows/build.yaml @@ -1,13 +1,13 @@ name: Build and Pre-release on: - pull_request: - types: - - opened - - edited - - synchronize - - labeled - - unlabeled +# pull_request: +# types: +# - opened +# - edited +# - synchronize +# - labeled +# - unlabeled workflow_dispatch: permissions: diff --git a/.github/workflows/release.yml b/.github/workflows/release.yml index 5a56898700c..86249acf60b 100644 --- a/.github/workflows/release.yml +++ b/.github/workflows/release.yml @@ -6,6 +6,7 @@ on: - "version/*" - "release/*" - "testing/*" + workflow_dispatch: permissions: contents: write @@ -13,8 +14,15 @@ permissions: jobs: release: - uses: ldtteam/operapublicacreator/.github/workflows/gradle.publish.yaml@ng7 + uses: Thodor12/operapublicacreator/.github/workflows/gradle.publish.yaml@port/gh_updates_ng7 with: java: 21 curse_release_type: ${{ contains(github.ref, 'release') && 'release' || 'beta' }} - secrets: inherit \ No newline at end of file + gradle_tasks: assemble + secrets: + DISCORD_WEBHOOK: ${{ secrets.DISCORD_WEBHOOK }} + MAVEN_USER: ${{ secrets.MAVEN_USER }} + MAVEN_PASSWORD: ${{ secrets.MAVEN_PASSWORD }} + CURSE_API_KEY: ${{ secrets.CURSE_API_KEY }} + CROWDIN_API_KEY: ${{ secrets.CROWDIN_API_KEY }} + GRADLE_ENCRYPTION_KEY: ${{ secrets.GRADLE_ENCRYPTION_KEY }} \ No newline at end of file From 1660615f7054c4da7dde162fa61f28c5375040ec Mon Sep 17 00:00:00 2001 From: Thom van den Akker Date: Fri, 30 Aug 2024 21:25:29 +0200 Subject: [PATCH 62/70] PR, not dispatch --- .github/workflows/release.yml | 8 +++++++- 1 file changed, 7 insertions(+), 1 deletion(-) diff --git a/.github/workflows/release.yml b/.github/workflows/release.yml index 86249acf60b..65ab053e1dd 100644 --- a/.github/workflows/release.yml +++ b/.github/workflows/release.yml @@ -1,12 +1,18 @@ name: Release on: + pull_request: + types: + - opened + - edited + - synchronize + - labeled + - unlabeled push: branches: - "version/*" - "release/*" - "testing/*" - workflow_dispatch: permissions: contents: write From 861c2499e938b00a801844371d2a4858be1c7067 Mon Sep 17 00:00:00 2001 From: Thom van den Akker Date: Fri, 30 Aug 2024 21:27:29 +0200 Subject: [PATCH 63/70] Update --- .github/workflows/build.yaml | 12 ++++++------ .github/workflows/release.yaml | 14 +++++++++++++- 2 files changed, 19 insertions(+), 7 deletions(-) diff --git a/.github/workflows/build.yaml b/.github/workflows/build.yaml index f5effbb6221..8fa1e489051 100644 --- a/.github/workflows/build.yaml +++ b/.github/workflows/build.yaml @@ -1,12 +1,12 @@ name: Build and Pre-release on: - pull_request: - types: - - opened - - synchronize - - labeled - - unlabeled +# pull_request: +# types: +# - opened +# - synchronize +# - labeled +# - unlabeled workflow_dispatch: permissions: diff --git a/.github/workflows/release.yaml b/.github/workflows/release.yaml index 913d9a0edae..aa308e3a003 100644 --- a/.github/workflows/release.yaml +++ b/.github/workflows/release.yaml @@ -1,6 +1,12 @@ name: Release on: + pull_request: + types: + - opened + - synchronize + - labeled + - unlabeled push: branches: - "version/*" @@ -17,4 +23,10 @@ jobs: with: java: 21 curse_release_type: ${{ contains(github.ref, 'release') && 'release' || 'beta' }} - secrets: inherit + secrets: + DISCORD_WEBHOOK: ${{ secrets.DISCORD_WEBHOOK }} + MAVEN_USER: ${{ secrets.MAVEN_USER }} + MAVEN_PASSWORD: ${{ secrets.MAVEN_PASSWORD }} + CURSE_API_KEY: ${{ secrets.CURSE_API_KEY }} + CROWDIN_API_KEY: ${{ secrets.CROWDIN_API_KEY }} + GRADLE_ENCRYPTION_KEY: ${{ secrets.GRADLE_ENCRYPTION_KEY }} From 3d7b944f3caecba75ca4e1c25b6ab3960360ab4d Mon Sep 17 00:00:00 2001 From: Thom van den Akker Date: Fri, 30 Aug 2024 21:30:26 +0200 Subject: [PATCH 64/70] Use update branch --- .github/workflows/release.yaml | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/.github/workflows/release.yaml b/.github/workflows/release.yaml index aa308e3a003..6e65a0ce7eb 100644 --- a/.github/workflows/release.yaml +++ b/.github/workflows/release.yaml @@ -19,7 +19,7 @@ permissions: jobs: release: - uses: ldtteam/operapublicacreator/.github/workflows/gradle.publish.yaml@ng7 + uses: Thodor12/operapublicacreator/.github/workflows/gradle.publish.yaml@port/gh_updates_ng7 with: java: 21 curse_release_type: ${{ contains(github.ref, 'release') && 'release' || 'beta' }} From 2af57f0d58a38bb4dc02f5dcab214a597c8dc490 Mon Sep 17 00:00:00 2001 From: Thom van den Akker Date: Fri, 30 Aug 2024 21:31:11 +0200 Subject: [PATCH 65/70] Use update branch --- .github/workflows/release.yaml | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/.github/workflows/release.yaml b/.github/workflows/release.yaml index 6e65a0ce7eb..8964eeeddee 100644 --- a/.github/workflows/release.yaml +++ b/.github/workflows/release.yaml @@ -19,7 +19,7 @@ permissions: jobs: release: - uses: Thodor12/operapublicacreator/.github/workflows/gradle.publish.yaml@port/gh_updates_ng7 + uses: Thodor12/operapublicacreator/.github/workflows/gradle.publish.yaml@fix/changelog-merging with: java: 21 curse_release_type: ${{ contains(github.ref, 'release') && 'release' || 'beta' }} From 9f314773e6d0cd9a7974eefc8e51320a01a85b40 Mon Sep 17 00:00:00 2001 From: Thom van den Akker Date: Fri, 30 Aug 2024 21:39:37 +0200 Subject: [PATCH 66/70] Retry build From 323b7f9793f6f53dd5b08035c488d48f368cf8fd Mon Sep 17 00:00:00 2001 From: Thom van den Akker Date: Fri, 30 Aug 2024 21:46:31 +0200 Subject: [PATCH 67/70] Gotta learn to update OPC --- build.gradle | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/build.gradle b/build.gradle index e8165701a8f..a529664e605 100755 --- a/build.gradle +++ b/build.gradle @@ -2,4 +2,4 @@ plugins { id "org.sonarqube" version "3.0" } -apply from: 'https://raw.githubusercontent.com/ldtteam/OperaPublicaCreator/ng7/gradle/mod.gradle' \ No newline at end of file +apply from: 'https://raw.githubusercontent.com/Thodor12/OperaPublicaCreator/fix/changelog-merging/gradle/mod.gradle' \ No newline at end of file From 7cedb96cc2976f062b03bf64df8497dbda7f1104 Mon Sep 17 00:00:00 2001 From: Thom van den Akker Date: Fri, 30 Aug 2024 21:49:43 +0200 Subject: [PATCH 68/70] Assemble, not publish --- .github/workflows/release.yaml | 1 + 1 file changed, 1 insertion(+) diff --git a/.github/workflows/release.yaml b/.github/workflows/release.yaml index 8964eeeddee..71bdc691608 100644 --- a/.github/workflows/release.yaml +++ b/.github/workflows/release.yaml @@ -23,6 +23,7 @@ jobs: with: java: 21 curse_release_type: ${{ contains(github.ref, 'release') && 'release' || 'beta' }} + gradle_tasks: assemble secrets: DISCORD_WEBHOOK: ${{ secrets.DISCORD_WEBHOOK }} MAVEN_USER: ${{ secrets.MAVEN_USER }} From 101dc11044c70a5fab7b1c731b5c2684ee852ec0 Mon Sep 17 00:00:00 2001 From: Thom van den Akker Date: Fri, 30 Aug 2024 22:56:16 +0200 Subject: [PATCH 69/70] Retry build From b303387c0ac34a7c3aeb3faa122468cd4e1f77fd Mon Sep 17 00:00:00 2001 From: Thom van den Akker Date: Fri, 30 Aug 2024 22:59:26 +0200 Subject: [PATCH 70/70] Retry build