Merge branch 'main' into feature/wal-1186

Author: philpotisk

.github/workflows/branch-deploy.yml

@@ -15,11 +15,11 @@ jobs:
         id: set_version
         run: echo "release_version=${GITHUB_REF_SLUG}" >> $GITHUB_OUTPUT
   docker-matrix:
-    uses: walt-id/waltid-identity/.github/workflows/load-json.yml@main
+    uses: walt-id/waltid-identity/.github/workflows/load-json.yml@6bb27c98fb66d9525dcc5ed8b0e703ff07a18c4a
     with:
       jsonpath: ".github/workflows/data/docker-matrix.json"
   docker:
-    uses: walt-id/waltid-identity/.github/workflows/docker.yml@main
+    uses: walt-id/waltid-identity/.github/workflows/docker.yml@6bb27c98fb66d9525dcc5ed8b0e703ff07a18c4a
     secrets: inherit
     needs: [ version, docker-matrix ]
     with:
@@ -28,11 +28,11 @@ jobs:
       tags: '["dev", "latest"]'
       publish: true
   api-docker-matrix:
-    uses: walt-id/waltid-identity/.github/workflows/load-json.yml@main
+    uses: walt-id/waltid-identity/.github/workflows/load-json.yml@6bb27c98fb66d9525dcc5ed8b0e703ff07a18c4a
     with:
       jsonpath: ".github/workflows/data/api-docker-matrix.json"
   api-docker:
-    uses: walt-id/waltid-identity/.github/workflows/api-docker.yml@main
+    uses: walt-id/waltid-identity/.github/workflows/api-docker.yml@6bb27c98fb66d9525dcc5ed8b0e703ff07a18c4a
     secrets: inherit
     needs: [ version, api-docker-matrix ]
     with:
@@ -41,7 +41,7 @@ jobs:
       tags: '["dev", "latest"]'
       publish: true
   deploy:
-    uses: walt-id/waltid-identity/.github/workflows/helm-deployment.yml@main
+    uses: walt-id/waltid-identity/.github/workflows/helm-deployment.yml@6bb27c98fb66d9525dcc5ed8b0e703ff07a18c4a
     secrets: inherit
     needs: [ version, docker, api-docker ]
     with:

.github/workflows/build.yml

@@ -18,9 +18,9 @@ jobs:
       pr-labels: ${{ toJson(github.event.pull_request.labels.*.name) }}
       pr-draft: ${{ github.event.pull_request.draft || false }}
   version:
-    uses: walt-id/waltid-identity/.github/workflows/version.yml@main
+    uses: walt-id/waltid-identity/.github/workflows/version.yml@6bb27c98fb66d9525dcc5ed8b0e703ff07a18c4a
   gradle-build:
-    uses: walt-id/waltid-identity/.github/workflows/gradle.yml@main
+    uses: walt-id/waltid-identity/.github/workflows/gradle.yml@6bb27c98fb66d9525dcc5ed8b0e703ff07a18c4a
     secrets: inherit
     needs:
       - android-eligibility
@@ -30,23 +30,23 @@ jobs:
       enable-android-build: ${{ needs.android-eligibility.outputs.should-run == 'true' }}
       report-check-name: 'gradle-build / gradle (ubuntu-22.04)'
   docker-matrix:
-    uses: walt-id/waltid-identity/.github/workflows/load-json.yml@main
+    uses: walt-id/waltid-identity/.github/workflows/load-json.yml@6bb27c98fb66d9525dcc5ed8b0e703ff07a18c4a
     with:
       jsonpath: ".github/workflows/data/docker-matrix.json"
   docker:
-    uses: walt-id/waltid-identity/.github/workflows/docker.yml@main
+    uses: walt-id/waltid-identity/.github/workflows/docker.yml@6bb27c98fb66d9525dcc5ed8b0e703ff07a18c4a
     secrets: inherit
     needs: [ version, docker-matrix ]
     with:
       images: ${{ needs.docker-matrix.outputs.json }}
       version: ${{ needs.version.outputs.release_version }}
       artifact: true
   api-docker-matrix:
-    uses: walt-id/waltid-identity/.github/workflows/load-json.yml@main
+    uses: walt-id/waltid-identity/.github/workflows/load-json.yml@6bb27c98fb66d9525dcc5ed8b0e703ff07a18c4a
     with:
       jsonpath: ".github/workflows/data/api-docker-matrix.json"
   api-docker:
-    uses: walt-id/waltid-identity/.github/workflows/api-docker.yml@main
+    uses: walt-id/waltid-identity/.github/workflows/api-docker.yml@6bb27c98fb66d9525dcc5ed8b0e703ff07a18c4a
     secrets: inherit
     needs: [ version, api-docker-matrix ]
     with:
@@ -56,7 +56,7 @@ jobs:
   ebsi-ct-v3:
     # disabled job because of ebsi certificate issues (expired certificate)
     if: false
-    uses: walt-id/waltid-identity/.github/workflows/ebsictv3.yml@main
+    uses: walt-id/waltid-identity/.github/workflows/ebsictv3.yml@6bb27c98fb66d9525dcc5ed8b0e703ff07a18c4a
     needs: [ version, docker, api-docker ]
     secrets: inherit
     with:

