diff --git a/.github/workflows/maven-build.yml b/.github/workflows/maven-build.yml index cd59239a8a..c4b8794a25 100644 --- a/.github/workflows/maven-build.yml +++ b/.github/workflows/maven-build.yml @@ -1,6 +1,6 @@ name: CI -on: +on: push: branches: - main @@ -36,7 +36,7 @@ jobs: - name: Maven Install (skipTests) env: MAVEN_OPTS: ${{ env.JAVA_11_PLUS_MAVEN_OPTS }} - run: mvn -B clean install -DskipTests --file pom.xml + run: mvn -B clean install -DskipTests -Djapicmp.skip --file pom.xml site: name: site (Java ${{ matrix.java }}) runs-on: ubuntu-latest @@ -55,7 +55,7 @@ jobs: - name: Maven Site env: MAVEN_OPTS: ${{ env.JAVA_11_PLUS_MAVEN_OPTS }} - run: mvn -B clean site -D enable-ci --file pom.xml + run: mvn -B clean site -D enable-ci -Djapicmp.skip --file pom.xml test-8: name: test (${{ matrix.os }}, Java 8) runs-on: ${{ matrix.os }}-latest @@ -75,7 +75,7 @@ jobs: # JDK 8 - name: Maven Install with Code Coverage run: mvn -B clean install -D enable-ci -Djapicmp.skip --file pom.xml - - name: Codecov Report + - name: Codecov Report uses: codecov/codecov-action@v3.1.0 test: name: test (${{ matrix.os }}, Java ${{ matrix.java }}) @@ -103,4 +103,4 @@ jobs: if: matrix.os != 'windows' env: MAVEN_OPTS: ${{ env.JAVA_11_PLUS_MAVEN_OPTS }} - run: mvn -B clean install -D enable-ci --file pom.xml "-Dsurefire.argLine=--add-opens java.base/java.net=ALL-UNNAMED" + run: mvn -B clean install -D enable-ci -Djapicmp.skip --file pom.xml "-Dsurefire.argLine=--add-opens java.base/java.net=ALL-UNNAMED" diff --git a/.github/workflows/release.yml b/.github/workflows/release.yml new file mode 100644 index 0000000000..2fb0f17d56 --- /dev/null +++ b/.github/workflows/release.yml @@ -0,0 +1,58 @@ +# This workflow will build a Java project with Maven +# For more information see: https://help.github.com/actions/language-and-framework-guides/building-and-testing-java-with-maven + +name: Release + +on: + workflow_dispatch: + +jobs: + release: + runs-on: ubuntu-latest + steps: + - name: Check out source + uses: actions/checkout@v3 + with: + token: ${{ secrets.FORESIGHT_GITHUB_TOKEN }} + + - name: Set up JDK + uses: actions/setup-java@v3 + with: + java-version: 8 + distribution: 'adopt' + cache: 'maven' + + - name: Configure CI Git User + run: | + git config --global user.email "action@github.com" + git config --global user.name "GitHub Action" + + - name: Configure Maven settings.xml + uses: whelk-io/maven-settings-xml-action@v14 + with: + repositories: >- + [ + { + "id": "foresight-3rdparty-releases", + "url": "https://repo.thundra.io/content/repositories/foresight-3rdparty-releases", + "releases": { + "enabled": "true" + }, + "snapshots": { + "enabled": "false" + } + } + ] + servers: >- + [ + { + "id": "foresight-3rdparty-releases", + "username": "${{ secrets.THUNDRA_INTERNAL_REPO_USERNAME}}", + "password": "${{ secrets.THUNDRA_INTERNAL_REPO_PASSWORD}}" + } + ] + + - name: Build and Release with Maven + env: + GITHUB_TOKEN: ${{ secrets.FORESIGHT_GITHUB_TOKEN }} + run: mvn clean install -DskipTests -Darguments=-DskipTests release:clean release:prepare release:perform release:clean --batch-mode -P foresight-release diff --git a/.github/workflows/snapshot.yml b/.github/workflows/snapshot.yml new file mode 100644 index 0000000000..e87f531462 --- /dev/null +++ b/.github/workflows/snapshot.yml @@ -0,0 +1,58 @@ +# This workflow will build a Java project with Maven +# For more information see: https://help.github.com/actions/language-and-framework-guides/building-and-testing-java-with-maven + +name: Snapshot + +on: + workflow_dispatch: + +jobs: + snapshot: + runs-on: ubuntu-latest + steps: + - name: Check out source + uses: actions/checkout@v3 + with: + token: ${{ secrets.FORESIGHT_GITHUB_TOKEN }} + + - name: Set up JDK + uses: actions/setup-java@v3 + with: + java-version: 8 + distribution: 'adopt' + cache: 'maven' + + - name: Configure CI Git User + run: | + git config --global user.email "action@github.com" + git config --global user.name "GitHub Action" + + - name: Configure Maven settings.xml + uses: whelk-io/maven-settings-xml-action@v14 + with: + repositories: >- + [ + { + "id": "foresight-3rdparty-snapshots", + "url": "https://repo.thundra.io/content/repositories/foresight-3rdparty-snapshots", + "releases": { + "enabled": "false" + }, + "snapshots": { + "enabled": "true" + } + } + ] + servers: >- + [ + { + "id": "foresight-3rdparty-snapshots", + "username": "${{ secrets.THUNDRA_INTERNAL_REPO_USERNAME }}", + "password": "${{ secrets.THUNDRA_INTERNAL_REPO_PASSWORD }}" + } + ] + + - name: Build and Release Snapshot with Maven + env: + GITHUB_TOKEN: ${{ secrets.FORESIGHT_GITHUB_TOKEN }} + run: mvn clean install -DskipTests -Darguments=-DskipTests deploy --batch-mode -P foresight-release diff --git a/.gitignore b/.gitignore index 543ce576cd..d531387f3f 100644 --- a/.gitignore +++ b/.gitignore @@ -11,3 +11,4 @@ target dependency-reduced-pom.xml .factorypath .vscode/settings.json +release.properties diff --git a/pom.xml b/pom.xml index 9682964cbb..2fd0ab762f 100644 --- a/pom.xml +++ b/pom.xml @@ -1,16 +1,15 @@ 4.0.0 - org.kohsuke + com.runforesight github-api - 1.312-SNAPSHOT + 1.312.4-SNAPSHOT GitHub API for Java - https://github-api.kohsuke.org/ GitHub API for Java - scm:git:git@github.com/hub4j/${project.artifactId}.git - scm:git:ssh://git@github.com/hub4j/${project.artifactId}.git - https://github.com/hub4j/github-api/ + scm:git:https://${GITHUB_TOKEN}@github.com/runforesight/${project.artifactId}.git + scm:git:https://${GITHUB_TOKEN}@github.com/runforesight/${project.artifactId}.git + https://github.com/runforesight/github-api HEAD @@ -215,8 +214,6 @@ maven-javadoc-plugin 3.4.1 - 8 - true all @@ -874,7 +871,91 @@ - + + foresight-release + + + foresight-3rdparty-releases + Releases + https://repo.thundra.io/content/repositories/foresight-3rdparty-releases/ + + + foresight-3rdparty-snapshots + Snapshots + https://repo.thundra.io/content/repositories/foresight-3rdparty-snapshots/ + true + + + github-pages + gitsite:git@github.com/runforesight/${project.artifactId}.git + + + + + + org.jacoco + jacoco-maven-plugin + + + org.apache.maven.plugins + maven-gpg-plugin + + + sign-artifacts + none + + sign + + + + --pinentry-mode + loopback + + + + + + + org.sonatype.plugins + nexus-staging-maven-plugin + 1.6.13 + false + + + com.github.siom79.japicmp + japicmp-maven-plugin + 0.16.0 + + true + + + + org.apache.maven.plugins + maven-source-plugin + + + attach-sources + + jar-no-fork + + + + + + org.apache.maven.plugins + maven-javadoc-plugin + + + attach-javadocs + + jar + + + + + + + diff --git a/src/main/java/org/kohsuke/github/GHWorkflowRun.java b/src/main/java/org/kohsuke/github/GHWorkflowRun.java index 3ca37af8ed..70519bc719 100644 --- a/src/main/java/org/kohsuke/github/GHWorkflowRun.java +++ b/src/main/java/org/kohsuke/github/GHWorkflowRun.java @@ -51,6 +51,7 @@ public class GHWorkflowRun extends GHObject { private HeadCommit headCommit; private String event; + private String displayTitle; private String status; private String conclusion; @@ -224,6 +225,15 @@ public GHEvent getEvent() { return EnumUtils.getNullableEnumOrDefault(GHEvent.class, event, GHEvent.UNKNOWN); } + /** + * The display title. + * + * @return the display title + */ + public String getDisplayTitle() { + return displayTitle; + } + /** * Gets status of the workflow run. *

