Skip to content

Commit ed2ca04

Browse files
committed
Merge remote-tracking branch 'origin/main' into pfeifer/3683hidePackageOptionFix
# By Alexander Weigl (48) and others # Via GitHub (35) and others * origin/main: (117 commits) Add containsGenerics method to sort spotless look in top-level project.key for includes to allow for dl escapes in Java files Simplify Remove tokens file Fix inst with sort depending fn Fix parsing of proof files Fix proof loading/storing when generics are instantiated in NoFindTaclets Some documentation Fix test classes Slightly improve error messages Fix taclets for datatypes w/ polymorphic params Prepare datatype handling Spotless Finish example; slight fixes Fix fns and preds parsing; add test Fix SortDepFn and add test Start on polymorphic sorts and functions directly creating issues in Github inside KeY Bump the gradle-deps group across 1 directory with 9 updates ... # Conflicts: # key.core/src/main/java/de/uka/ilkd/key/pp/LogicPrinter.java
2 parents 590dbf2 + 8cc1e8e commit ed2ca04

748 files changed

Lines changed: 16051 additions & 11837 deletions

File tree

Some content is hidden

Large Commits have some content hidden by default. Use the searchbox below for content that may be hidden.

.github/workflows/gradle-publish.yml

Lines changed: 0 additions & 35 deletions
This file was deleted.

.github/workflows/javadoc.yml

Lines changed: 0 additions & 38 deletions
This file was deleted.
Lines changed: 68 additions & 13 deletions
Original file line numberDiff line numberDiff line change
@@ -1,4 +1,4 @@
1-
name: Nightly Deployer of Weekly Builds
1+
name: Weekly Builds of KeY
22

33
on:
44
workflow_dispatch:
@@ -9,32 +9,65 @@ permissions:
99
contents: write
1010
id-token: write
1111

12+
env:
13+
JAVA_VERSION: 21
14+
1215

1316
jobs:
14-
deploy:
17+
build:
1518
runs-on: ubuntu-latest
1619
steps:
17-
# weigl: Should produce fancier release notes, but needs some configuration
18-
# # https://github.com/marketplace/actions/release-changelog-builder
19-
# - name: "Build Changelog"
20-
# id: build_changelog
21-
# uses: mikepenz/release-changelog-builder-action@v3.7.0
22-
# with:
23-
# ignorePreReleases: true
24-
# fetchReviewers: true
25-
2620
- uses: actions/checkout@v6
27-
- name: Set up JDK 21
21+
- name: Set up JDK ${{ env.JAVA_VERSION }}
2822
uses: actions/setup-java@v5
2923
with:
30-
java-version: 21
24+
java-version: ${{ env.JAVA_VERSION }}
3125
distribution: 'temurin'
26+
cache: 'gradle'
3227

3328
- name: Setup Gradle
3429
uses: gradle/actions/setup-gradle@v5
30+
3531
- name: Build with Gradle
3632
run: ./gradlew --parallel assemble
3733

