[CI] Remove log-complete job in ci.yml

* Use gradle-build-action in ci-pr.yml
* Rename deploy-docs-antora.yml to deploy-docs-dispatcher-antora.yml
This commit is contained in:
Chris Bono
2023-10-01 22:30:58 -05:00
parent ffcca01079
commit 05162504e8
3 changed files with 8 additions and 35 deletions

View File

@@ -21,34 +21,19 @@ jobs:
if: github.repository == 'spring-projects/spring-pulsar'
runs-on: ubuntu-latest
steps:
- name: Checkout repo
uses: actions/checkout@v3
- name: Set up Java 17
uses: actions/setup-java@v3
- uses: actions/checkout@v3
- name: Set up gradle
uses: spring-io/spring-gradle-build-action@v2
with:
java-version: 17
distribution: temurin
- name: Setup Gradle user name
run: |
mkdir -p ~/.gradle
echo 'systemProp.user.name=spring-builds+github' >> ~/.gradle/gradle.properties
- name: Setup Gradle
uses: gradle/gradle-build-action@v2
env:
GRADLE_USER_HOME: ~/.gradle
- name: Build and run unit tests
run: |
./gradlew clean build -x integrationTest --continue --scan
- name: Create Aggregated Jacoco Report
if: contains(github.event.pull_request.labels.*.name, 'ci/upload-jacoco')
run: |
./gradlew aggregateJacocoTestReport --info
- name: Upload Aggregated Jacoco Report
if: contains(github.event.pull_request.labels.*.name, 'ci/upload-jacoco')
uses: actions/upload-artifact@v3
@@ -56,11 +41,9 @@ jobs:
name: jacoco-results
path: 'build/reports/jacoco/**/*.*'
retention-days: 3
- name: Run integration tests
run: |
./gradlew integrationTest --rerun-tasks -DdownloadRabbitConnector=true --scan
- name: Capture Test Results
if: failure()
uses: actions/upload-artifact@v3

View File

@@ -39,8 +39,8 @@ jobs:
# Extract version from gradle.properties
version=$(cat gradle.properties | grep "version=" | awk -F'=' '{print $2}')
echo "project_version=$version" >>$GITHUB_OUTPUT
build_jdk_17:
name: Build JDK 17
build_deploy_jdk_17:
name: Build and Deploy Artifacts (JDK 17)
needs: [prerequisites]
runs-on: ubuntu-latest
if: needs.prerequisites.outputs.runjobs
@@ -72,10 +72,9 @@ jobs:
ORG_GRADLE_PROJECT_signingPassword: ${{ secrets.GPG_PASSPHRASE }}
OSSRH_TOKEN_USERNAME: ${{ secrets.OSSRH_S01_TOKEN_USERNAME }}
OSSRH_TOKEN_PASSWORD: ${{ secrets.OSSRH_S01_TOKEN_PASSWORD }}
deploy_docs_antora:
name: Deploy Antora Docs
needs: [build_jdk_17]
needs: [build_deploy_jdk_17]
runs-on: ubuntu-latest
steps:
- uses: actions/checkout@v3
@@ -100,18 +99,9 @@ jobs:
context-root: spring-pulsar
cloudflare-zone-id: ${{ secrets.CLOUDFLARE_ZONE_ID }}
cloudflare-cache-token: ${{ secrets.CLOUDFLARE_CACHE_TOKEN }}
log_complete:
name: Log Complete
needs: [prerequisites, build_jdk_17, deploy_docs_antora]
runs-on: ubuntu-latest
steps:
- name: Echo completion message
run: |
echo "All complete!!"
perform_release:
name: Perform Release
needs: [prerequisites, build_jdk_17, deploy_docs_antora]
needs: [prerequisites, build_deploy_jdk_17, deploy_docs_antora]
runs-on: ubuntu-latest
permissions:
contents: write

View File

@@ -1,4 +1,4 @@
name: Deploy Docs (Antora)
name: Deploy Docs Dispatcher (Antora)
on:
# push:
# branches-ignore: [ gh-pages ]