Sync Fork

.github/workflows/ci.yml

@@ -10,88 +10,49 @@ on:
 
 jobs:
 
-  # build and test, then upload logs if failure
   build:
     runs-on: ubuntu-latest
-
     steps:
     - uses: actions/checkout@v4.2.2
-    - name: Setup JDK
-      uses: actions/setup-java@v4.7.0
+    - name: Spring Gradle Build Action
+      uses: spring-io/spring-gradle-build-action@v2
       with:
-        distribution: adopt
-        java-version: 17
-        cache: gradle
+        java-version: '17'
+        distribution: 'temurin'
     - name: Build with Gradle
-      run: ./gradlew build
-      env:
-        GRADLE_ENTERPRISE_CACHE_USERNAME: ${{ secrets.GRADLE_ENTERPRISE_CACHE_USER }}
-        GRADLE_ENTERPRISE_CACHE_PASSWORD: ${{ secrets.GRADLE_ENTERPRISE_CACHE_PASSWORD }}
-        GRADLE_ENTERPRISE_ACCESS_KEY: ${{ secrets.GRADLE_ENTERPRISE_SECRET_ACCESS_KEY }}
-    - name: Tar Build Logs
-      if: ${{ failure() }}
-      run: |
-        mkdir -p build
-        tar \
-          -zc \
-          --ignore-failed-read \
-          --file build/buildlogs.tar.gz \
-          */build/reports \
-          */*/build/reports
-    - name: Upload Build Logs
-      if: ${{ failure() }}
-      uses: actions/upload-artifact@v4.6.0
-      with:
-        name: buildlogs
-        path: build/buildlogs.tar.gz
+      run: ./gradlew -Dmaven.repo.local=$(pwd)/deployment-repository clean build distZip publishToMavenLocal
 
-  # if build job succeed, build without tests and publish
-  publish:
-    needs: build
-    runs-on: ubuntu-latest
-    steps:
-    - uses: actions/checkout@v4.2.2
-    - uses: actions/setup-java@v4.7.0
+    - name: Deploy artefacts
+      if: ${{ github.repository == 'spring-projects/spring-statemachine' && github.ref_name == 'main' }}
+      uses: spring-io/artifactory-deploy-action@v0.0.2
       with:
-        distribution: adopt
-        java-version: 17
-        cache: gradle
-    - uses: jfrog/setup-jfrog-cli@v4.5.6
-      with:
-        version: 2.73.2
-      env:
-        JF_ENV_SPRING: ${{ secrets.JF_ARTIFACTORY_SPRING }}
-
-    # setup non persistent config for jfrog gradle to use server defined in
-    # secret which points via virtual repo into spring local repo.
-    # modify default build name and number as we don't like how those
-    # gets used from action defaults.
-    - name: Configure JFrog Cli
-      env:
-        JFROG_CLI_SERVER_ID: "repo.spring.io"
-      run: |
-        jf gradlec \
-          --use-wrapper \
-          --uses-plugin \
-          --deploy-ivy-desc=false \
-          --server-id-resolve=repo.spring.io \
-          --server-id-deploy=repo.spring.io \
-          --repo-resolve=snapshot \
-          --repo-deploy=snapshot
-        echo JFROG_CLI_BUILD_NAME=spring-statemachine-main >> $GITHUB_ENV
-        echo JFROG_CLI_BUILD_NUMBER=$GITHUB_RUN_NUMBER >> $GITHUB_ENV
+        uri: 'https://repo.spring.io'
+        username: ${{ secrets.ARTIFACTORY_USERNAME }}
+        password: ${{ secrets.ARTIFACTORY_PASSWORD }}
+        build-name: 'spring-statemachine-main'
+        repository: 'libs-snapshot-local'
+        folder: 'deployment-repository'
 
-    # as we already tested just build and publish
-    - name: Build and Publish Snapshot
-      run: |
-        jf gradle clean build -x test artifactoryPublish
+    - name: Deploy documentation
+      if: ${{ github.repository == 'spring-projects/spring-statemachine' && github.ref_name == 'main' }}
       env:
-        ORG_GRADLE_PROJECT_signingKey: ${{ secrets.GPG_PRIVATE_KEY }}
-        ORG_GRADLE_PROJECT_signingPassword: ${{ secrets.GPG_PASSPHRASE }}
-        GRADLE_ENTERPRISE_CACHE_USERNAME: ${{ secrets.GRADLE_ENTERPRISE_CACHE_USER }}
-        GRADLE_ENTERPRISE_CACHE_PASSWORD: ${{ secrets.GRADLE_ENTERPRISE_CACHE_PASSWORD }}
-        GRADLE_ENTERPRISE_ACCESS_KEY: ${{ secrets.GRADLE_ENTERPRISE_SECRET_ACCESS_KEY }}
-    # publish build info so that we can see it in artifactory "builds"
-    - name: Publish Build Info
+        DOCS_SSH_KEY: ${{ secrets.DOCS_SSH_KEY }}
+        DOCS_SSH_HOST_KEY: ${{ secrets.DOCS_SSH_HOST_KEY }}
+        DOCS_HOST: ${{ secrets.DOCS_HOST }}
+        DOCS_USERNAME: ${{ secrets.DOCS_USERNAME }}
+        DOCS_PATH: ${{ secrets.DOCS_PATH }}
       run: |
-        jf rt build-publish
+        mkdir "$HOME/.ssh"
+        echo "$DOCS_SSH_KEY" > "$HOME/.ssh/key"
+        chmod 600 "$HOME/.ssh/key"
+        echo "$DOCS_SSH_HOST_KEY" > "$HOME/.ssh/known_hosts"
+
+        PROJECT_VERSION=$(cat gradle.properties | grep "version=" | cut -d '=' -f 2)
+        ssh -i $HOME/.ssh/key $DOCS_USERNAME@$DOCS_HOST "cd $DOCS_PATH && mkdir -p $PROJECT_VERSION"
+
+        pushd build
+        scp -i $HOME/.ssh/key -r api $DOCS_USERNAME@$DOCS_HOST:$DOCS_PATH/$PROJECT_VERSION
+        popd
+        pushd docs/build/docs
+        scp -i $HOME/.ssh/key -r asciidoc $DOCS_USERNAME@$DOCS_HOST:$DOCS_PATH/$PROJECT_VERSION/reference
+        popd

.github/workflows/deploy-docs.yml

@@ -0,0 +1,47 @@
+name: Deploy Docs
+
+on:
+  workflow_dispatch:
+    inputs:
+      releaseVersion:
+        description: "Release version (4.0.x)"
+        required: true
+
+jobs:
+
+  publish-docs:
+    runs-on: ubuntu-latest
+    steps:
+    - uses: actions/checkout@v4.2.2
+    - name: Spring Gradle Build Action
+      uses: spring-io/spring-gradle-build-action@v2
+      with:
+        java-version: '17'
+        distribution: 'temurin'
+
+    - name: Capture project version
+      run: echo PROJECT_VERSION=${{ github.event.inputs.releaseVersion }} >> $GITHUB_ENV
+
+    - name: Build with Gradle
+      run: ./gradlew -Pversion=$PROJECT_VERSION distZip
+
+    - name: Deploy documentation
+      if: ${{ github.repository == 'spring-projects/spring-statemachine' && github.ref_name == 'main' }}
+      env:
+        DOCS_SSH_KEY: ${{ secrets.DOCS_SSH_KEY }}
+        DOCS_SSH_HOST_KEY: ${{ secrets.DOCS_SSH_HOST_KEY }}
+        DOCS_HOST: ${{ secrets.DOCS_HOST }}
+        DOCS_USERNAME: ${{ secrets.DOCS_USERNAME }}
+        DOCS_PATH: ${{ secrets.DOCS_PATH }}
+      run: |
+        mkdir "$HOME/.ssh"
+        echo "$DOCS_SSH_KEY" > "$HOME/.ssh/key"
+        chmod 600 "$HOME/.ssh/key"
+        echo "$DOCS_SSH_HOST_KEY" > "$HOME/.ssh/known_hosts"
+        ssh -i $HOME/.ssh/key $DOCS_USERNAME@$DOCS_HOST "cd $DOCS_PATH && mkdir -p $PROJECT_VERSION"
+        pushd build
+        scp -i $HOME/.ssh/key -r api $DOCS_USERNAME@$DOCS_HOST:$DOCS_PATH/$PROJECT_VERSION
+        popd
+        pushd docs/build/docs
+        scp -i $HOME/.ssh/key -r asciidoc $DOCS_USERNAME@$DOCS_HOST:$DOCS_PATH/$PROJECT_VERSION/reference
+        popd

.github/workflows/pr.yml

@@ -9,21 +9,17 @@ jobs:
 
   # build and test, then upload logs if failure
   build:
-    runs-on: ${{ matrix.os }}
-    strategy:
-      matrix:
-        os: [ubuntu-latest]
-        java: [ 17 ]
-      fail-fast: false
+    runs-on: ubuntu-latest
 
     steps:
-    - uses: actions/checkout@v2
-    - name: Setup JDK
-      uses: actions/setup-java@v1
+    - uses: actions/checkout@v4.2.2
+    - name: Spring Gradle Build Action
+      uses: spring-io/spring-gradle-build-action@v2
       with:
-        java-version: ${{ matrix.java }}
+        java-version: '17'
+        distribution: 'temurin'
     - name: Build with Gradle
-      run: ./gradlew clean build
+      run: ./gradlew build
     - name: Tar Build Logs
       if: ${{ failure() }}
       run: |
@@ -36,7 +32,7 @@ jobs:
           */*/build/reports
     - name: Upload Build Logs
       if: ${{ failure() }}
-      uses: actions/upload-artifact@v4.4.3
+      uses: actions/upload-artifact@v4.6.2
       with:
         name: buildlogs
         path: build/buildlogs.tar.gz