34+
doc:
35+
needs: [build]
36+
runs-on: ubuntu-latest
37+
steps:
38+
- uses: actions/checkout@v6
39+
- name: Set up JDK ${{ env.JAVA_VERSION }}
40+
uses: actions/setup-java@v5
41+
with:
42+
java-version: ${{ env.JAVA_VERSION }}
43+
distribution: 'temurin'
44+
cache: 'gradle'
45+
46+
- name: Setup Gradle
47+
uses: gradle/actions/setup-gradle@v5
48+
49+
- name: Build Documentation with Gradle
50+
run: ./gradlew alldoc
51+
52+
- name: Package
53+
run: tar cvf key-javadoc.tar.xz build/docs/javadoc
54+
55+
deploy:
56+
needs: [build, doc]
57+
runs-on: ubuntu-latest
58+
steps:
59+
- name: Upload Javadoc
60+
uses: actions/upload-artifact@v7
61+
with:
62+
name: javadoc
63+
path: "javadoc.tar.xz"
64+
65+
- name: Upload ShadowJar
66+
uses: actions/upload-artifact@v7
67+
with:
68+
name: shadowjars
69+
path: "*/build/libs/*-exe.jar"
70+
3871
- name: Delete previous nightly release
3972
continue-on-error: true
4073
env:
@@ -50,3 +83,25 @@ jobs:
5083
gh release create --generate-notes --title "Nightly Release" \
5184
--prerelease --notes-start-tag KEY-2.12.3 \
5285
nightly key.ui/build/libs/key-*-exe.jar
86+
87+
deploy-maven:
88+
needs: [ build, doc ]
89+
runs-on: ubuntu-latest
90+
steps:
91+
- uses: actions/checkout@v6
92+
- name: Set up JDK ${{ env.JAVA_VERSION }}
93+
uses: actions/setup-java@v5
94+
with:
95+
java-version: ${{ env.JAVA_VERSION }}
96+
distribution: 'temurin'
97+
cache: 'gradle'
98+
99+
- name: Setup Gradle
100+
uses: gradle/actions/setup-gradle@v5
101+
102+
- name: Upload to SNAPSHOT repository
103+
run: ./gradlew publishMavenJavaPublicationToKEYLABRepository
104+
env:
105+
BUILD_NUMBER: "SNAPSHOT"
106+
GITLAB_DEPLOY_TOKEN: ${{ secrets.GITLAB_DEPLOY_TOKEN }}
107+

.github/workflows/opttest.yml

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -30,7 +30,7 @@ jobs:
3030
run: ./gradlew --continue ${{ matrix.tests }}
3131

3232
- name: Upload test results
33-
uses: actions/upload-artifact@v6
33+
uses: actions/upload-artifact@v7
3434
if: success() || failure()
3535
with:
3636
name: test-results-${{ matrix.tests }}

.github/workflows/sonarqube.yml

Lines changed: 0 additions & 49 deletions
This file was deleted.

.github/workflows/tests.yml

Lines changed: 3 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -61,7 +61,7 @@ jobs:
6161
run: ./gradlew --continue -DjacocoEnabled=true :${{ matrix.modules }}:test
6262

6363
- name: Upload test results
64-
uses: actions/upload-artifact@v6
64+
uses: actions/upload-artifact@v7
6565
if: success() || failure()
6666
with:
6767
name: test-results-${{ matrix.os }}-${{ matrix.modules }}
@@ -80,7 +80,7 @@ jobs:
8080
strategy:
8181
fail-fast: false
8282
matrix:
83-
test: [ testProveRules, testRunAllFunProofs, testRunAllInfProofs ]
83+
test: [ testProveRules, testRunAllFunProofs, testRunAllInfProofs, testRunAllWdProofs ]
8484
os: [ ubuntu-latest ]
8585
java: [ 21 ]
8686
runs-on: ${{ matrix.os }}
@@ -102,7 +102,7 @@ jobs:
102102
run: ./gradlew --continue ${{ matrix.test }}
103103

104104
- name: Upload test results
105-
uses: actions/upload-artifact@v6
105+
uses: actions/upload-artifact@v7
106106
if: success() || failure() # run this step even if previous step failed
107107
with:
108108
name: test-results-${{ matrix.test }}

.github/workflows/tests_winmac.yml

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -46,7 +46,7 @@ jobs:
4646
run: ./gradlew --continue -x :key.core.symbolic_execution:test -x :key.core.proof_references:test test
4747

4848
- name: Upload test results
49-
uses: actions/upload-artifact@v6
49+
uses: actions/upload-artifact@v7
5050
if: success() || failure()
5151
with:
5252
name: unit-test-results-${{matrix.test}}-${{ matrix.os }}-${{ matrix.java }}
@@ -86,7 +86,7 @@ jobs:
8686
run: ./gradlew --continue ${{ matrix.test }}
8787

8888
- name: Upload test results
89-
uses: actions/upload-artifact@v6
89+
uses: actions/upload-artifact@v7
9090
if: success() || failure() # run this step even if a previous step failed
9191
with:
9292
name: integration-test-results-${{matrix.test}}-${{ matrix.os }}-${{ matrix.java }}

0 commit comments

Comments
 (0)