From ceb206289cfbe887920a48cd245bd5a7b41453a8 Mon Sep 17 00:00:00 2001 From: usbharu <64310155+usbharu@users.noreply.github.com> Date: Sat, 10 Aug 2024 12:18:52 +0900 Subject: [PATCH 01/32] chore: build-test --- .../workflows/pull-request-merge-check.yml | 2 + hideout-core/build.gradle.kts | 6 +-- owl/build.gradle.kts | 37 ++++++++++++++++++- owl/gradle.properties | 1 - 4 files changed, 41 insertions(+), 5 deletions(-) diff --git a/.github/workflows/pull-request-merge-check.yml b/.github/workflows/pull-request-merge-check.yml index 28b4cda4..71055387 100644 --- a/.github/workflows/pull-request-merge-check.yml +++ b/.github/workflows/pull-request-merge-check.yml @@ -2,6 +2,8 @@ name: PullRequest Merge Check on: pull_request: + paths-ignore: + - 'owl/**' branches: - "develop" types: diff --git a/hideout-core/build.gradle.kts b/hideout-core/build.gradle.kts index 0ef80aa8..2e0c34e4 100644 --- a/hideout-core/build.gradle.kts +++ b/hideout-core/build.gradle.kts @@ -82,8 +82,8 @@ dependencies { implementation(libs.bundles.ktor.client) implementation(libs.bundles.apache.tika) implementation(libs.bundles.openapi) - implementation(libs.bundles.owl.producer) - implementation(libs.bundles.owl.broker) +// implementation(libs.bundles.owl.producer) +// implementation(libs.bundles.owl.broker) implementation(libs.bundles.spring.boot.oauth2) implementation(libs.bundles.spring.boot.data.mongodb) implementation("org.springframework.boot:spring-boot-starter-actuator") @@ -104,7 +104,7 @@ dependencies { implementation(libs.flyway.core) runtimeOnly(libs.flyway.postgresql) - implementation("dev.usbharu:owl-common-serialize-jackson:0.0.1") +// implementation("dev.usbharu:owl-common-serialize-jackson:0.0.1") implementation(libs.javacv) { exclude(module = "opencv") diff --git a/owl/build.gradle.kts b/owl/build.gradle.kts index 94bf8763..39ef7e0a 100644 --- a/owl/build.gradle.kts +++ b/owl/build.gradle.kts @@ -1,5 +1,6 @@ plugins { alias(libs.plugins.kotlin.jvm) + id("maven-publish") } @@ -13,9 +14,19 @@ allprojects { } } +tasks { + create("publishMavenPublicationToMavenLocal") { + subprojects.forEach { dependsOn("${it.path}:publishMavenPublicationToMavenLocal") } + } + create("publishMavenPublicationToGiteaRepository") { + subprojects.forEach { dependsOn("${it.path}:publishMavenPublicationToGiteaRepository") } + } +} + subprojects { apply { plugin("org.jetbrains.kotlin.jvm") + plugin("maven-publish") } kotlin { jvmToolchain(21) @@ -28,10 +39,34 @@ subprojects { } - tasks.test { useJUnitPlatform() } + publishing { + repositories { + maven { + name = "Gitea" + url = uri("https://git.usbharu.dev/api/packages/usbharu/maven") + credentials(HttpHeaderCredentials::class.java) { + name = "Authorization" + value = "token " + (project.findProperty("gpr.gitea") as String? ?: System.getenv("GITEA")) + } + + authentication { + create("header") + } + } + } + + publications { + register("maven") { + groupId = "dev.usbharu" + artifactId = project.name + version = project.version.toString() + from(components["kotlin"]) + } + } + } } \ No newline at end of file diff --git a/owl/gradle.properties b/owl/gradle.properties index 1108ef87..50785165 100644 --- a/owl/gradle.properties +++ b/owl/gradle.properties @@ -2,6 +2,5 @@ kotlin.code.style=official org.gradle.daemon=true org.gradle.parallel=true org.gradle.configureondemand=true -#ksp.useKSP2=true org.gradle.configuration-cache=true org.gradle.configuration-cache.problems=warn \ No newline at end of file From 6062230e782cfc23dfb559f1b555911f284b8720 Mon Sep 17 00:00:00 2001 From: usbharu <64310155+usbharu@users.noreply.github.com> Date: Sat, 10 Aug 2024 13:53:10 +0900 Subject: [PATCH 02/32] chore: diff test --- .github/monorepo.json | 8 ++++ .github/workflows/master-publish-package.yaml | 39 +++++++++++++++++++ hideout-core/build.gradle.kts | 1 - 3 files changed, 47 insertions(+), 1 deletion(-) create mode 100644 .github/monorepo.json create mode 100644 .github/workflows/master-publish-package.yaml diff --git a/.github/monorepo.json b/.github/monorepo.json new file mode 100644 index 00000000..36313cce --- /dev/null +++ b/.github/monorepo.json @@ -0,0 +1,8 @@ +{ + "projects": { + "./hideout-activitypub": "hideout-activitypub", + "./hideout-core": "hideout-core", + "./hideout-mastodon": "hideout-mastodon", + "./owl": "owl" + } +} \ No newline at end of file diff --git a/.github/workflows/master-publish-package.yaml b/.github/workflows/master-publish-package.yaml new file mode 100644 index 00000000..8b7f3cda --- /dev/null +++ b/.github/workflows/master-publish-package.yaml @@ -0,0 +1,39 @@ +name: master-publish-package.yaml +on: + pull_request: + branches: + - "master" + - "release-test-master" +jobs: + release-diff-check: + name: Release diff check + runs-on: ubuntu-latest + steps: + - name: Checkout + uses: actions/checkout@v4 + + - name: Check diff + id: check-diff + uses: actions/github-script@v3 + with: + result-encoding: 'json' + script: | + const fs = require('fs') + const {execSync} = require('child_process'); + const jsonData = JSON.parse(fs.readFileSync('./.github/monorepo.json', 'utf8')); + + var tags = [] + + for (let [key, value] of Object.entries(jsonData.projects)) { + const command = "git diff origin/master HEAD --name-only --relative=" + key + "\n"; + const output = execSync(command, {encoding: 'utf8'}); + if (output.length != 0) { + tags.push(value) + } + } + return tags + + - name: show diff + env: + DIFF: ${{ steps.check-diff.outputs.result }} + run: echo "$DIFF" \ No newline at end of file diff --git a/hideout-core/build.gradle.kts b/hideout-core/build.gradle.kts index 2e0c34e4..2739b00b 100644 --- a/hideout-core/build.gradle.kts +++ b/hideout-core/build.gradle.kts @@ -12,7 +12,6 @@ plugins { alias(libs.plugins.kotlin.spring) alias(libs.plugins.kover) alias(libs.plugins.license.report) - } apply { From 3fcd7ae917a7efb20d4226fe96d34e3f24687a5d Mon Sep 17 00:00:00 2001 From: usbharu <64310155+usbharu@users.noreply.github.com> Date: Sat, 10 Aug 2024 14:11:15 +0900 Subject: [PATCH 03/32] chore: fix base_ref --- .github/workflows/master-publish-package.yaml | 5 +++-- 1 file changed, 3 insertions(+), 2 deletions(-) diff --git a/.github/workflows/master-publish-package.yaml b/.github/workflows/master-publish-package.yaml index 8b7f3cda..e7bd5787 100644 --- a/.github/workflows/master-publish-package.yaml +++ b/.github/workflows/master-publish-package.yaml @@ -21,11 +21,12 @@ jobs: const fs = require('fs') const {execSync} = require('child_process'); const jsonData = JSON.parse(fs.readFileSync('./.github/monorepo.json', 'utf8')); - + const baseRef = github.context.payload.pull_request.base.ref + console.log(baseRef) var tags = [] for (let [key, value] of Object.entries(jsonData.projects)) { - const command = "git diff origin/master HEAD --name-only --relative=" + key + "\n"; + const command = "git diff " + baseRef + " HEAD --name-only --relative=" + key + "\n"; const output = execSync(command, {encoding: 'utf8'}); if (output.length != 0) { tags.push(value) From 7ebb29100d96663af31d984b1b14964063ec86d5 Mon Sep 17 00:00:00 2001 From: usbharu <64310155+usbharu@users.noreply.github.com> Date: Sat, 10 Aug 2024 14:12:27 +0900 Subject: [PATCH 04/32] chore: fix base_ref --- .github/workflows/master-publish-package.yaml | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/.github/workflows/master-publish-package.yaml b/.github/workflows/master-publish-package.yaml index e7bd5787..540220fd 100644 --- a/.github/workflows/master-publish-package.yaml +++ b/.github/workflows/master-publish-package.yaml @@ -21,7 +21,7 @@ jobs: const fs = require('fs') const {execSync} = require('child_process'); const jsonData = JSON.parse(fs.readFileSync('./.github/monorepo.json', 'utf8')); - const baseRef = github.context.payload.pull_request.base.ref + const baseRef = context.payload.pull_request.base.ref console.log(baseRef) var tags = [] From a6c6b110cf46c3565eb648ee47d838bee613cce8 Mon Sep 17 00:00:00 2001 From: usbharu <64310155+usbharu@users.noreply.github.com> Date: Sat, 10 Aug 2024 14:15:51 +0900 Subject: [PATCH 05/32] ????????????? --- .github/workflows/master-publish-package.yaml | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/.github/workflows/master-publish-package.yaml b/.github/workflows/master-publish-package.yaml index 540220fd..2858549e 100644 --- a/.github/workflows/master-publish-package.yaml +++ b/.github/workflows/master-publish-package.yaml @@ -2,8 +2,8 @@ name: master-publish-package.yaml on: pull_request: branches: - - "master" - - "release-test-master" + - 'master' + - 'release-test-master' jobs: release-diff-check: name: Release diff check From e4215df83f4891fa9c078b4754dd7fba5dfe0f8d Mon Sep 17 00:00:00 2001 From: usbharu <64310155+usbharu@users.noreply.github.com> Date: Sat, 10 Aug 2024 14:17:03 +0900 Subject: [PATCH 06/32] ????????????? --- .github/workflows/master-publish-package.yaml | 2 ++ 1 file changed, 2 insertions(+) diff --git a/.github/workflows/master-publish-package.yaml b/.github/workflows/master-publish-package.yaml index 2858549e..181dafc8 100644 --- a/.github/workflows/master-publish-package.yaml +++ b/.github/workflows/master-publish-package.yaml @@ -4,6 +4,8 @@ on: branches: - 'master' - 'release-test-master' + branches-ignore: + - 'develop' jobs: release-diff-check: name: Release diff check From 06a7b035e4f9a20e2cfe400a7cff51df513bcaf2 Mon Sep 17 00:00:00 2001 From: usbharu <64310155+usbharu@users.noreply.github.com> Date: Sat, 10 Aug 2024 14:23:20 +0900 Subject: [PATCH 07/32] ????????????? --- .github/workflows/master-publish-package.yaml | 6 ++---- 1 file changed, 2 insertions(+), 4 deletions(-) diff --git a/.github/workflows/master-publish-package.yaml b/.github/workflows/master-publish-package.yaml index 181dafc8..540220fd 100644 --- a/.github/workflows/master-publish-package.yaml +++ b/.github/workflows/master-publish-package.yaml @@ -2,10 +2,8 @@ name: master-publish-package.yaml on: pull_request: branches: - - 'master' - - 'release-test-master' - branches-ignore: - - 'develop' + - "master" + - "release-test-master" jobs: release-diff-check: name: Release diff check From 8d9a6e5426c244e5b68a563344d1480f292fa5ef Mon Sep 17 00:00:00 2001 From: usbharu <64310155+usbharu@users.noreply.github.com> Date: Sat, 10 Aug 2024 14:34:09 +0900 Subject: [PATCH 08/32] =?UTF-8?q?fix:=20git=20diff=E3=81=8C=E5=A4=B1?= =?UTF-8?q?=E6=95=97=E3=81=99=E3=82=8B=E5=95=8F=E9=A1=8C=E3=82=92=E4=BF=AE?= =?UTF-8?q?=E6=AD=A3?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .github/workflows/master-publish-package.yaml | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/.github/workflows/master-publish-package.yaml b/.github/workflows/master-publish-package.yaml index 540220fd..a39fabd2 100644 --- a/.github/workflows/master-publish-package.yaml +++ b/.github/workflows/master-publish-package.yaml @@ -26,7 +26,7 @@ jobs: var tags = [] for (let [key, value] of Object.entries(jsonData.projects)) { - const command = "git diff " + baseRef + " HEAD --name-only --relative=" + key + "\n"; + const command = "git diff " + baseRef + " -- HEAD --name-only --relative=" + key + "\n"; const output = execSync(command, {encoding: 'utf8'}); if (output.length != 0) { tags.push(value) From 2fecd697b683d71e8b30effe0876acf0a245ca60 Mon Sep 17 00:00:00 2001 From: usbharu <64310155+usbharu@users.noreply.github.com> Date: Sat, 10 Aug 2024 14:37:03 +0900 Subject: [PATCH 09/32] wip --- .github/workflows/master-publish-package.yaml | 1 + 1 file changed, 1 insertion(+) diff --git a/.github/workflows/master-publish-package.yaml b/.github/workflows/master-publish-package.yaml index a39fabd2..b4360cde 100644 --- a/.github/workflows/master-publish-package.yaml +++ b/.github/workflows/master-publish-package.yaml @@ -26,6 +26,7 @@ jobs: var tags = [] for (let [key, value] of Object.entries(jsonData.projects)) { + console.log(execSync("pwd")) const command = "git diff " + baseRef + " -- HEAD --name-only --relative=" + key + "\n"; const output = execSync(command, {encoding: 'utf8'}); if (output.length != 0) { From 5ab29d14498a70f90bcd9b008666ce9a32958234 Mon Sep 17 00:00:00 2001 From: usbharu <64310155+usbharu@users.noreply.github.com> Date: Sat, 10 Aug 2024 14:37:57 +0900 Subject: [PATCH 10/32] wip --- .github/workflows/master-publish-package.yaml | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/.github/workflows/master-publish-package.yaml b/.github/workflows/master-publish-package.yaml index b4360cde..2a8b6f46 100644 --- a/.github/workflows/master-publish-package.yaml +++ b/.github/workflows/master-publish-package.yaml @@ -26,7 +26,7 @@ jobs: var tags = [] for (let [key, value] of Object.entries(jsonData.projects)) { - console.log(execSync("pwd")) + console.log(execSync("pwd",{encoding: 'utf8'})) const command = "git diff " + baseRef + " -- HEAD --name-only --relative=" + key + "\n"; const output = execSync(command, {encoding: 'utf8'}); if (output.length != 0) { From ba46dcabccd2a38a9a2cf8686f21717f0915b50f Mon Sep 17 00:00:00 2001 From: usbharu <64310155+usbharu@users.noreply.github.com> Date: Sat, 10 Aug 2024 14:39:00 +0900 Subject: [PATCH 11/32] wip --- .github/workflows/master-publish-package.yaml | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/.github/workflows/master-publish-package.yaml b/.github/workflows/master-publish-package.yaml index 2a8b6f46..55386ed8 100644 --- a/.github/workflows/master-publish-package.yaml +++ b/.github/workflows/master-publish-package.yaml @@ -26,7 +26,7 @@ jobs: var tags = [] for (let [key, value] of Object.entries(jsonData.projects)) { - console.log(execSync("pwd",{encoding: 'utf8'})) + console.log(execSync("git branch",{encoding: 'utf8'})) const command = "git diff " + baseRef + " -- HEAD --name-only --relative=" + key + "\n"; const output = execSync(command, {encoding: 'utf8'}); if (output.length != 0) { From 80f33f756364fd9d35ada7a7c8ca12c3b94e9002 Mon Sep 17 00:00:00 2001 From: usbharu <64310155+usbharu@users.noreply.github.com> Date: Sat, 10 Aug 2024 14:39:59 +0900 Subject: [PATCH 12/32] wip --- .github/workflows/master-publish-package.yaml | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/.github/workflows/master-publish-package.yaml b/.github/workflows/master-publish-package.yaml index 55386ed8..1da19cda 100644 --- a/.github/workflows/master-publish-package.yaml +++ b/.github/workflows/master-publish-package.yaml @@ -27,7 +27,7 @@ jobs: for (let [key, value] of Object.entries(jsonData.projects)) { console.log(execSync("git branch",{encoding: 'utf8'})) - const command = "git diff " + baseRef + " -- HEAD --name-only --relative=" + key + "\n"; + const command = "git diff origin/" + baseRef + " -- HEAD --name-only --relative=" + key + "\n"; const output = execSync(command, {encoding: 'utf8'}); if (output.length != 0) { tags.push(value) From 8a86c54edf72b7048671d7b63b83ea68d9f7b5b8 Mon Sep 17 00:00:00 2001 From: usbharu <64310155+usbharu@users.noreply.github.com> Date: Sat, 10 Aug 2024 14:44:05 +0900 Subject: [PATCH 13/32] wip --- .github/workflows/master-publish-package.yaml | 3 +++ 1 file changed, 3 insertions(+) diff --git a/.github/workflows/master-publish-package.yaml b/.github/workflows/master-publish-package.yaml index 1da19cda..2c4c0048 100644 --- a/.github/workflows/master-publish-package.yaml +++ b/.github/workflows/master-publish-package.yaml @@ -12,6 +12,9 @@ jobs: - name: Checkout uses: actions/checkout@v4 + - name: fetch git + run: git fetch --depth 1 origin ${{ github.event.before }} + - name: Check diff id: check-diff uses: actions/github-script@v3 From 53a4953c07fb3051d1eca743080d147205916f62 Mon Sep 17 00:00:00 2001 From: usbharu <64310155+usbharu@users.noreply.github.com> Date: Sat, 10 Aug 2024 14:46:50 +0900 Subject: [PATCH 14/32] wip --- .github/workflows/master-publish-package.yaml | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/.github/workflows/master-publish-package.yaml b/.github/workflows/master-publish-package.yaml index 2c4c0048..19710aa6 100644 --- a/.github/workflows/master-publish-package.yaml +++ b/.github/workflows/master-publish-package.yaml @@ -13,7 +13,7 @@ jobs: uses: actions/checkout@v4 - name: fetch git - run: git fetch --depth 1 origin ${{ github.event.before }} + run: git fetch --depth 1 origin - name: Check diff id: check-diff From 1fbe3356fca570e20b631d414feedd0e6060ba54 Mon Sep 17 00:00:00 2001 From: usbharu <64310155+usbharu@users.noreply.github.com> Date: Sat, 10 Aug 2024 14:49:41 +0900 Subject: [PATCH 15/32] wip --- .github/workflows/master-publish-package.yaml | 5 +++-- 1 file changed, 3 insertions(+), 2 deletions(-) diff --git a/.github/workflows/master-publish-package.yaml b/.github/workflows/master-publish-package.yaml index 19710aa6..42e3d90d 100644 --- a/.github/workflows/master-publish-package.yaml +++ b/.github/workflows/master-publish-package.yaml @@ -29,10 +29,11 @@ jobs: var tags = [] for (let [key, value] of Object.entries(jsonData.projects)) { - console.log(execSync("git branch",{encoding: 'utf8'})) + console.log(execSync("git branch", {encoding: 'utf8'})) const command = "git diff origin/" + baseRef + " -- HEAD --name-only --relative=" + key + "\n"; const output = execSync(command, {encoding: 'utf8'}); - if (output.length != 0) { + console.log(output) + if (output.length !== 0) { tags.push(value) } } From 0b13fce03ce223c84ebca505749f7115cabe8d55 Mon Sep 17 00:00:00 2001 From: usbharu <64310155+usbharu@users.noreply.github.com> Date: Sat, 10 Aug 2024 14:52:26 +0900 Subject: [PATCH 16/32] wip --- .github/workflows/master-publish-package.yaml | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/.github/workflows/master-publish-package.yaml b/.github/workflows/master-publish-package.yaml index 42e3d90d..af2a343f 100644 --- a/.github/workflows/master-publish-package.yaml +++ b/.github/workflows/master-publish-package.yaml @@ -33,7 +33,7 @@ jobs: const command = "git diff origin/" + baseRef + " -- HEAD --name-only --relative=" + key + "\n"; const output = execSync(command, {encoding: 'utf8'}); console.log(output) - if (output.length !== 0) { + if (output.trim() === '') { tags.push(value) } } From e706b2eb17efd0172534b7ebd3c92fcefeab9be0 Mon Sep 17 00:00:00 2001 From: usbharu <64310155+usbharu@users.noreply.github.com> Date: Sat, 10 Aug 2024 15:30:11 +0900 Subject: [PATCH 17/32] =?UTF-8?q?chore:=20=E3=83=86=E3=82=B9=E3=83=88?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .github/workflows/master-publish-package.yaml | 29 ++++++++++++++++++- 1 file changed, 28 insertions(+), 1 deletion(-) diff --git a/.github/workflows/master-publish-package.yaml b/.github/workflows/master-publish-package.yaml index af2a343f..47632854 100644 --- a/.github/workflows/master-publish-package.yaml +++ b/.github/workflows/master-publish-package.yaml @@ -8,6 +8,8 @@ jobs: release-diff-check: name: Release diff check runs-on: ubuntu-latest + outputs: + diff: ${{ steps.check-diff.outputs.result }} steps: - name: Checkout uses: actions/checkout@v4 @@ -42,4 +44,29 @@ jobs: - name: show diff env: DIFF: ${{ steps.check-diff.outputs.result }} - run: echo "$DIFF" \ No newline at end of file + run: echo "$DIFF" + + publish-package: + runs-on: ubuntu-latest + steps: + - name: Checkout + uses: actions/checkout@v4 + + - name: Gradle Wrapper Validation + uses: gradle/actions/wrapper-validation@v4 + + - name: Set up JDK 21 + uses: actions/setup-java@v4 + with: + java-version: '21' + distribution: 'temurin' + + - name: Setup Gradle + uses: gradle/actions/setup-gradle@v4 + with: + cache-read-only: false + gradle-home-cache-cleanup: true + + - name: Publish OWL + if: contains(${{ needs.release-diff-check.outputs.diff }}, 'owl') + run: ./gradlew :owl:publishMavenPublicationToMavenLocal From 41c506fa975aa24599089452ea41358a41c21723 Mon Sep 17 00:00:00 2001 From: usbharu <64310155+usbharu@users.noreply.github.com> Date: Sat, 10 Aug 2024 15:41:38 +0900 Subject: [PATCH 18/32] style --- .github/workflows/master-publish-package.yaml | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/.github/workflows/master-publish-package.yaml b/.github/workflows/master-publish-package.yaml index 47632854..563d06e6 100644 --- a/.github/workflows/master-publish-package.yaml +++ b/.github/workflows/master-publish-package.yaml @@ -69,4 +69,4 @@ jobs: - name: Publish OWL if: contains(${{ needs.release-diff-check.outputs.diff }}, 'owl') - run: ./gradlew :owl:publishMavenPublicationToMavenLocal + run: ./owl/gradlew :owl:publishMavenPublicationToMavenLocal From b7cc88d5337c3fee3c0cc76a853ee78115ecda51 Mon Sep 17 00:00:00 2001 From: usbharu <64310155+usbharu@users.noreply.github.com> Date: Sat, 10 Aug 2024 15:43:20 +0900 Subject: [PATCH 19/32] style --- owl/gradlew | 0 1 file changed, 0 insertions(+), 0 deletions(-) mode change 100644 => 100755 owl/gradlew diff --git a/owl/gradlew b/owl/gradlew old mode 100644 new mode 100755 From ef57349f95895c058bfe863dd3904effe6b97eee Mon Sep 17 00:00:00 2001 From: usbharu <64310155+usbharu@users.noreply.github.com> Date: Sat, 10 Aug 2024 15:51:03 +0900 Subject: [PATCH 20/32] =?UTF-8?q?chore:=20=E3=83=AA=E3=83=AA=E3=83=BC?= =?UTF-8?q?=E3=82=B9=E5=85=88=E3=82=92=E8=BF=BD=E5=8A=A0?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .github/workflows/master-publish-package.yaml | 8 ++++++-- 1 file changed, 6 insertions(+), 2 deletions(-) diff --git a/.github/workflows/master-publish-package.yaml b/.github/workflows/master-publish-package.yaml index 563d06e6..2beb636a 100644 --- a/.github/workflows/master-publish-package.yaml +++ b/.github/workflows/master-publish-package.yaml @@ -67,6 +67,10 @@ jobs: cache-read-only: false gradle-home-cache-cleanup: true - - name: Publish OWL - if: contains(${{ needs.release-diff-check.outputs.diff }}, 'owl') + - name: Publish OWL Local + if: github.base_ref == release-test-master && contains(${{ needs.release-diff-check.outputs.diff }}, 'owl') run: ./owl/gradlew :owl:publishMavenPublicationToMavenLocal + + - name: Publish OWL Gitea + if: github.base_ref == master && contains(${{ needs.release-diff-check.outputs.diff }}, 'owl') + run: ./owl/gradlew :owl:publishMavenPublicationToGiteaRepository \ No newline at end of file From 575554a36cecbfe2fb53cf11a40ca833eda6d601 Mon Sep 17 00:00:00 2001 From: usbharu <64310155+usbharu@users.noreply.github.com> Date: Sat, 10 Aug 2024 15:55:00 +0900 Subject: [PATCH 21/32] =?UTF-8?q?chore:=20=E3=83=AA=E3=83=AA=E3=83=BC?= =?UTF-8?q?=E3=82=B9=E5=85=88=E3=82=92=E8=BF=BD=E5=8A=A0?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .github/workflows/master-publish-package.yaml | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/.github/workflows/master-publish-package.yaml b/.github/workflows/master-publish-package.yaml index 2beb636a..36406cdf 100644 --- a/.github/workflows/master-publish-package.yaml +++ b/.github/workflows/master-publish-package.yaml @@ -68,9 +68,9 @@ jobs: gradle-home-cache-cleanup: true - name: Publish OWL Local - if: github.base_ref == release-test-master && contains(${{ needs.release-diff-check.outputs.diff }}, 'owl') + if: github.base_ref == 'release-test-master' && contains(${{ needs.release-diff-check.outputs.diff }}, 'owl') run: ./owl/gradlew :owl:publishMavenPublicationToMavenLocal - name: Publish OWL Gitea - if: github.base_ref == master && contains(${{ needs.release-diff-check.outputs.diff }}, 'owl') + if: github.base_ref == 'master' && contains(${{ needs.release-diff-check.outputs.diff }}, 'owl') run: ./owl/gradlew :owl:publishMavenPublicationToGiteaRepository \ No newline at end of file From 46e31c987878f5bd2c89282d9393e1c75bbc0048 Mon Sep 17 00:00:00 2001 From: usbharu <64310155+usbharu@users.noreply.github.com> Date: Sat, 10 Aug 2024 15:59:17 +0900 Subject: [PATCH 22/32] ?? --- .github/workflows/master-publish-package.yaml | 3 +++ 1 file changed, 3 insertions(+) diff --git a/.github/workflows/master-publish-package.yaml b/.github/workflows/master-publish-package.yaml index 36406cdf..1d8d6edb 100644 --- a/.github/workflows/master-publish-package.yaml +++ b/.github/workflows/master-publish-package.yaml @@ -67,6 +67,9 @@ jobs: cache-read-only: false gradle-home-cache-cleanup: true + - name: Show GitHub Base Ref + run: echo ${{ github.base_ref }} + - name: Publish OWL Local if: github.base_ref == 'release-test-master' && contains(${{ needs.release-diff-check.outputs.diff }}, 'owl') run: ./owl/gradlew :owl:publishMavenPublicationToMavenLocal From e45dd333d75e1b31f5250d1d55ff2fe91fdb2afc Mon Sep 17 00:00:00 2001 From: usbharu <64310155+usbharu@users.noreply.github.com> Date: Sat, 10 Aug 2024 16:00:33 +0900 Subject: [PATCH 23/32] ??? --- .github/workflows/master-publish-package.yaml | 4 +++- 1 file changed, 3 insertions(+), 1 deletion(-) diff --git a/.github/workflows/master-publish-package.yaml b/.github/workflows/master-publish-package.yaml index 1d8d6edb..e64b4a7d 100644 --- a/.github/workflows/master-publish-package.yaml +++ b/.github/workflows/master-publish-package.yaml @@ -68,7 +68,9 @@ jobs: gradle-home-cache-cleanup: true - name: Show GitHub Base Ref - run: echo ${{ github.base_ref }} + run: | + echo ${{ github.base_ref }} + echo ${{ github.base_ref == 'master' }} - name: Publish OWL Local if: github.base_ref == 'release-test-master' && contains(${{ needs.release-diff-check.outputs.diff }}, 'owl') From 19872ce50f86c731f542c7ed4f1fb982f660f9be Mon Sep 17 00:00:00 2001 From: usbharu <64310155+usbharu@users.noreply.github.com> Date: Sat, 10 Aug 2024 16:04:48 +0900 Subject: [PATCH 24/32] ???? --- .github/workflows/master-publish-package.yaml | 3 ++- 1 file changed, 2 insertions(+), 1 deletion(-) diff --git a/.github/workflows/master-publish-package.yaml b/.github/workflows/master-publish-package.yaml index e64b4a7d..70c1a4c9 100644 --- a/.github/workflows/master-publish-package.yaml +++ b/.github/workflows/master-publish-package.yaml @@ -77,5 +77,6 @@ jobs: run: ./owl/gradlew :owl:publishMavenPublicationToMavenLocal - name: Publish OWL Gitea - if: github.base_ref == 'master' && contains(${{ needs.release-diff-check.outputs.diff }}, 'owl') + # if: github.base_ref == 'master' && contains(${{ needs.release-diff-check.outputs.diff }}, 'owl') + if: false run: ./owl/gradlew :owl:publishMavenPublicationToGiteaRepository \ No newline at end of file From 556644d7e3e15e5453ee057563b0b8659351b30f Mon Sep 17 00:00:00 2001 From: usbharu <64310155+usbharu@users.noreply.github.com> Date: Sat, 10 Aug 2024 16:05:56 +0900 Subject: [PATCH 25/32] ????? --- .github/workflows/master-publish-package.yaml | 1 + 1 file changed, 1 insertion(+) diff --git a/.github/workflows/master-publish-package.yaml b/.github/workflows/master-publish-package.yaml index 70c1a4c9..71804cff 100644 --- a/.github/workflows/master-publish-package.yaml +++ b/.github/workflows/master-publish-package.yaml @@ -71,6 +71,7 @@ jobs: run: | echo ${{ github.base_ref }} echo ${{ github.base_ref == 'master' }} + echo ${{ github.base_ref == 'master' && contains( needs.release-diff-check.outputs.diff , 'owl')}} - name: Publish OWL Local if: github.base_ref == 'release-test-master' && contains(${{ needs.release-diff-check.outputs.diff }}, 'owl') From 1a19afa4dbd723dc26bcaca2f93f70a2d5ad9e80 Mon Sep 17 00:00:00 2001 From: usbharu <64310155+usbharu@users.noreply.github.com> Date: Sat, 10 Aug 2024 16:06:57 +0900 Subject: [PATCH 26/32] ?????? --- .github/workflows/master-publish-package.yaml | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/.github/workflows/master-publish-package.yaml b/.github/workflows/master-publish-package.yaml index 71804cff..80a546f6 100644 --- a/.github/workflows/master-publish-package.yaml +++ b/.github/workflows/master-publish-package.yaml @@ -79,5 +79,5 @@ jobs: - name: Publish OWL Gitea # if: github.base_ref == 'master' && contains(${{ needs.release-diff-check.outputs.diff }}, 'owl') - if: false + if: ${{ github.base_ref == 'master' && contains( needs.release-diff-check.outputs.diff , 'owl')}} run: ./owl/gradlew :owl:publishMavenPublicationToGiteaRepository \ No newline at end of file From eaf0d4d7fb1cbfa5a5f7358e05eb95ecb178f759 Mon Sep 17 00:00:00 2001 From: usbharu <64310155+usbharu@users.noreply.github.com> Date: Sat, 10 Aug 2024 16:08:44 +0900 Subject: [PATCH 27/32] =?UTF-8?q?chore:=20=E3=81=93=E3=82=8C=E3=81=A0?= =?UTF-8?q?=E3=81=8B=E3=82=89=E5=9E=8B=E3=81=AE=E3=81=AA=E3=81=84=E8=A8=80?= =?UTF-8?q?=E8=AA=9E=E3=81=AF=E3=83=80=E3=83=A1=E3=81=A0?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .github/workflows/master-publish-package.yaml | 9 +-------- 1 file changed, 1 insertion(+), 8 deletions(-) diff --git a/.github/workflows/master-publish-package.yaml b/.github/workflows/master-publish-package.yaml index 80a546f6..7dc1288e 100644 --- a/.github/workflows/master-publish-package.yaml +++ b/.github/workflows/master-publish-package.yaml @@ -67,17 +67,10 @@ jobs: cache-read-only: false gradle-home-cache-cleanup: true - - name: Show GitHub Base Ref - run: | - echo ${{ github.base_ref }} - echo ${{ github.base_ref == 'master' }} - echo ${{ github.base_ref == 'master' && contains( needs.release-diff-check.outputs.diff , 'owl')}} - - name: Publish OWL Local - if: github.base_ref == 'release-test-master' && contains(${{ needs.release-diff-check.outputs.diff }}, 'owl') + if: ${{ github.base_ref == 'release-test-master' && contains( needs.release-diff-check.outputs.diff, 'owl') }} run: ./owl/gradlew :owl:publishMavenPublicationToMavenLocal - name: Publish OWL Gitea - # if: github.base_ref == 'master' && contains(${{ needs.release-diff-check.outputs.diff }}, 'owl') if: ${{ github.base_ref == 'master' && contains( needs.release-diff-check.outputs.diff , 'owl')}} run: ./owl/gradlew :owl:publishMavenPublicationToGiteaRepository \ No newline at end of file From 852ba5e4153aeb0f77ba4da2a0de74da1e015517 Mon Sep 17 00:00:00 2001 From: usbharu <64310155+usbharu@users.noreply.github.com> Date: Sat, 10 Aug 2024 16:24:12 +0900 Subject: [PATCH 28/32] =?UTF-8?q?chore:=20=E6=A7=8B=E6=88=90=E3=82=AD?= =?UTF-8?q?=E3=83=A3=E3=83=83=E3=82=B7=E3=83=A5=E3=81=8C=E3=81=82=E3=82=8B?= =?UTF-8?q?=E3=81=A8maven-publish=E3=81=8C=E5=8B=95=E3=81=8B=E3=81=AA?= =?UTF-8?q?=E3=81=84=E3=81=AE=E3=81=A7=E5=89=8A=E9=99=A4?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- gradle.properties | 4 +--- owl/build.gradle.kts | 2 +- owl/gradle.properties | 4 +--- 3 files changed, 3 insertions(+), 7 deletions(-) diff --git a/gradle.properties b/gradle.properties index 0c1ed385..29326c5e 100644 --- a/gradle.properties +++ b/gradle.properties @@ -1,6 +1,4 @@ org.gradle.parallel=true org.gradle.configureondemand=true org.gradle.caching=true -org.gradle.jvmargs=-Xmx4096m -XX:+HeapDumpOnOutOfMemoryError -XX:+UseParallelGC --add-opens=java.base/java.util.concurrent.locks=ALL-UNNAMED -XX:TieredStopAtLevel=1 -noverify -org.gradle.configuration-cache=true -org.gradle.configuration-cache.problems=warn \ No newline at end of file +org.gradle.jvmargs=-Xmx4096m -XX:+HeapDumpOnOutOfMemoryError -XX:+UseParallelGC --add-opens=java.base/java.util.concurrent.locks=ALL-UNNAMED -XX:TieredStopAtLevel=1 -noverify \ No newline at end of file diff --git a/owl/build.gradle.kts b/owl/build.gradle.kts index 39ef7e0a..1bc1d780 100644 --- a/owl/build.gradle.kts +++ b/owl/build.gradle.kts @@ -49,7 +49,7 @@ subprojects { name = "Gitea" url = uri("https://git.usbharu.dev/api/packages/usbharu/maven") - credentials(HttpHeaderCredentials::class.java) { + credentials(HttpHeaderCredentials::class) { name = "Authorization" value = "token " + (project.findProperty("gpr.gitea") as String? ?: System.getenv("GITEA")) } diff --git a/owl/gradle.properties b/owl/gradle.properties index 50785165..43cbcbb4 100644 --- a/owl/gradle.properties +++ b/owl/gradle.properties @@ -1,6 +1,4 @@ kotlin.code.style=official org.gradle.daemon=true org.gradle.parallel=true -org.gradle.configureondemand=true -org.gradle.configuration-cache=true -org.gradle.configuration-cache.problems=warn \ No newline at end of file +org.gradle.configureondemand=true \ No newline at end of file From 67b37bce10e0c41b08fd7f7d53f5b953f4ccbe95 Mon Sep 17 00:00:00 2001 From: usbharu <64310155+usbharu@users.noreply.github.com> Date: Sat, 10 Aug 2024 16:27:16 +0900 Subject: [PATCH 29/32] ? --- .github/workflows/master-publish-package.yaml | 8 ++++++++ 1 file changed, 8 insertions(+) diff --git a/.github/workflows/master-publish-package.yaml b/.github/workflows/master-publish-package.yaml index 7dc1288e..91f67f00 100644 --- a/.github/workflows/master-publish-package.yaml +++ b/.github/workflows/master-publish-package.yaml @@ -67,10 +67,18 @@ jobs: cache-read-only: false gradle-home-cache-cleanup: true + - name: Show GitHub Base Ref + run: | + echo ${{ github.base_ref }} + echo ${{ github.base_ref == 'master' }} + echo ${{ github.base_ref == 'master' && contains( needs.release-diff-check.outputs.diff , 'owl')}} + echo ${{ github.base_ref == 'release-test-master' && contains( needs.release-diff-check.outputs.diff, 'owl') }} + - name: Publish OWL Local if: ${{ github.base_ref == 'release-test-master' && contains( needs.release-diff-check.outputs.diff, 'owl') }} run: ./owl/gradlew :owl:publishMavenPublicationToMavenLocal - name: Publish OWL Gitea + if: ${{ github.base_ref == 'master' && contains( needs.release-diff-check.outputs.diff , 'owl')}} run: ./owl/gradlew :owl:publishMavenPublicationToGiteaRepository \ No newline at end of file From afbeee38a6c57ec96de0c80d91ba4a4102a27178 Mon Sep 17 00:00:00 2001 From: usbharu <64310155+usbharu@users.noreply.github.com> Date: Sat, 10 Aug 2024 16:28:47 +0900 Subject: [PATCH 30/32] ?? --- .github/workflows/master-publish-package.yaml | 2 ++ 1 file changed, 2 insertions(+) diff --git a/.github/workflows/master-publish-package.yaml b/.github/workflows/master-publish-package.yaml index 91f67f00..6d3a4bdf 100644 --- a/.github/workflows/master-publish-package.yaml +++ b/.github/workflows/master-publish-package.yaml @@ -71,6 +71,8 @@ jobs: run: | echo ${{ github.base_ref }} echo ${{ github.base_ref == 'master' }} + echo ${{ github.base_ref == 'release-test-master' }} + echo ${{ contains( needs.release-diff-check.outputs.diff, 'owl') }} echo ${{ github.base_ref == 'master' && contains( needs.release-diff-check.outputs.diff , 'owl')}} echo ${{ github.base_ref == 'release-test-master' && contains( needs.release-diff-check.outputs.diff, 'owl') }} From afffe046ef644f97b388d7b8a7b33bc7e667e629 Mon Sep 17 00:00:00 2001 From: usbharu <64310155+usbharu@users.noreply.github.com> Date: Sat, 10 Aug 2024 16:30:33 +0900 Subject: [PATCH 31/32] ??? --- .github/workflows/master-publish-package.yaml | 1 + 1 file changed, 1 insertion(+) diff --git a/.github/workflows/master-publish-package.yaml b/.github/workflows/master-publish-package.yaml index 6d3a4bdf..cd44ebd3 100644 --- a/.github/workflows/master-publish-package.yaml +++ b/.github/workflows/master-publish-package.yaml @@ -48,6 +48,7 @@ jobs: publish-package: runs-on: ubuntu-latest + needs: release-diff-check steps: - name: Checkout uses: actions/checkout@v4 From ed6a59045048176724b9bd11102f92b309da851d Mon Sep 17 00:00:00 2001 From: usbharu <64310155+usbharu@users.noreply.github.com> Date: Sat, 10 Aug 2024 16:31:55 +0900 Subject: [PATCH 32/32] =?UTF-8?q?chore:=20needs=E3=81=8C=E8=A8=AD=E5=AE=9A?= =?UTF-8?q?=E3=81=A7=E3=81=8D=E3=81=A6=E3=81=84=E3=81=AA=E3=81=8B=E3=81=A3?= =?UTF-8?q?=E3=81=9F=E5=95=8F=E9=A1=8C=E3=82=92=E4=BF=AE=E6=AD=A3?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .github/workflows/master-publish-package.yaml | 9 --------- 1 file changed, 9 deletions(-) diff --git a/.github/workflows/master-publish-package.yaml b/.github/workflows/master-publish-package.yaml index cd44ebd3..36abce0e 100644 --- a/.github/workflows/master-publish-package.yaml +++ b/.github/workflows/master-publish-package.yaml @@ -68,15 +68,6 @@ jobs: cache-read-only: false gradle-home-cache-cleanup: true - - name: Show GitHub Base Ref - run: | - echo ${{ github.base_ref }} - echo ${{ github.base_ref == 'master' }} - echo ${{ github.base_ref == 'release-test-master' }} - echo ${{ contains( needs.release-diff-check.outputs.diff, 'owl') }} - echo ${{ github.base_ref == 'master' && contains( needs.release-diff-check.outputs.diff , 'owl')}} - echo ${{ github.base_ref == 'release-test-master' && contains( needs.release-diff-check.outputs.diff, 'owl') }} - - name: Publish OWL Local if: ${{ github.base_ref == 'release-test-master' && contains( needs.release-diff-check.outputs.diff, 'owl') }} run: ./owl/gradlew :owl:publishMavenPublicationToMavenLocal