diff --git a/src/test/java/org/kohsuke/github/GHEventPayloadTest.java b/src/test/java/org/kohsuke/github/GHEventPayloadTest.java index c612a700c4..bd50092919 100644 --- a/src/test/java/org/kohsuke/github/GHEventPayloadTest.java +++ b/src/test/java/org/kohsuke/github/GHEventPayloadTest.java @@ -1053,6 +1053,7 @@ public void workflow_run() throws Exception { assertThat(workflowRun.getHeadSha(), is("dbea8d8b6ed2cf764dfd84a215f3f9040b3d4423")); assertThat(workflowRun.getRunNumber(), is(6L)); assertThat(workflowRun.getEvent(), is(GHEvent.WORKFLOW_DISPATCH)); + assertThat(workflowRun.getDisplayTitle(), is("Update README.md")); assertThat(workflowRun.getStatus(), is(GHWorkflowRun.Status.COMPLETED)); assertThat(workflowRun.getConclusion(), is(GHWorkflowRun.Conclusion.SUCCESS)); assertThat(workflowRun.getWorkflowId(), is(7087581L)); diff --git a/src/test/resources/org/kohsuke/github/GHEventPayloadTest/workflow_run.json b/src/test/resources/org/kohsuke/github/GHEventPayloadTest/workflow_run.json index 2aecb178c3..7502452c64 100644 --- a/src/test/resources/org/kohsuke/github/GHEventPayloadTest/workflow_run.json +++ b/src/test/resources/org/kohsuke/github/GHEventPayloadTest/workflow_run.json @@ -8,6 +8,7 @@ "head_sha": "dbea8d8b6ed2cf764dfd84a215f3f9040b3d4423", "run_number": 6, "event": "workflow_dispatch", + "display_title": "Update README.md", "status": "completed", "conclusion": "success", "workflow_id": 7087581,