.github/workflows/changelog.yml

@@ -0,0 +1,95 @@
+name: Create release with APK asset (reusable workflow)
+
+on:
+  workflow_call:
+    inputs:
+      version:
+        description: "release version (used to name the APK asset)"
+        required: true
+        type: string
+      tag:
+        description: "release tag to create and attach the APK to"
+        required: true
+        type: string
+      make_latest:
+        description: "Whether to mark this release as latest"
+        required: false
+        type: boolean
+        default: true
+
+permissions:
+  contents: write
+
+jobs:
+  release:
+    name: Create release
+    runs-on: ubuntu-22.04
+    steps:
+      - name: Checkout all repos with ref fallback
+        uses: walt-id/waltid-identity/.github/actions/checkout-repos@864f84343fdeea17f6f63434bc8036c39f178dc7
+        with:
+          token: ${{ secrets.GH_ACCESS_TOKEN }}
+
+      - name: Detect compose app module
+        id: detect
+        run: |
+          set -euo pipefail
+          module_dir="waltid-identity/waltid-applications/waltid-wallet-demo-compose/androidApp"
+          if [ -d "$module_dir" ]; then
+            echo "Compose app module found, APK will be built."
+            echo "exists=true" >> "$GITHUB_OUTPUT"
+          else
+            echo "::notice::Compose app module not present in this version; skipping APK build."
+            echo "exists=false" >> "$GITHUB_OUTPUT"
+          fi
+
+      - name: Configure gradle
+        if: ${{ steps.detect.outputs.exists == 'true' }}
+        uses: walt-id/waltid-identity/.github/actions/gradle-setup-action@864f84343fdeea17f6f63434bc8036c39f178dc7
+
+      - name: Enable Android build in identity repo
+        if: ${{ steps.detect.outputs.exists == 'true' }}
+        uses: walt-id/waltid-identity/.github/actions/set-properties@00d4e55e9865cf17c6703d926dce4a4f6e1d404a
+        with:
+          file: 'waltid-identity/gradle.properties'
+          properties: 'enableAndroidBuild=true'
+
+      - name: Enable Android build in unified-build root
+        if: ${{ steps.detect.outputs.exists == 'true' }}
+        uses: walt-id/waltid-identity/.github/actions/set-properties@00d4e55e9865cf17c6703d926dce4a4f6e1d404a
+        with:
+          file: 'gradle.properties'
+          properties: 'enableAndroidBuild=true'
+
+      - name: Build debug APK
+        if: ${{ steps.detect.outputs.exists == 'true' }}
+        run: ./gradlew :waltid-applications:waltid-wallet-demo-compose:androidApp:assembleDebug -PappVersionName=${{ inputs.version }} --no-daemon --console=plain --warning-mode=summary
+        env:
+          CI: "true"
+          MAVEN_USERNAME: ${{ secrets.MAVEN_USERNAME }}
+          MAVEN_PASSWORD: ${{ secrets.MAVEN_PASSWORD }}
+
+      - name: Locate and rename APK
+        id: apk
+        if: ${{ steps.detect.outputs.exists == 'true' }}
+        run: |
+          set -euo pipefail
+          apk=$(find waltid-identity/waltid-applications/waltid-wallet-demo-compose/androidApp/build/outputs/apk/debug -name '*.apk' | head -n 1)
+          if [ -z "$apk" ]; then
+            echo "::error::No APK found"
+            exit 1
+          fi
+          dest="waltid-wallet-demo-compose-${{ inputs.version }}.apk"
+          cp "$apk" "$dest"
+          echo "path=$dest" >> "$GITHUB_OUTPUT"
+
+      - name: Create release and attach APK if present
+        uses: softprops/action-gh-release@v3
+        env:
+          GITHUB_TOKEN: ${{ secrets.GITHUB_TOKEN }}
+        with:
+          tag_name: ${{ inputs.tag }}
+          files: ${{ steps.apk.outputs.path }}
+          fail_on_unmatched_files: false
+          prerelease: ${{ contains(inputs.tag, 'PRE-RELEASE') }}
+          make_latest: ${{ inputs.make_latest }}

.github/workflows/create-release.yml

@@ -9,11 +9,11 @@ on:
 
 jobs:
   version:
-    uses: walt-id/waltid-identity/.github/workflows/version.yml@main
+    uses: walt-id/waltid-identity/.github/workflows/version.yml@6bb27c98fb66d9525dcc5ed8b0e703ff07a18c4a
     with:
       preferred: ${{ inputs.release_version }}
   gradle:
-    uses: walt-id/waltid-identity/.github/workflows/gradle.yml@main
+    uses: walt-id/waltid-identity/.github/workflows/gradle.yml@6bb27c98fb66d9525dcc5ed8b0e703ff07a18c4a
     secrets: inherit
     needs: version
     with:
@@ -22,81 +22,76 @@ jobs:
       publish: true
       report-check-name: 'gradle / gradle (ubuntu-22.04)'
   docker-matrix:
