Skip to content

Commit eb4187c

Browse files
committed
Update CI
1 parent 6e986cc commit eb4187c

File tree

3 files changed

+3
-17
lines changed

3 files changed

+3
-17
lines changed

.github/workflows/build-and-publish.yaml

+1-2
Original file line numberDiff line numberDiff line change
@@ -8,7 +8,7 @@ on:
88
jobs:
99
build-and-publish:
1010
name: Java Gradle
11-
uses: bakdata/ci-templates/.github/workflows/java-gradle-plugin.yaml@1.42.0
11+
uses: bakdata/ci-templates/.github/workflows/java-gradle-plugin.yaml@1.43.0
1212
secrets:
1313
sonar-token: ${{ secrets.SONARCLOUD_TOKEN }}
1414
sonar-organization: ${{ secrets.SONARCLOUD_ORGANIZATION }}
@@ -19,5 +19,4 @@ jobs:
1919
ossrh-username: ${{ secrets.SONATYPE_OSSRH_USERNAME }}
2020
gradle-publish-key: ${{ secrets.GRADLE_PLUGIN_PUBLISH_KEY }}
2121
gradle-publish-secret: ${{ secrets.GRADLE_PLUGIN_PUBLISH_SECRET }}
22-
github-username: ${{ secrets.GH_USERNAME }}
2322
github-token: ${{ secrets.GH_TOKEN }}

.github/workflows/release.yaml

+1-1
Original file line numberDiff line numberDiff line change
@@ -16,7 +16,7 @@ on:
1616
jobs:
1717
java-gradle-release:
1818
name: Java Gradle
19-
uses: bakdata/ci-templates/.github/workflows/java-gradle-release.yaml@1.42.0
19+
uses: bakdata/ci-templates/.github/workflows/java-gradle-release.yaml@1.43.0
2020
with:
2121
release-type: "${{ inputs.release-type }}"
2222

build.gradle.kts

+1-14
Original file line numberDiff line numberDiff line change
@@ -1,10 +1,9 @@
11
plugins {
22
// release
3-
id("net.researchgate.release") version "3.0.2"
3+
id("com.bakdata.sonar") version "1.3.0"
44
// eat your own dog food - apply the plugins to this plugin project
55
id("com.bakdata.sonar") version "1.1.17"
66
id("com.bakdata.sonatype") version "1.2.2"
7-
id("org.hildan.github.changelog") version "1.13.1"
87
id("org.gradle.kotlin.kotlin-dsl") version "2.1.6" apply false
98
id("com.gradle.plugin-publish") version "1.2.1" apply false
109
}
@@ -38,12 +37,6 @@ configure<com.bakdata.gradle.SonatypeSettings> {
3837
}
3938
}
4039

41-
configure<org.hildan.github.changelog.plugin.GitHubChangelogExtension> {
42-
githubUser = "bakdata"
43-
futureVersionTag = findProperty("changelog.releaseVersion")?.toString()
44-
sinceTag = findProperty("changelog.sinceTag")?.toString()
45-
}
46-
4740
subprojects {
4841
apply(plugin = "java")
4942

@@ -88,11 +81,5 @@ subprojects {
8881
}
8982
}
9083

91-
release {
92-
git {
93-
requireBranch.set("master")
94-
}
95-
}
96-
9784
val sonarqube by tasks
9885
sonarqube.enabled = false //FIXME requires Java 17

0 commit comments

Comments
 (0)