From 77fd01591d836f5fc5b5aa006f94e79e1813d445 Mon Sep 17 00:00:00 2001 From: Sebastian Becker Date: Thu, 27 Jul 2023 09:54:04 +0200 Subject: [PATCH 1/2] fix: migrate release-please to yoshi release type and codecov to flags Signed-off-by: Sebastian Becker --- .github/workflows/java.build-and-test.yaml | 13 +++++++------ .release-please-manifest.json | 2 +- codecov.yaml | 16 ++++++++++++++++ release-please-config.json | 2 +- 4 files changed, 25 insertions(+), 8 deletions(-) create mode 100644 codecov.yaml 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/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..a34063a 100644 --- a/release-please-config.json +++ b/release-please-config.json @@ -5,7 +5,7 @@ "pull-request-header": ":package: Staging a new release", "skip-snapshot": true, "packages": { - ".": { + "amphora-parent": { "package-name": "parent", "release-type": "maven" }, From abd86c2b0d48176fe1fa88e0a5b9e750ee022cd7 Mon Sep 17 00:00:00 2001 From: cs-minion Date: Thu, 27 Jul 2023 10:16:31 +0200 Subject: [PATCH 2/2] chore: release parent 0.1.1 Signed-off-by: cs-minion --- .release-please-manifest.json | 2 +- amphora-parent/CHANGELOG.md | 8 ++++++++ amphora-parent/pom.xml | 6 ++---- 3 files changed, 11 insertions(+), 5 deletions(-) create mode 100644 amphora-parent/CHANGELOG.md diff --git a/.release-please-manifest.json b/.release-please-manifest.json index e8399fc..94f0e58 100644 --- a/.release-please-manifest.json +++ b/.release-please-manifest.json @@ -1,5 +1,5 @@ { - "amphora-parent": "0.1.0", + "amphora-parent": "0.1.1", "amphora-common": "0.1.0", "amphora-java-client": "0.1.0", "amphora-service": "0.1.0", diff --git a/amphora-parent/CHANGELOG.md b/amphora-parent/CHANGELOG.md new file mode 100644 index 0000000..f94728e --- /dev/null +++ b/amphora-parent/CHANGELOG.md @@ -0,0 +1,8 @@ +# Changelog + +## [0.1.1](https://github.com/carbynestack/amphora/compare/parent-v0.1.0...parent-v0.1.1) (2023-07-27) + + +### Bug Fixes + +* **parent:** introduce parent release package ([ba73fe8](https://github.com/carbynestack/amphora/commit/ba73fe865470052ce2381d81de3017a6bb27e7fe)) diff --git a/amphora-parent/pom.xml b/amphora-parent/pom.xml index fd2842e..234a72d 100644 --- a/amphora-parent/pom.xml +++ b/amphora-parent/pom.xml @@ -5,13 +5,11 @@ ~ ~ SPDX-License-Identifier: Apache-2.0 --> - + 4.0.0 amphora-parent io.carbynestack - 0.1.0 + 0.1.1 pom