From f93c3de637378508490bdb0b8ef6cd661cbb0ef7 Mon Sep 17 00:00:00 2001 From: Mitsunori Komatsu Date: Thu, 19 Dec 2024 21:23:27 +0900 Subject: [PATCH 01/10] Add integration test --- .github/workflows/kelpie.yaml | 26 +++++++++++++++++++++++--- 1 file changed, 23 insertions(+), 3 deletions(-) diff --git a/.github/workflows/kelpie.yaml b/.github/workflows/kelpie.yaml index 87e0e7d..0bcd235 100644 --- a/.github/workflows/kelpie.yaml +++ b/.github/workflows/kelpie.yaml @@ -1,13 +1,13 @@ name: Kelpie -on: [push, pull_request] +on: [push, pull_request, workflow_dispatch] jobs: build: runs-on: ubuntu-latest name: Build steps: - - uses: actions/checkout@v2 + - uses: actions/checkout@v4 - name: Cache repository uses: actions/cache@v1 @@ -18,9 +18,29 @@ jobs: ${{ runner.os }}-gradle- - name: Setup Java - uses: actions/setup-java@v1 + uses: actions/setup-java@v4 with: java-version: 1.8 + - name: Setup Gradle + uses: gradle/actions/setup-gradle@v4 + - name: Build Kelpie run: ./gradlew build + + - name: Install distribution of Kelpie + run: ./gradlew installDist + + - name: Checkout Kelpie-Test + uses: actions/checkout@v4 + with: + repository: scalar-labs/kelpie-test + path: kelpie-test + + - name: Build Kelpie-Test:print-modules + working-directory: kelpie-test/print-modules + run: gradle shadowJar + + - name: Execute Kelpie-Test:print-modules + working-directory: kelpie-test + run: ${{ github.workspace }}/build/libs/bin/kelpie --config print-modules/config.toml From 3ede9e6cd3a42e24cda50cfe7f32658b593fc08e Mon Sep 17 00:00:00 2001 From: Mitsunori Komatsu Date: Thu, 19 Dec 2024 21:26:47 +0900 Subject: [PATCH 02/10] Fix workflow --- .github/workflows/kelpie.yaml | 3 ++- 1 file changed, 2 insertions(+), 1 deletion(-) diff --git a/.github/workflows/kelpie.yaml b/.github/workflows/kelpie.yaml index 0bcd235..f9d1736 100644 --- a/.github/workflows/kelpie.yaml +++ b/.github/workflows/kelpie.yaml @@ -20,7 +20,8 @@ jobs: - name: Setup Java uses: actions/setup-java@v4 with: - java-version: 1.8 + java-version: '8' + distribution: 'temurin' - name: Setup Gradle uses: gradle/actions/setup-gradle@v4 From ea4ffe718a9547d74e680e392a48a6f1cab18140 Mon Sep 17 00:00:00 2001 From: Mitsunori Komatsu Date: Thu, 19 Dec 2024 21:31:47 +0900 Subject: [PATCH 03/10] Fix workflow --- .github/workflows/kelpie.yaml | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/.github/workflows/kelpie.yaml b/.github/workflows/kelpie.yaml index f9d1736..3939995 100644 --- a/.github/workflows/kelpie.yaml +++ b/.github/workflows/kelpie.yaml @@ -10,7 +10,7 @@ jobs: - uses: actions/checkout@v4 - name: Cache repository - uses: actions/cache@v1 + uses: actions/cache@v4 with: path: ~/.gradle/caches key: ${{ runner.os }}-gradle-${{ hashFiles('**/*.gradle') }} @@ -40,7 +40,7 @@ jobs: - name: Build Kelpie-Test:print-modules working-directory: kelpie-test/print-modules - run: gradle shadowJar + run: ${{ github.workspace }}/gradlew shadowJar - name: Execute Kelpie-Test:print-modules working-directory: kelpie-test From f659ccf7c067b9a7a31f358093b81bed883a8a12 Mon Sep 17 00:00:00 2001 From: Mitsunori Komatsu Date: Thu, 19 Dec 2024 21:36:15 +0900 Subject: [PATCH 04/10] Fix exec path --- .github/workflows/kelpie.yaml | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/.github/workflows/kelpie.yaml b/.github/workflows/kelpie.yaml index 3939995..10be781 100644 --- a/.github/workflows/kelpie.yaml +++ b/.github/workflows/kelpie.yaml @@ -44,4 +44,4 @@ jobs: - name: Execute Kelpie-Test:print-modules working-directory: kelpie-test - run: ${{ github.workspace }}/build/libs/bin/kelpie --config print-modules/config.toml + run: ${{ github.workspace }}/build/install/kelpie/bin/kelpie --config print-modules/config.toml From 4edcce812a74a471c2755957d5d66cedf4ea9b91 Mon Sep 17 00:00:00 2001 From: Mitsunori Komatsu Date: Thu, 19 Dec 2024 21:41:26 +0900 Subject: [PATCH 05/10] Add Java version matrix --- .github/workflows/kelpie.yaml | 4 +++- 1 file changed, 3 insertions(+), 1 deletion(-) diff --git a/.github/workflows/kelpie.yaml b/.github/workflows/kelpie.yaml index 10be781..6825d70 100644 --- a/.github/workflows/kelpie.yaml +++ b/.github/workflows/kelpie.yaml @@ -6,6 +6,8 @@ jobs: build: runs-on: ubuntu-latest name: Build + matrix: + java_version: [8, 11, 17, 21] steps: - uses: actions/checkout@v4 @@ -20,7 +22,7 @@ jobs: - name: Setup Java uses: actions/setup-java@v4 with: - java-version: '8' + java-version: ${{ matrix.java_version }} distribution: 'temurin' - name: Setup Gradle From cb8a72845e16f9bfe5b59a1041d79a2d86bd8c59 Mon Sep 17 00:00:00 2001 From: Mitsunori Komatsu Date: Thu, 19 Dec 2024 21:43:09 +0900 Subject: [PATCH 06/10] Fix wrong syntax --- .github/workflows/kelpie.yaml | 5 +++-- 1 file changed, 3 insertions(+), 2 deletions(-) diff --git a/.github/workflows/kelpie.yaml b/.github/workflows/kelpie.yaml index 6825d70..4b864f8 100644 --- a/.github/workflows/kelpie.yaml +++ b/.github/workflows/kelpie.yaml @@ -6,8 +6,9 @@ jobs: build: runs-on: ubuntu-latest name: Build - matrix: - java_version: [8, 11, 17, 21] + strategy: + matrix: + java_version: [8, 11, 17, 21] steps: - uses: actions/checkout@v4 From fc662cf0a9fbe7b6a6e3e32ade26e46c02789892 Mon Sep 17 00:00:00 2001 From: Mitsunori Komatsu Date: Thu, 19 Dec 2024 21:51:06 +0900 Subject: [PATCH 07/10] Use only Java 8 for now --- .github/workflows/kelpie.yaml | 3 ++- 1 file changed, 2 insertions(+), 1 deletion(-) diff --git a/.github/workflows/kelpie.yaml b/.github/workflows/kelpie.yaml index 4b864f8..a14fbbf 100644 --- a/.github/workflows/kelpie.yaml +++ b/.github/workflows/kelpie.yaml @@ -8,7 +8,8 @@ jobs: name: Build strategy: matrix: - java_version: [8, 11, 17, 21] + # java_version: [8, 11, 17, 21] + java_version: [8] steps: - uses: actions/checkout@v4 From 1928f74237e4ea482ee267c1875beb0c18416dc2 Mon Sep 17 00:00:00 2001 From: Mitsunori Komatsu Date: Mon, 23 Dec 2024 12:04:09 +0900 Subject: [PATCH 08/10] Support Gradle 8.11 --- build.gradle | 10 +++------- gradle/wrapper/gradle-wrapper.properties | 2 +- 2 files changed, 4 insertions(+), 8 deletions(-) diff --git a/build.gradle b/build.gradle index 28a758a..0188b73 100644 --- a/build.gradle +++ b/build.gradle @@ -23,15 +23,11 @@ dependencies { testImplementation group: 'org.mockito', name: 'mockito-core', version: '3.2.4' } -task sourcesJar(type: Jar) { - classifier = 'sources' - from sourceSets.main.allSource +java { + withJavadocJar() + withSourcesJar() } -task javadocJar(type: Jar) { - classifier = 'javadoc' - from javadoc -} sourceCompatibility = 1.8 targetCompatibility = 1.8 diff --git a/gradle/wrapper/gradle-wrapper.properties b/gradle/wrapper/gradle-wrapper.properties index 9492014..81aa1c0 100644 --- a/gradle/wrapper/gradle-wrapper.properties +++ b/gradle/wrapper/gradle-wrapper.properties @@ -1,5 +1,5 @@ distributionBase=GRADLE_USER_HOME distributionPath=wrapper/dists -distributionUrl=https\://services.gradle.org/distributions/gradle-6.0.1-bin.zip +distributionUrl=https\://services.gradle.org/distributions/gradle-8.11.1-bin.zip zipStoreBase=GRADLE_USER_HOME zipStorePath=wrapper/dists From f9e6826b50a07a96731c7dbe3fdaa9d6236c3d6c Mon Sep 17 00:00:00 2001 From: Mitsunori Komatsu Date: Wed, 25 Dec 2024 12:15:53 +0900 Subject: [PATCH 09/10] Update workflow based on updated dependencies --- .github/workflows/kelpie.yaml | 5 ++--- 1 file changed, 2 insertions(+), 3 deletions(-) diff --git a/.github/workflows/kelpie.yaml b/.github/workflows/kelpie.yaml index a14fbbf..b12efd7 100644 --- a/.github/workflows/kelpie.yaml +++ b/.github/workflows/kelpie.yaml @@ -8,8 +8,7 @@ jobs: name: Build strategy: matrix: - # java_version: [8, 11, 17, 21] - java_version: [8] + java_version: [8, 11, 17, 21] steps: - uses: actions/checkout@v4 @@ -44,7 +43,7 @@ jobs: - name: Build Kelpie-Test:print-modules working-directory: kelpie-test/print-modules - run: ${{ github.workspace }}/gradlew shadowJar + run: gradlew shadowJar - name: Execute Kelpie-Test:print-modules working-directory: kelpie-test From 25ddd85a3e608d67a599036d42f451e9465b6248 Mon Sep 17 00:00:00 2001 From: Mitsunori Komatsu Date: Wed, 25 Dec 2024 13:53:06 +0900 Subject: [PATCH 10/10] Fix workflow --- .github/workflows/kelpie.yaml | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/.github/workflows/kelpie.yaml b/.github/workflows/kelpie.yaml index b12efd7..3f4f086 100644 --- a/.github/workflows/kelpie.yaml +++ b/.github/workflows/kelpie.yaml @@ -43,7 +43,7 @@ jobs: - name: Build Kelpie-Test:print-modules working-directory: kelpie-test/print-modules - run: gradlew shadowJar + run: gradle shadowJar - name: Execute Kelpie-Test:print-modules working-directory: kelpie-test