diff --git a/.github/workflows/java.build-and-test.yaml b/.github/workflows/java.build-and-test.yaml index f88e9d0..e3fc1cc 100644 --- a/.github/workflows/java.build-and-test.yaml +++ b/.github/workflows/java.build-and-test.yaml @@ -26,10 +26,10 @@ jobs: id: filter with: filters: | - amphora-parent: '(amphora-parent|.github)/**' - amphora-common: '(amphora-common|.github)/**' - amphora-java-client: '(amphora-java-client|.github)/**' - amphora-service: '(amphora-service|.github)/**' + parent: '(amphora-parent|.github)/**' + common: '(amphora-common|.github)/**' + java-client: '(amphora-java-client|.github)/**' + service: '(amphora-service|.github)/**' test: needs: changes strategy: @@ -56,9 +56,9 @@ jobs: "password": "${{ secrets.GITHUB_TOKEN }}" }] - name: Build with Maven - run: ./mvnw install -pl ${{ matrix.module }} -Dskip.tests --batch-mode --update-snapshots --no-transfer-progress + run: ./mvnw install -pl ${GITHUB_REPOSITORY#*/}-${{ matrix.module }} -Dskip.tests --batch-mode --update-snapshots --no-transfer-progress - name: Run Tests - run: ./mvnw verify -pl ${{ matrix.module }} --activate-profiles coverage --batch-mode --no-transfer-progress + run: ./mvnw verify -pl ${GITHUB_REPOSITORY#*/}-${{ matrix.module }} --activate-profiles coverage --batch-mode --no-transfer-progress - name: Collect Jacoco reports run: echo ::set-output name=reports::$(find . -regex '.*/target/site/jacoco/jacoco.xml' | tr '\n' ',' | sed 's/.$//') id: jacoco @@ -68,6 +68,7 @@ jobs: token: ${{ secrets.CODECOV_TOKEN }} files: ${{ steps.jacoco.outputs.reports }} name: ${{ matrix.module }} + flags: ${{ matrix.module }} test-status: runs-on: ubuntu-22.04 needs: test diff --git a/.release-please-manifest.json b/.release-please-manifest.json index cbecc39..e8399fc 100644 --- a/.release-please-manifest.json +++ b/.release-please-manifest.json @@ -1,5 +1,5 @@ { - ".": "0.1.0", + "amphora-parent": "0.1.0", "amphora-common": "0.1.0", "amphora-java-client": "0.1.0", "amphora-service": "0.1.0", diff --git a/amphora-common/pom.xml b/amphora-common/pom.xml index 2200119..9a6578d 100644 --- a/amphora-common/pom.xml +++ b/amphora-common/pom.xml @@ -10,7 +10,7 @@ xsi:schemaLocation="http://maven.apache.org/POM/4.0.0 http://maven.apache.org/xsd/maven-4.0.0.xsd"> 4.0.0 amphora-common - 0.1.0 + 0.1.0 io.carbynestack amphora diff --git a/amphora-common/versions.txt b/amphora-common/versions.txt new file mode 100644 index 0000000..5bf7090 --- /dev/null +++ b/amphora-common/versions.txt @@ -0,0 +1 @@ +amphora-common:0.1.0 diff --git a/amphora-java-client/pom.xml b/amphora-java-client/pom.xml index d1c9c17..8032a0f 100644 --- a/amphora-java-client/pom.xml +++ b/amphora-java-client/pom.xml @@ -10,7 +10,7 @@ xsi:schemaLocation="http://maven.apache.org/POM/4.0.0 http://maven.apache.org/xsd/maven-4.0.0.xsd"> 4.0.0 amphora-java-client - 0.1.0 + 0.1.0 io.carbynestack amphora diff --git a/amphora-java-client/versions.txt b/amphora-java-client/versions.txt new file mode 100644 index 0000000..639e37a --- /dev/null +++ b/amphora-java-client/versions.txt @@ -0,0 +1 @@ +amphora-java-client:0.1.0 diff --git a/amphora-parent/pom.xml b/amphora-parent/pom.xml index fd2842e..52b13e2 100644 --- a/amphora-parent/pom.xml +++ b/amphora-parent/pom.xml @@ -11,7 +11,7 @@ 4.0.0 amphora-parent io.carbynestack - 0.1.0 + 0.1.0 pom diff --git a/amphora-parent/versions.txt b/amphora-parent/versions.txt new file mode 100644 index 0000000..2299c31 --- /dev/null +++ b/amphora-parent/versions.txt @@ -0,0 +1 @@ +amphora-parent:0.1.0 diff --git a/amphora-service/pom.xml b/amphora-service/pom.xml index bd1109d..71e6c4e 100644 --- a/amphora-service/pom.xml +++ b/amphora-service/pom.xml @@ -11,7 +11,7 @@ amphora-service Amphora Service Amphora bucket/object store service. - 0.1.0 + 0.1.0 io.carbynestack amphora diff --git a/amphora-service/versions.txt b/amphora-service/versions.txt new file mode 100644 index 0000000..d171389 --- /dev/null +++ b/amphora-service/versions.txt @@ -0,0 +1 @@ +amphora-service:0.1.0 diff --git a/codecov.yaml b/codecov.yaml new file mode 100644 index 0000000..7c454c1 --- /dev/null +++ b/codecov.yaml @@ -0,0 +1,16 @@ +flag_management: + default_rules: + carryforward: true + individual_flags: + - name: parent + paths: + - amphora-parent/ + - name: common + paths: + - amphora-common/ + - name: java-client + paths: + - amphora-java-client/ + - name: service + paths: + - amphora-service/ diff --git a/release-please-config.json b/release-please-config.json index f72c682..51cf452 100644 --- a/release-please-config.json +++ b/release-please-config.json @@ -5,21 +5,21 @@ "pull-request-header": ":package: Staging a new release", "skip-snapshot": true, "packages": { - ".": { + "amphora-parent": { "package-name": "parent", - "release-type": "maven" + "release-type": "java-yoshi" }, "amphora-common": { "package-name": "common", - "release-type": "maven" + "release-type": "java-yoshi" }, "amphora-java-client": { "package-name": "java-client", - "release-type": "maven" + "release-type": "java-yoshi" }, "amphora-service": { "package-name": "service", - "release-type": "maven" + "release-type": "java-yoshi" }, "amphora-service/charts/amphora": { "package-name": "chart",