Skip to content

Commit a8553d6

Browse files
committed
add deployment to our gitlab server
1 parent afe3c70 commit a8553d6

File tree

3 files changed

+30
-34
lines changed

3 files changed

+30
-34
lines changed

.github/workflows/nightlydeploy.yml

Lines changed: 16 additions & 24 deletions
Original file line numberDiff line numberDiff line change
@@ -17,17 +17,8 @@ jobs:
1717
build:
1818
runs-on: ubuntu-latest
1919
steps:
20-
# weigl: Should produce fancier release notes, but needs some configuration
21-
# # https://github.com/marketplace/actions/release-changelog-builder
22-
# - name: "Build Changelog"
23-
# id: build_changelog
24-
# uses: mikepenz/release-changelog-builder-action@v3.7.0
25-
# with:
26-
# ignorePreReleases: true
27-
# fetchReviewers: true
28-
2920
- uses: actions/checkout@v6
30-
- name: Set up JDK 21
21+
- name: Set up JDK ${{ env.JAVA_VERSION }}
3122
uses: actions/setup-java@v5
3223
with:
3324
java-version: ${{ env.JAVA_VERSION }}
@@ -36,23 +27,24 @@ jobs:
3627

3728
- name: Setup Gradle
3829
uses: gradle/actions/setup-gradle@v5
30+
3931
- name: Build with Gradle
4032
run: ./gradlew --parallel assemble
4133

4234
doc:
4335
needs: [build]
4436
runs-on: ubuntu-latest
4537
steps:
46-
- uses: actions/checkout@v4
47-
- name: Set up JDK 21
48-
uses: actions/setup-java@v4
38+
- uses: actions/checkout@v6
39+
- name: Set up JDK ${{ env.JAVA_VERSION }}
40+
uses: actions/setup-java@v5
4941
with:
5042
java-version: ${{ env.JAVA_VERSION }}
51-
distribution: 'corretto'
43+
distribution: 'temurin'
5244
cache: 'gradle'
5345

5446
- name: Setup Gradle
55-
uses: gradle/actions/setup-gradle@v4
47+
uses: gradle/actions/setup-gradle@v5
5648

5749
- name: Build Documentation with Gradle
5850
run: ./gradlew alldoc
@@ -65,13 +57,13 @@ jobs:
6557
runs-on: ubuntu-latest
6658
steps:
6759
- name: Upload Javadoc
68-
uses: actions/upload-artifact@v4
60+
uses: actions/upload-artifact@v6
6961
with:
7062
name: javadoc
7163
path: "javadoc.tar.xz"
7264

7365
- name: Upload ShadowJar
74-
uses: actions/upload-artifact@v4
66+
uses: actions/upload-artifact@v6
7567
with:
7668
name: shadowjars
7769
path: "*/build/libs/*-exe.jar"
@@ -96,20 +88,20 @@ jobs:
9688
needs: [ build, doc ]
9789
runs-on: ubuntu-latest
9890
steps:
99-
- uses: actions/checkout@v4
100-
- name: Set up JDK 21
101-
uses: actions/setup-java@v4
91+
- uses: actions/checkout@v6
92+
- name: Set up JDK ${{ env.JAVA_VERSION }}
93+
uses: actions/setup-java@v5
10294
with:
10395
java-version: ${{ env.JAVA_VERSION }}
10496
distribution: 'temurin'
10597
cache: 'gradle'
10698

10799
- name: Setup Gradle
108-
uses: gradle/actions/setup-gradle@v4
100+
uses: gradle/actions/setup-gradle@v5
109101

110102
- name: Upload to SNAPSHOT repository
111-
run: ./gradlew publishToCentral
103+
run: ./gradlew publishMavenJavaPublicationToKEYLABRepository
112104
env:
113105
BUILD_NUMBER: "SNAPSHOT"
114-
ossrhUsername: ${{ secrets.MAVEN_CENTRAL_USER }}
115-
ossrhPassword: ${{ secrets.MAVEN_CENTRAL_PASSWORD }}
106+
GITLAB_DEPLOY_TOKEN: ${{ secrets.GITLAB_DEPLOY_TOKEN }}
107+

build.gradle

Lines changed: 13 additions & 9 deletions
Original file line numberDiff line numberDiff line change
@@ -332,15 +332,19 @@ subprojects {
332332
name = "KEYLAB"
333333
url = uri("https://git.key-project.org/api/v4/projects/35/packages/maven")
334334
credentials(HttpHeaderCredentials) {
335-
// Gitlab supports three kinds of token.
336-
if (System.getenv("TOKEN") != null) {
337-
// Support for user token
335+
def userToken = envOrPropertyValue("GITLAB_USER_TOKEN")
336+
def deployToken = envOrPropertyValue("GITLAB_DEPLOY_TOKEN")
337+
def ciToken = envOrPropertyValue("GITLAB_CIJOB_TOKEN")
338+
339+
if (userToken != "") {
338340
name = 'Private-Token'
339-
value = envOrPropertyValue("TOKEN")
340-
} else {
341-
// Support for Gitlab CI
341+
value = userToken
342+
} else if(deployToken != "") {
343+
name = 'Deploy-Token'
344+
value = deployToken
345+
} else {
342346
name = 'Job-Token'
343-
value = envOrPropertyValue("CI_JOB_TOKEN")
347+
value = ciToken
344348
}
345349
}
346350
authentication {
@@ -418,7 +422,7 @@ tasks.register('alldoc', Javadoc){
418422
//stylesheetFile = new File( projectDir, 'src/javadoc/stylesheet.css' )
419423
windowTitle = 'KeY API Documentation'
420424
docTitle = "KeY JavaDoc ($project.version) -- ${getDate()}"
421-
bottom = "Copyright &copy; 2003-2025 <a href=\"http://key-project.org\">The KeY-Project</a>."
425+
bottom = "Copyright &copy; 2003-2026 <a href=\"http://key-project.org\">The KeY-Project</a>."
422426
use = true
423427
links += "https://docs.oracle.com/en/java/javase/21/docs/api/"
424428
links += "https://www.antlr.org/api/Java/"
@@ -446,6 +450,6 @@ def envOrPropertyValue(String key) {
446450
if(key in System.getenv()) {
447451
return System.getenv(key)
448452
}else{
449-
return project.properties.getOrDefault(key, "$key-not-found")
453+
return project.properties.getOrDefault(key, "")
450454
}
451455
}

key.core/src/main/java/de/uka/ilkd/key/logic/ClashFreeSubst.java

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -187,7 +187,7 @@ private void applyOnSubterm1(int varInd, ImmutableArray<QuantifiableVariable> bo
187187
* <code>subTerm</code>, but does not occurr in <code>boundVars</code>.
188188
*
189189
* @return true if <code>subTerm</code> bound by <code>boundVars</code> would change under
190-
* application of this substitution
190+
* application of this substitution
191191
*/
192192
protected boolean subTermChanges(ImmutableArray<QuantifiableVariable> boundVars,
193193
JTerm subTerm) {

0 commit comments

Comments
 (0)