Skip to content

Commit 6f8e447

Browse files
committed
fix: remove spotless from renovate tracking, fix workflow line merge
Signed-off-by: Gregor Zeitlinger <gregor.zeitlinger@grafana.com>
1 parent 0eab74d commit 6f8e447

2 files changed

Lines changed: 3 additions & 4 deletions

File tree

.github/renovate-tracked-deps.json

Lines changed: 0 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -148,7 +148,6 @@
148148
},
149149
"integration-tests/it-spring-boot-smoke-test/pom.xml": {
150150
"maven": [
151-
"com.diffplug.spotless:spotless-maven-plugin",
152151
"io.prometheus:it-common",
153152
"io.prometheus:prometheus-metrics-bom",
154153
"org.junit:junit-bom",
@@ -413,7 +412,6 @@
413412
},
414413
"prometheus-metrics-parent/pom.xml": {
415414
"maven": [
416-
"com.diffplug.spotless:spotless-maven-plugin",
417415
"org.apache.maven.plugins:maven-gpg-plugin",
418416
"org.apache.maven.plugins:maven-source-plugin",
419417
"org.sonatype.central:central-publishing-maven-plugin"

.github/workflows/java-version-matrix-tests.yml

Lines changed: 3 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -50,8 +50,9 @@ jobs:
5050
- name: Install parent POMs
5151
run: |
5252
cd integration-tests
53-
mise exec -- ../mvnw clean install -N cd it-exporter
54-
mise exec -- ../../mvnw install -N
53+
mise exec -- ../mvnw clean install -N
54+
cd it-exporter
55+
mise exec -- ../../mvnw install -N
5556
- name: Rebuild sample apps targeting Java ${{ matrix.java-version }}
5657
run: |
5758
cd integration-tests

0 commit comments

Comments
 (0)