DAT-18141 changes for liquibase-checks extension

.github/workflows/create-release.yml

@@ -8,13 +8,19 @@ on:
         required: false
         default: ''
         type: string
+      artifactPath:
+        description: "Specify the path to the artifacts that should be attached to the build. Useful for multi-module extensions."
+        required: false
+        default: "."
+        type: string
 
 jobs:
   sonar:
-    uses: liquibase/build-logic/.github/workflows/sonar-push.yml@v0.7.8
+    uses: liquibase/build-logic/.github/workflows/sonar-push.yml@main
     secrets: inherit
     with:
       extraCommand: ${{ inputs.extraCommand }}
+      artifactPath: ${{ inputs.artifactPath }}
 
   create-release:
     name: Create Release

.github/workflows/extension-attach-artifact-release.yml

@@ -18,6 +18,26 @@ on:
         required: false
         default: ""
         type: string
+      os:
+        description: "Operating system to build/test on"
+        required: false
+        default: '["ubuntu-latest", "windows-latest"]'
+        type: string
+      extraMavenArgs:
+        description: "Specify it if you want to run an extra maven argument"
+        required: false
+        default: ""
+        type: string
+      artifactPath:
+        description: "Specify the path to the artifacts that should be attached to the build. Useful for multi-module extensions."
+        required: false
+        default: "."
+        type: string
+      combineJars:
+        description: 'Specify it if you want to combine jars into one'
+        required: false
+        default: false
+        type: boolean
     secrets:
       BOT_TOKEN:
         description: 'BOT_TOKEN from the caller workflow'
@@ -30,8 +50,184 @@ on:
         required: true
 
 jobs:
+
+  build-multi-architecture:
+    strategy:
+      fail-fast: false
+      matrix:
+        os: ${{fromJson(inputs.os || '["ubuntu-latest"]')}}
+    name: Build & Package - ${{ matrix.os }}
+    if: ${{ inputs.combineJars }}
+    runs-on: ubuntu-latest
+    steps:
+      - uses: actions/checkout@v4
+
+      - name: Set up JDK 17
+        uses: actions/setup-java@v4
+        with:
+          java-version: 17
+          distribution: "temurin"
+          cache: "maven"
+
+      - name: Set up Maven
+        uses: stCarolas/setup-maven@v5
+        with:
+          maven-version: ${{ env.MAVEN_VERSION }}
+
+      # look for dependencies in maven
+      - name: maven-settings-xml-action
+        uses: whelk-io/maven-settings-xml-action@v22
+        with:
+          repositories: |
+            [
+              {
+                "id": "liquibase",
+                "url": "https://maven.pkg.github.com/liquibase/liquibase",
+                "releases": {
+                  "enabled": "true"
+                },
+                "snapshots": {
+                  "enabled": "true",
+                  "updatePolicy": "always"
+                }
+              },
+              {
+                "id": "liquibase-pro",
+                "url": "https://maven.pkg.github.com/liquibase/liquibase-pro",
+                "releases": {
+                  "enabled": "true"
+                },
+                "snapshots": {
+                  "enabled": "true",
+                  "updatePolicy": "always"
+                }
+              }
+            ]
+          servers: |
+            [
+              {
+                "id": "liquibase-pro",
+                "username": "liquibot",
+                "password": "${{ secrets.LIQUIBOT_PAT }}"
+              },
+              {
+                "id": "liquibase",
+                "username": "liquibot",
+                "password": "${{ secrets.LIQUIBOT_PAT }}"
+              }
+            ]
+
+      - name: Configure Git
+        run: |
+          git config user.name "liquibot"
+          git config user.email "[email protected]"
+
+      - name: Run extra command
+        if: inputs.extraCommand != ''
+        run: |
+          ${{ inputs.extraCommand }}
+
+      - name: Run extra Linux command
+        if: inputs.extraLinuxCommand != ''
+        run: |
+          ${{ inputs.extraLinuxCommand }}
+
+      - name: Build and Package
+        working-directory: ${{ inputs.artifactPath }}
+        run: |
+          mvn -B release:clean release:prepare -Darguments="-Dusername=liquibot -Dpassword=$GITHUB_TOKEN -Dmaven.javadoc.skip=true -Dmaven.test.skipTests=true -Dmaven.test.skip=true -Dmaven.deploy.skip=true" -DcheckModificationExcludeList=** -DignoreSnapshots=true -DreleaseVersion=${{ github.event.inputs.liquibaseVersion }} -DpushChanges=false -P '${{ inputs.mavenProfiles }}'
+          git reset HEAD~ --hard
+          mvn -B dependency:go-offline clean package -DskipTests=true ${{ inputs.extraMavenArgs }}
+
+      - name: Get Artifact ID
+        working-directory: ${{ inputs.artifactPath }}
+        id: get-artifact-id
+        run: echo "::set-output name=artifact_id::$(mvn help:evaluate -Dexpression=project.artifactId -q -DforceStdout)"
+
+      - name: Get Artifact Version
+        working-directory: ${{ inputs.artifactPath }}
+        id: get-artifact-version
+        run: echo "::set-output name=artifact_version::$(mvn help:evaluate -Dexpression=project.version -q -DforceStdout)"
+
+      - name: Save Artifacts
+        uses: actions/upload-artifact@v3
+        with:
+          name: ${{ steps.get-artifact-id.outputs.artifact_id }}-${{ matrix.os }}-${{ steps.get-artifact-version.outputs.artifact_version }}-artifacts
+          path: |
+            ${{ inputs.artifactPath }}/target/*
+
+      - name: Save Event File
+        uses: actions/upload-artifact@v3
+        with:
+          name: Event File
+          path: ${{ github.event_path }}
+    outputs:
+      artifact_id: ${{ steps.get-artifact-id.outputs.artifact_id }}
+      artifact_version: ${{ steps.get-artifact-version.outputs.artifact_version }}
+
+  combineJars:
+    needs: [ build-multi-architecture ]
+    if: ${{ inputs.combineJars }}
+    name: Combine Jars
+    runs-on: ubuntu-latest
+    steps:
+
+      - uses: actions/checkout@v4
+
+      - name: Download Ubuntu Artifacts
+        uses: actions/download-artifact@v2
+        with:
+          name: ${{needs.build-multi-architecture.outputs.artifact_id}}-ubuntu-latest-${{needs.build-multi-architecture.outputs.artifact_version}}-artifacts
+          path: /tmp/ubuntu
+
+      - name: Download macOS Artifacts
+        uses: actions/download-artifact@v2
+        with:
+          name: ${{needs.build-multi-architecture.outputs.artifact_id}}-macos-latest-${{needs.build-multi-architecture.outputs.artifact_version}}-artifacts
+          path: /tmp/macos
+
+      - name: Download Windows Artifacts
+        uses: actions/download-artifact@v2
+        with:
+          name: ${{needs.build-multi-architecture.outputs.artifact_id}}-windows-latest-${{needs.build-multi-architecture.outputs.artifact_version}}-artifacts
+          path: /tmp/windows
+
+      - name: Create multiplatform jar
+        run: |
+          rm -rf /tmp/combined/ubuntu /tmp/combined/windows /tmp/combined/macos
+          mkdir -p /tmp/combined/ubuntu /tmp/combined/windows /tmp/combined/macos
+          unzip -d /tmp/combined/ubuntu /tmp/ubuntu/${{needs.build-multi-architecture.outputs.artifact_id}}-${{needs.build-multi-architecture.outputs.artifact_version}}.jar
+          unzip -d /tmp/combined/windows /tmp/windows/${{needs.build-multi-architecture.outputs.artifact_id}}-${{needs.build-multi-architecture.outputs.artifact_version}}.jar
+          unzip -d /tmp/combined/macos /tmp/macos/${{needs.build-multi-architecture.outputs.artifact_id}}-${{needs.build-multi-architecture.outputs.artifact_version}}.jar
+          rm -r -f /tmp/combined/${{needs.build-multi-architecture.outputs.artifact_id}}-${{needs.build-multi-architecture.outputs.artifact_version}}
+          mkdir /tmp/combined/${{needs.build-multi-architecture.outputs.artifact_id}}-${{needs.build-multi-architecture.outputs.artifact_version}}
+          cp -a /tmp/combined/ubuntu/* /tmp/combined/${{needs.build-multi-architecture.outputs.artifact_id}}-${{needs.build-multi-architecture.outputs.artifact_version}}/
+          cp -a /tmp/combined/windows/* /tmp/combined/${{needs.build-multi-architecture.outputs.artifact_id}}-${{needs.build-multi-architecture.outputs.artifact_version}}/
+          cp -a /tmp/combined/macos/* /tmp/combined/${{needs.build-multi-architecture.outputs.artifact_id}}-${{needs.build-multi-architecture.outputs.artifact_version}}/
+          rm /tmp/combined/${{needs.build-multi-architecture.outputs.artifact_id}}-${{needs.build-multi-architecture.outputs.artifact_version}}/vfs/fileslist.txt
+          cat /tmp/combined/ubuntu/vfs/fileslist.txt /tmp/combined/windows/vfs/fileslist.txt /tmp/combined/macos/vfs/fileslist.txt > /tmp/combined/${{needs.build-multi-architecture.outputs.artifact_id}}-${{needs.build-multi-architecture.outputs.artifact_version}}/vfs/fileslist.txt
+          rm -f /tmp/combined/${{needs.build-multi-architecture.outputs.artifact_id}}-${{needs.build-multi-architecture.outputs.artifact_version}}.jar
+          cd /tmp/combined/${{needs.build-multi-architecture.outputs.artifact_id}}-${{needs.build-multi-architecture.outputs.artifact_version}}/
+          zip -r ../${{needs.build-multi-architecture.outputs.artifact_id}}-${{needs.build-multi-architecture.outputs.artifact_version}}.jar *
+          cd ..
+          cp /tmp/ubuntu/${{needs.build-multi-architecture.outputs.artifact_id}}-${{needs.build-multi-architecture.outputs.artifact_version}}-sources.jar /tmp/combined/
+          cp /tmp/ubuntu/${{needs.build-multi-architecture.outputs.artifact_id}}-${{needs.build-multi-architecture.outputs.artifact_version}}-javadoc.jar /tmp/combined/
+          cp /tmp/ubuntu/${{needs.build-multi-architecture.outputs.artifact_id}}-${{needs.build-multi-architecture.outputs.artifact_version}}.pom /tmp/combined/
+
+
+      - name: Upload multiplatform artifact
+        uses: actions/upload-artifact@v3
+        with:
+          name: multiplatform-artifacts
+          path: |
+            /tmp/combined/${{needs.build-multi-architecture.outputs.artifact_id}}-${{needs.build-multi-architecture.outputs.artifact_version}}.jar
+            /tmp/combined/${{needs.build-multi-architecture.outputs.artifact_id}}-${{needs.build-multi-architecture.outputs.artifact_version}}-sources.jar
+            /tmp/combined/${{needs.build-multi-architecture.outputs.artifact_id}}-${{needs.build-multi-architecture.outputs.artifact_version}}-javadoc.jar
+            /tmp/combined/${{needs.build-multi-architecture.outputs.artifact_id}}-${{needs.build-multi-architecture.outputs.artifact_version}}.pom
+
   attach-to-release:
     name: Attach Artifact to Release
+    needs: [ combineJars ]
     runs-on: ubuntu-latest
     steps:
       - run: sleep 30
@@ -46,7 +242,7 @@ jobs:
 
       # look for dependencies in maven
       - name: maven-settings-xml-action
-        uses: whelk-io/maven-settings-xml-action@v21
+        uses: whelk-io/maven-settings-xml-action@v22
         with:
           repositories: |
             [
@@ -102,6 +298,7 @@ jobs:
           git config user.email "[email protected]"
 
       - name: Get Artifact ID
+        working-directory: ${{ inputs.artifactPath }}
         id: get-artifact-id
         run: echo "artifact_id=$(mvn help:evaluate -Dexpression=project.artifactId -q -DforceStdout)" >> $GITHUB_ENV
 
@@ -134,13 +331,21 @@ jobs:
           fi
 
       - name: Build release artifacts
+        working-directory: ${{ inputs.artifactPath }}
         if: env.ARTIFACT_FOUND == '0'
         id: build-release-artifacts
         run: |
-          mvn -B release:clean release:prepare -Darguments="-Dusername=liquibot -Dpassword=$GITHUB_TOKEN -Dmaven.javadoc.skip=true -Dmaven.test.skipTests=true -Dmaven.test.skip=true -Dmaven.deploy.skip=true" -DreleaseVersion=${{ github.event.inputs.liquibaseVersion }} -DpushChanges=false -P '${{ inputs.mavenProfiles }}'
+          mvn -B release:clean release:prepare -Darguments="-Dusername=liquibot -Dpassword=$GITHUB_TOKEN -Dmaven.javadoc.skip=true -Dmaven.test.skipTests=true -Dmaven.test.skip=true -Dmaven.deploy.skip=true" -DcheckModificationExcludeList=** -DignoreSnapshots=true -DreleaseVersion=${{ github.event.inputs.liquibaseVersion }} -DpushChanges=false -P '${{ inputs.mavenProfiles }}'
           git reset HEAD~ --hard
           mvn clean install -DskipTests -P '${{ inputs.mavenProfiles }}'
 
+      - name: Download multiarchitecture release artifacts
+        if: inputs.combineJars
+        uses: actions/download-artifact@v2
+        with:
+          name: multiplatform-artifacts
+          path: ${{ inputs.artifactPath }}/target
+
       - name: Get latest draft release ID
         id: get-release
         run: |
@@ -176,16 +381,21 @@ jobs:
           gpg_private_key: ${{ secrets.GPG_SECRET }}
           passphrase: ${{ secrets.GPG_PASSPHRASE }}
 
+      - name: Set root directory variable
+        run: echo "REPO_ROOT=$(git rev-parse --show-toplevel)" >> $GITHUB_ENV
+
       - name: Sign Files for Draft Release
+        working-directory: ${{ inputs.artifactPath }}
         run: |
           gpg -K
           version=$(mvn help:evaluate -Dexpression=project.version -q -DforceStdout)
-          ./.github/sign_artifact.sh ./target/${{ env.artifact_id }}-${version}.jar
-          ./.github/sign_artifact.sh ./target/${{ env.artifact_id }}-${version}.pom
-          ./.github/sign_artifact.sh ./target/${{ env.artifact_id }}-${version}-javadoc.jar
-          ./.github/sign_artifact.sh ./target/${{ env.artifact_id }}-${version}-sources.jar
+          ${{ env.REPO_ROOT }}/.github/sign_artifact.sh ${{ env.REPO_ROOT }}/${{ inputs.artifactPath }}/target/${{ env.artifact_id }}-${version}.jar
+          ${{ env.REPO_ROOT }}/.github/sign_artifact.sh ${{ env.REPO_ROOT }}/${{ inputs.artifactPath }}/target/${{ env.artifact_id }}-${version}.pom
+          ${{ env.REPO_ROOT }}/.github/sign_artifact.sh ${{ env.REPO_ROOT }}/${{ inputs.artifactPath }}/target/${{ env.artifact_id }}-${version}-javadoc.jar
+          ${{ env.REPO_ROOT }}/.github/sign_artifact.sh ${{ env.REPO_ROOT }}/${{ inputs.artifactPath }}/target/${{ env.artifact_id }}-${version}-sources.jar
 
       - name: Set draft release title
+        working-directory: ${{ inputs.artifactPath }}
         id: set-release-title
         run: |
           version=$(mvn help:evaluate -Dexpression=project.version -q -DforceStdout)
@@ -194,8 +404,9 @@ jobs:
           curl -X PATCH -H "Accept: application/vnd.github+json" -H "X-GitHub-Api-Version: 2022-11-28" -H "Authorization: Bearer ${{ secrets.BOT_TOKEN }}" -d '{"name": "'"$RELEASE_TITLE"'", "tag_name": "'"v$version"'"}' "https://api.github.com/repos/${{ github.repository }}/releases/${{ env.RELEASE_ID }}"
 
       - name: Attach Files to Draft Release
+        working-directory: ${{ inputs.artifactPath }}
         id: upload-release-asset
-        run: ./.github/upload_asset.sh $(mvn help:evaluate -Dexpression=project.version -q -DforceStdout)
+        run: ${{ env.REPO_ROOT }}/.github/upload_asset.sh $(mvn help:evaluate -Dexpression=project.version -q -DforceStdout)
         env:
           GITHUB_TOKEN: ${{ secrets.BOT_TOKEN }}
           ASSET_NAME_PREFIX: "${{ env.artifact_id }}-"

.github/workflows/extension-release-prepare.yml

@@ -8,6 +8,11 @@ on:
         required: false
         default: ''
         type: string
+      artifactPath:
+        description: "Specify the path to the artifacts that should be attached to the build. Useful for multi-module extensions."
+        required: false
+        default: "."
+        type: string
 
 permissions:
   contents: write
@@ -84,11 +89,13 @@ jobs:
           git config --local user.name "liquibot"
 
       - name: Run extra command
+        working-directory: ${{ inputs.artifactPath }}
         if: inputs.extraCommand != ''
         run: |
           ${{ inputs.extraCommand }}
 
       - name: Prepare Maven Release
+        working-directory: ${{ inputs.artifactPath }}
         run: |
           mvn -B build-helper:parse-version release:clean release:prepare \
           -Darguments="-Dusername=liquibot -Dpassword=${{ secrets.BOT_TOKEN }} -Dmaven.javadoc.skip=true -Dmaven.test.skipTests=true -Dmaven.test.skip=true -Dmaven.deploy.skip=true" \
@@ -97,6 +104,7 @@ jobs:
           git tag -d temp
           git push --force
 
+
       - name: Save Release files
         if: always()
         uses: actions/upload-artifact@v3
@@ -109,7 +117,8 @@ jobs:
   release-rollback:
     needs: prepare-release
     if: ${{ always() && contains(needs.*.result, 'failure') }}
-    uses: liquibase/build-logic/.github/workflows/extension-release-rollback.yml@v0.7.8
+    uses: liquibase/build-logic/.github/workflows/extension-release-rollback.yml@main
     secrets: inherit
     with:
       extraCommand: ${{ inputs.extraCommand }}
+      artifactPath: ${{ inputs.artifactPath }}