-    uses: walt-id/waltid-identity/.github/workflows/load-json.yml@main
+    uses: walt-id/waltid-identity/.github/workflows/load-json.yml@6bb27c98fb66d9525dcc5ed8b0e703ff07a18c4a
     with:
       jsonpath: ".github/workflows/data/docker-matrix.json"
   docker:
-    uses: walt-id/waltid-identity/.github/workflows/docker.yml@main
+    uses: walt-id/waltid-identity/.github/workflows/docker.yml@6bb27c98fb66d9525dcc5ed8b0e703ff07a18c4a
     secrets: inherit
     needs: [ version, docker-matrix ]
     with:
       images: ${{ needs.docker-matrix.outputs.json }}
       version: ${{ needs.version.outputs.release_version }}
       publish: true
   api-docker-matrix:
-    uses: walt-id/waltid-identity/.github/workflows/load-json.yml@main
+    uses: walt-id/waltid-identity/.github/workflows/load-json.yml@6bb27c98fb66d9525dcc5ed8b0e703ff07a18c4a
     with:
       jsonpath: ".github/workflows/data/api-docker-matrix.json"
   api-docker:
-    uses: walt-id/waltid-identity/.github/workflows/api-docker.yml@main
+    uses: walt-id/waltid-identity/.github/workflows/api-docker.yml@6bb27c98fb66d9525dcc5ed8b0e703ff07a18c4a
     secrets: inherit
     needs: [ version, api-docker-matrix ]
     with:
       images: ${{ needs.api-docker-matrix.outputs.json }}
       version: ${{ needs.version.outputs.release_version }}
       publish: true
   tag:
-    uses: walt-id/waltid-identity/.github/workflows/tag.yml@main
+    uses: walt-id/waltid-identity/.github/workflows/tag.yml@6bb27c98fb66d9525dcc5ed8b0e703ff07a18c4a
     secrets: inherit
     needs: [ version, gradle, docker, api-docker ]
     with:
       version: ${{ needs.version.outputs.release_version }}
       ref: ${{ github.ref_name }}
   enterprise-tag:
-    uses: walt-id/waltid-identity/.github/workflows/tag.yml@main
+    uses: walt-id/waltid-identity/.github/workflows/tag.yml@6bb27c98fb66d9525dcc5ed8b0e703ff07a18c4a
     secrets: inherit
     needs: [ version, gradle, docker, api-docker ]
     with:
       version: ${{ needs.version.outputs.release_version }}
       repository: walt-id/waltid-identity-enterprise
       ref: ${{ github.ref_name }}
   docs-tag:
-    uses: walt-id/waltid-identity/.github/workflows/tag.yml@main
+    uses: walt-id/waltid-identity/.github/workflows/tag.yml@6bb27c98fb66d9525dcc5ed8b0e703ff07a18c4a
     secrets: inherit
     needs: [ version, gradle, docker, api-docker ]
     with:
       version: ${{ needs.version.outputs.release_version }}
       repository: walt-id/waltid-docs
       ref: ${{ github.ref_name }}
   quickstart-tag:
-    uses: walt-id/waltid-identity/.github/workflows/tag.yml@main
+    uses: walt-id/waltid-identity/.github/workflows/tag.yml@6bb27c98fb66d9525dcc5ed8b0e703ff07a18c4a
     secrets: inherit
     needs: [ version, gradle, docker, api-docker ]
     with:
       version: ${{ needs.version.outputs.release_version }}
       repository: walt-id/waltid-enterprise-quickstart
       ref: ${{ github.ref_name }}
   unified-build-tag:
-    uses: walt-id/waltid-identity/.github/workflows/tag.yml@main
+    uses: walt-id/waltid-identity/.github/workflows/tag.yml@6bb27c98fb66d9525dcc5ed8b0e703ff07a18c4a
     secrets: inherit
     needs: [ version, gradle, docker, api-docker ]
     with:
       version: ${{ needs.version.outputs.release_version }}
       repository: walt-id/waltid-unified-build
       ref: ${{ github.ref_name }}
   release:
-    name: Create Release
-    runs-on: ubuntu-latest
-    needs: [ tag ]
-    steps:
-      - name: Create Release
-        uses: softprops/action-gh-release@v3
-        env:
-          GITHUB_TOKEN: ${{ secrets.GITHUB_TOKEN }}
-        with:
-          tag_name: ${{ needs.tag.outputs.tag }}
-          prerelease: ${{ contains(needs.tag.outputs.tag, 'PRE-RELEASE') }}
-          make_latest: false
+    uses: walt-id/waltid-identity/.github/workflows/create-release.yml@6bb27c98fb66d9525dcc5ed8b0e703ff07a18c4a
+    secrets: inherit
+    needs: [ version, tag ]
+    with:
+      version: ${{ needs.version.outputs.release_version }}
+      tag: ${{ needs.tag.outputs.tag }}
+      make_latest: false
   enterprise-release:
     name: Create Enterprise Release
     runs-on: ubuntu-latest