Skip to content

Commit 50f7a5d

Browse files
zantvoortzantvoort
committed
Fix CI.
Relates to #60
1 parent 29804fa commit 50f7a5d

9 files changed

Lines changed: 54 additions & 10 deletions

File tree

‎.github/workflows/ci.yml‎

Lines changed: 6 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -6,6 +6,10 @@ on:
66
pull_request:
77
branches: [ main ]
88

9+
permissions:
10+
id-token: write
11+
contents: read
12+
913
jobs:
1014
build:
1115
runs-on: ubuntu-latest
@@ -29,8 +33,8 @@ jobs:
2933

3034
- name: Upload coverage to Codecov
3135
if: github.event_name == 'push' || github.event.pull_request.head.repo.full_name == github.repository
32-
uses: codecov/codecov-action@v4
36+
uses: codecov/codecov-action@v5
3337
with:
34-
token: ${{ secrets.CODECOV_TOKEN }}
38+
use_oidc: true
3539
flags: unittests
3640
fail_ci_if_error: false

‎.github/workflows/docs.yml‎

Lines changed: 0 additions & 8 deletions
Original file line numberDiff line numberDiff line change
@@ -46,14 +46,6 @@ jobs:
4646
-Dmaven.javadoc.failOnError=false \
4747
-Dadditionaloption="--enable-preview --source 21"
4848
49-
- name: Generate KDoc (Dokka)
50-
run: |
51-
for module in storm-kotlin storm-kotlin-spring storm-kotlin-spring-boot-starter storm-kotlin-validator storm-metamodel-ksp storm-kotlinx-serialization; do
52-
if [ -d "$module" ]; then
53-
mvn dokka:dokka -pl "$module" -q -Dmaven.javadoc.failOnError=false || true
54-
fi
55-
done
56-
5749
- name: Copy Javadoc to website/static/api/java
5850
run: |
5951
mkdir -p website/static/api/java

‎storm-kotlin-spring-boot-starter/pom.xml‎

Lines changed: 6 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -173,9 +173,15 @@
173173
<version>2.0.0</version>
174174
<executions>
175175
<execution>
176+
<id>javadoc-jar</id>
176177
<phase>prepare-package</phase>
177178
<goals><goal>javadocJar</goal></goals>
178179
</execution>
180+
<execution>
181+
<id>dokka-html</id>
182+
<phase>prepare-package</phase>
183+
<goals><goal>dokka</goal></goals>
184+
</execution>
179185
</executions>
180186
</plugin>
181187
</plugins>

‎storm-kotlin-spring/pom.xml‎

Lines changed: 6 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -145,9 +145,15 @@
145145
<version>2.0.0</version>
146146
<executions>
147147
<execution>
148+
<id>javadoc-jar</id>
148149
<phase>prepare-package</phase>
149150
<goals><goal>javadocJar</goal></goals>
150151
</execution>
152+
<execution>
153+
<id>dokka-html</id>
154+
<phase>prepare-package</phase>
155+
<goals><goal>dokka</goal></goals>
156+
</execution>
151157
</executions>
152158
</plugin>
153159
</plugins>

‎storm-kotlin-validator/pom.xml‎

Lines changed: 6 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -176,9 +176,15 @@
176176
<version>2.0.0</version>
177177
<executions>
178178
<execution>
179+
<id>javadoc-jar</id>
179180
<phase>prepare-package</phase>
180181
<goals><goal>javadocJar</goal></goals>
181182
</execution>
183+
<execution>
184+
<id>dokka-html</id>
185+
<phase>prepare-package</phase>
186+
<goals><goal>dokka</goal></goals>
187+
</execution>
182188
</executions>
183189
</plugin>
184190
</plugins>

‎storm-kotlin/pom.xml‎

Lines changed: 6 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -141,9 +141,15 @@
141141
<version>2.0.0</version>
142142
<executions>
143143
<execution>
144+
<id>javadoc-jar</id>
144145
<phase>prepare-package</phase>
145146
<goals><goal>javadocJar</goal></goals>
146147
</execution>
148+
<execution>
149+
<id>dokka-html</id>
150+
<phase>prepare-package</phase>
151+
<goals><goal>dokka</goal></goals>
152+
</execution>
147153
</executions>
148154
</plugin>
149155
</plugins>

‎storm-kotlinx-serialization/pom.xml‎

Lines changed: 6 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -150,9 +150,15 @@
150150
<version>2.0.0</version>
151151
<executions>
152152
<execution>
153+
<id>javadoc-jar</id>
153154
<phase>prepare-package</phase>
154155
<goals><goal>javadocJar</goal></goals>
155156
</execution>
157+
<execution>
158+
<id>dokka-html</id>
159+
<phase>prepare-package</phase>
160+
<goals><goal>dokka</goal></goals>
161+
</execution>
156162
</executions>
157163
</plugin>
158164
</plugins>

‎storm-metamodel-ksp/pom.xml‎

Lines changed: 6 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -152,9 +152,15 @@
152152
<version>2.0.0</version>
153153
<executions>
154154
<execution>
155+
<id>javadoc-jar</id>
155156
<phase>prepare-package</phase>
156157
<goals><goal>javadocJar</goal></goals>
157158
</execution>
159+
<execution>
160+
<id>dokka-html</id>
161+
<phase>prepare-package</phase>
162+
<goals><goal>dokka</goal></goals>
163+
</execution>
158164
</executions>
159165
</plugin>
160166
</plugins>

‎storm-spring-boot-starter/pom.xml‎

Lines changed: 12 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -84,6 +84,18 @@
8484
</argLine>
8585
</configuration>
8686
</plugin>
87+
<plugin>
88+
<groupId>org.apache.maven.plugins</groupId>
89+
<artifactId>maven-jar-plugin</artifactId>
90+
<version>3.3.0</version>
91+
<configuration>
92+
<archive>
93+
<manifestEntries>
94+
<Automatic-Module-Name>st.orm.spring.boot.starter</Automatic-Module-Name>
95+
</manifestEntries>
96+
</archive>
97+
</configuration>
98+
</plugin>
8799
</plugins>
88100
</build>
89101
<dependencies>

0 commit comments

Comments
 (0)