Skip to content

Commit

Permalink
fix: migrate release-please to yoshi release type and codecov to flags
Browse files Browse the repository at this point in the history
Signed-off-by: Sebastian Becker <[email protected]>
  • Loading branch information
sbckr committed Jul 27, 2023
1 parent 1e6d137 commit ce39d98
Show file tree
Hide file tree
Showing 12 changed files with 37 additions and 16 deletions.
13 changes: 7 additions & 6 deletions .github/workflows/java.build-and-test.yaml
Original file line number Diff line number Diff line change
Expand Up @@ -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:
Expand All @@ -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
Expand All @@ -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
Expand Down
2 changes: 1 addition & 1 deletion .release-please-manifest.json
Original file line number Diff line number Diff line change
@@ -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",
Expand Down
2 changes: 1 addition & 1 deletion amphora-common/pom.xml
Original file line number Diff line number Diff line change
Expand Up @@ -10,7 +10,7 @@
xsi:schemaLocation="http://maven.apache.org/POM/4.0.0 http://maven.apache.org/xsd/maven-4.0.0.xsd">
<modelVersion>4.0.0</modelVersion>
<artifactId>amphora-common</artifactId>
<version>0.1.0</version>
<version>0.1.0</version><!-- {x-version-update:amphora-common:current} -->
<parent>
<groupId>io.carbynestack</groupId>
<artifactId>amphora</artifactId>
Expand Down
1 change: 1 addition & 0 deletions amphora-common/versions.txt
Original file line number Diff line number Diff line change
@@ -0,0 +1 @@
amphora-common:0.1.0
2 changes: 1 addition & 1 deletion amphora-java-client/pom.xml
Original file line number Diff line number Diff line change
Expand Up @@ -10,7 +10,7 @@
xsi:schemaLocation="http://maven.apache.org/POM/4.0.0 http://maven.apache.org/xsd/maven-4.0.0.xsd">
<modelVersion>4.0.0</modelVersion>
<artifactId>amphora-java-client</artifactId>
<version>0.1.0</version>
<version>0.1.0</version><!-- {x-version-update:amphora-java-client:current} -->
<parent>
<groupId>io.carbynestack</groupId>
<artifactId>amphora</artifactId>
Expand Down
1 change: 1 addition & 0 deletions amphora-java-client/versions.txt
Original file line number Diff line number Diff line change
@@ -0,0 +1 @@
amphora-java-client:0.1.0
2 changes: 1 addition & 1 deletion amphora-parent/pom.xml
Original file line number Diff line number Diff line change
Expand Up @@ -11,7 +11,7 @@
<modelVersion>4.0.0</modelVersion>
<artifactId>amphora-parent</artifactId>
<groupId>io.carbynestack</groupId>
<version>0.1.0</version>
<version>0.1.0</version><!-- {x-version-update:amphora-parent:current} -->
<packaging>pom</packaging>
<licenses>
<license>
Expand Down
1 change: 1 addition & 0 deletions amphora-parent/versions.txt
Original file line number Diff line number Diff line change
@@ -0,0 +1 @@
amphora-parent:0.1.0
2 changes: 1 addition & 1 deletion amphora-service/pom.xml
Original file line number Diff line number Diff line change
Expand Up @@ -11,7 +11,7 @@
<artifactId>amphora-service</artifactId>
<name>Amphora Service</name>
<description>Amphora bucket/object store service.</description>
<version>0.1.0</version>
<version>0.1.0</version><!-- {x-version-update:amphora-service:current} -->
<parent>
<groupId>io.carbynestack</groupId>
<artifactId>amphora</artifactId>
Expand Down
1 change: 1 addition & 0 deletions amphora-service/versions.txt
Original file line number Diff line number Diff line change
@@ -0,0 +1 @@
amphora-service:0.1.0
16 changes: 16 additions & 0 deletions codecov.yaml
Original file line number Diff line number Diff line change
@@ -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/
10 changes: 5 additions & 5 deletions release-please-config.json
Original file line number Diff line number Diff line change
Expand Up @@ -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",
Expand Down

0 comments on commit ce39d98

Please sign in to comment.