From 110b809b7d584649aed31607a682bcdec16a0d6b Mon Sep 17 00:00:00 2001 From: Brian Clozel Date: Thu, 25 May 2023 19:15:32 +0200 Subject: [PATCH 1/3] Update CI pipeline --- ci/pipeline.yml | 47 ----------------------------------------------- 1 file changed, 47 deletions(-) diff --git a/ci/pipeline.yml b/ci/pipeline.yml index 4b7831cfe6..a35b12af4a 100644 --- a/ci/pipeline.yml +++ b/ci/pipeline.yml @@ -64,12 +64,6 @@ resource_types: <<: *docker-resource-source repository: dpb587/github-status-resource tag: master -- name: pull-request - type: registry-image - source: - <<: *docker-resource-source - repository: teliaoss/github-pr-resource - tag: v0.23.0 - name: slack-notification type: registry-image source: @@ -111,14 +105,6 @@ resources: username: ((artifactory-username)) password: ((artifactory-password)) build_name: ((build-name)) -- name: git-pull-request - type: pull-request - icon: source-pull - source: - access_token: ((github-ci-pull-request-token)) - repository: ((github-repo-name)) - base_branch: ((branch)) - ignore_paths: ["ci/*"] - name: repo-status-build type: github-status-resource icon: eye-check-outline @@ -259,37 +245,6 @@ jobs: <<: *slack-fail-params - put: repo-status-jdk20-build params: { state: "success", commit: "git-repo" } -- name: build-pull-requests - serial: true - public: true - plan: - - get: ci-image - - get: git-repo - resource: git-pull-request - trigger: true - version: every - - do: - - put: git-pull-request - params: - path: git-repo - status: pending - - task: build-pr - image: ci-image - file: git-repo/ci/tasks/build-pr.yml - privileged: true - timeout: ((task-timeout)) - params: - BRANCH: ((branch)) - on_success: - put: git-pull-request - params: - path: git-repo - status: success - on_failure: - put: git-pull-request - params: - path: git-repo - status: failure - name: stage-milestone serial: true plan: @@ -446,5 +401,3 @@ groups: jobs: ["stage-milestone", "stage-rc", "stage-release", "promote-milestone", "promote-rc", "promote-release", "create-github-release"] - name: "ci-images" jobs: ["build-ci-images"] -- name: "pull-requests" - jobs: [ "build-pull-requests" ] From 7c9f5d05db3996625986dffc20a68199987d27a0 Mon Sep 17 00:00:00 2001 From: Brian Clozel Date: Thu, 25 May 2023 20:07:50 +0200 Subject: [PATCH 2/3] Remove asciidoctor Gradle plugins This part of the build has been replaced with Antora. --- build.gradle | 2 -- 1 file changed, 2 deletions(-) diff --git a/build.gradle b/build.gradle index 3e6b0c1fc5..db9c78d92f 100644 --- a/build.gradle +++ b/build.gradle @@ -4,8 +4,6 @@ plugins { // kotlinVersion is managed in gradle.properties id 'org.jetbrains.kotlin.plugin.serialization' version "${kotlinVersion}" apply false id 'org.jetbrains.dokka' version '1.8.10' - id 'org.asciidoctor.jvm.convert' version '3.3.2' apply false - id 'org.asciidoctor.jvm.pdf' version '3.3.2' apply false id 'org.unbroken-dome.xjc' version '2.0.0' apply false id 'com.github.ben-manes.versions' version '0.46.0' id 'com.github.johnrengelman.shadow' version '8.1.1' apply false From 8fe21b8ef9cccbd821762d9289edce42427d0e0e Mon Sep 17 00:00:00 2001 From: Brian Clozel Date: Thu, 25 May 2023 20:12:04 +0200 Subject: [PATCH 3/3] Build Antora docs as part of CI check job This commit adds the "antora" task to the check-project script in order to check for documentation failures when pushing to the current branch. The actual documentation is build is performed on the docs-build branch. Closes gh-30528 --- ci/scripts/check-project.sh | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/ci/scripts/check-project.sh b/ci/scripts/check-project.sh index 6e57231f48..4eb582e368 100755 --- a/ci/scripts/check-project.sh +++ b/ci/scripts/check-project.sh @@ -5,5 +5,5 @@ source $(dirname $0)/common.sh pushd git-repo > /dev/null ./gradlew -Dorg.gradle.internal.launcher.welcomeMessageEnabled=false -Porg.gradle.java.installations.fromEnv=JDK17,JDK20 \ - -PmainToolchain=${MAIN_TOOLCHAIN} -PtestToolchain=${TEST_TOOLCHAIN} --no-daemon --max-workers=4 check + -PmainToolchain=${MAIN_TOOLCHAIN} -PtestToolchain=${TEST_TOOLCHAIN} --no-daemon --max-workers=4 check antora popd > /dev/null