Merge changes from upstream

.github/workflows/create-release-pr.yaml

@@ -38,18 +38,18 @@ jobs:
       #----------------------------------------------
       #       Check out repo
       #----------------------------------------------
-      - uses: actions/checkout@11bd71901bbe5b1630ceea73d27597364c9af683 # v4.2.2
+      - uses: actions/checkout@v5
       #----------------------------------------------
       #       Setup python
       #----------------------------------------------
-      - uses: actions/setup-python@42375524e23c412d93fb67b49958b491fce71c38 # v5.4.0
+      - uses: actions/setup-python@v6
         with:
           python-version: '3.12'
       #----------------------------------------------
       #       Install poetry
       #----------------------------------------------
       - name: Install poetry
-        run: pipx install poetry
+        run: pipx install poetry==2.1.2
         id: setup-poetry
       #----------------------------------------------
       #       Get the latest version of acapy-agent from pypi
@@ -223,7 +223,7 @@ jobs:
       # ----------------------------------------------
       - name: Initialize Docker Compose
         if: ${{ steps.upgrade_available.outputs.available == 'true' && github.event.inputs.re_release != 'true'}} 
-        uses: isbang/compose-action@178aeba5c9dbeed89ffffbb3e6548ec08e9839cf # v1.5.1
+        uses: isbang/compose-action@v1.5.1
       # ----------------------------------------------
       #       Collect plugins that fail integration tests
       # ----------------------------------------------
@@ -407,7 +407,7 @@ jobs:
       #----------------------------------------------
       - name: Create PR
         if: ${{ steps.upgrade_available.outputs.available == 'true' && github.event.inputs.re_release != 'true'}} 
-        uses: peter-evans/create-pull-request@271a8d0340265f705b14b6d32b9829c1cb33d45e # v7.0.8
+        uses: peter-evans/create-pull-request@v7
         with:
           author: Release Bot <release-bot@users.noreply.github.com>
           committer: Release Bot <release-bot@users.noreply.github.com>

.github/workflows/create-release.yaml

@@ -21,13 +21,13 @@ jobs:
       run:
         working-directory: .
     steps:
-      - uses: actions/checkout@11bd71901bbe5b1630ceea73d27597364c9af683 # v4.2.2
+      - uses: actions/checkout@v5
         with:
           fetch-depth: 0
       # ----------------------------------------------
       #       Install Python
       # ----------------------------------------------
-      - uses: actions/setup-python@42375524e23c412d93fb67b49958b491fce71c38 # v5.4.0
+      - uses: actions/setup-python@v6
         with:
           python-version: '3.12'
       #----------------------------------------------
@@ -146,7 +146,7 @@ jobs:
       # ----------------------------------------------
       - name: Create Release
         if: steps.should_create_release.outputs.should_create_release == 'true'  
-        uses: softprops/action-gh-release@c95fe1489396fe8a9eb87c0abf8aa5b2ef267fda # v2.2.1
+        uses: softprops/action-gh-release@v2
         with:
           token: ${{ secrets.BOT_PR_PAT }}
           name: ${{ steps.prepare_release.outputs.tag }}

.github/workflows/pr-integration-tests.yaml

@@ -19,18 +19,18 @@ jobs:
       #       Check out repo
       #----------------------------------------------
       - name: Check out repository
-        uses: actions/checkout@11bd71901bbe5b1630ceea73d27597364c9af683 # v4.2.2
+        uses: actions/checkout@v5
       #----------------------------------------------
       #       Get docker compose
       #----------------------------------------------
       - name: Initialize Docker Compose
-        uses: isbang/compose-action@178aeba5c9dbeed89ffffbb3e6548ec08e9839cf # v1.5.1
+        uses: isbang/compose-action@v1.5.1
       #----------------------------------------------
       #       Get changed files
       #----------------------------------------------
       - name: Get changed files
         id: changed-files
-        uses: step-security/changed-files@3dbe17c78367e7d60f00d78ae6781a35be47b4a1 # v45.0.1
+        uses: tj-actions/changed-files@v47.0.0
       #----------------------------------------------
       #       Get changed plugins
       #----------------------------------------------
@@ -91,12 +91,53 @@ jobs:
       #----------------------------------------------
       - name: Run Integration Tests
         id: integration-tests
+        shell: bash
         run: |
           for dir in ${{ steps.changed-plugins.outputs.changed-plugins }}; do
-            echo "Running integration tests for $dir"
-            cd $dir/integration
-            docker compose down --remove-orphans
+
+            if [[ "$dir" == "cheqd" ]]; then
+              echo "⏭️  Skipping integration tests for $dir"
+              continue
+            fi
+
+            echo "🔧 Running integration tests for $dir"
+            cd "$dir/integration"
+
+            # Source init-network.sh if it exists
+            if [ -f ./init-network.sh ]; then
+              echo "📡 Sourcing init-network.sh"
+              . ./init-network.sh
+            fi
+
             docker compose build
-            docker compose run tests
+
+            if [[ "$dir" == "cache_redis" ]]; then
+
+              # Start everything in the background
+              echo "🚀 Starting docker compose stack..."
+              docker compose up -d
+
+              echo "🧪 Running tests container..."
+              docker compose run --rm tests
+              TEST_EXIT=$?
+
+              if [[ $TEST_EXIT -ne 0 ]]; then
+                echo "❌ Tests failed for $dir - dumping logs:"
+                docker compose logs || true
+                docker compose down --remove-orphans
+                exit $TEST_EXIT
+              fi
+            else
+              # Normal plugin flow
+              if ! docker compose up --exit-code-from tests; then
+                echo "❌ Tests failed for $dir - dumping logs:"
+                docker compose logs
+                docker compose down --remove-orphans
+                exit 1
+              fi
+            fi
+
+            echo "✅ Tests passed for $dir"
+            docker compose down --remove-orphans
             cd ../..
-          done
+          done

.github/workflows/pr-linting-and-unit-tests.yaml

@@ -20,14 +20,14 @@ jobs:
       #       Check out repo
       #----------------------------------------------
       - name: Check out repository
-        uses: actions/checkout@11bd71901bbe5b1630ceea73d27597364c9af683 # v4.2.2
+        uses: actions/checkout@v5
       #----------------------------------------------
       #       Install python and poetry with cache
       #----------------------------------------------
       - name: Install poetry
-        run: pipx install poetry
+        run: pipx install poetry==2.1.2
         id: setup-poetry
-      - uses: actions/setup-python@42375524e23c412d93fb67b49958b491fce71c38 # v5.4.0
+      - uses: actions/setup-python@v6
         with:
           python-version: "3.12"
           cache: "poetry"
@@ -36,7 +36,7 @@ jobs:
       #----------------------------------------------
       - name: Get changed files
         id: changed-files
-        uses: step-security/changed-files@3dbe17c78367e7d60f00d78ae6781a35be47b4a1 # v45.0.1
+        uses: tj-actions/changed-files@v47.0.0
       #----------------------------------------------
       #       Get changed plugins
       #----------------------------------------------
@@ -83,6 +83,7 @@ jobs:
           for dir in ${{ steps.changed-plugins.outputs.changed-plugins }}; do
             cd $dir
             poetry run ruff check .
+            poetry run ruff format --check .
             cd ..
           done
       #----------------------------------------------

.github/workflows/publish-docs.yml

@@ -14,13 +14,13 @@ jobs:
     runs-on: ubuntu-latest
     if: github.repository == 'openwallet-foundation/acapy-plugins'
     steps:
-      - uses: actions/checkout@11bd71901bbe5b1630ceea73d27597364c9af683 # v4.2.2
+      - uses: actions/checkout@v5
         with:
           fetch-depth: 0 # fetch all commits/branches
-      - uses: actions/setup-python@42375524e23c412d93fb67b49958b491fce71c38 # v5.4.0
+      - uses: actions/setup-python@v6
         with:
           python-version: 3.x
-      - uses: actions/cache@d4323d4df104b026a6aa633fdb11d772146be0bf # v4.2.2
+      - uses: actions/cache@v4
         with:
           key: ${{ github.ref }}
           path: .cache

.github/workflows/publish.yml

@@ -0,0 +1,168 @@
+name: Publish ACA-Py with Plugins
+run-name: Publish ACA-Py ${{ github.event.release.tag_name || github.event.inputs.version }} with all plugins
+
+on:
+  release:
+    types: [published]
+  workflow_dispatch:
+    inputs:
+      version:
+        description: 'ACA-Py version to build'
+        required: true
+        type: string
+
+permissions:
+  contents: read
+  packages: write
+
+jobs:
+  build-and-publish:
+    strategy:
+      fail-fast: false
+      matrix:
+        python-version: ["3.12"]
+        arch: ["amd64", "arm64"]
+        include:
+          - arch: amd64
+            runs-on: ubuntu-24.04
+          - arch: arm64
+            runs-on: ubuntu-24.04-arm
+
+    name: Build ACA-Py with Plugins (${{ matrix.arch }})
+    runs-on: ${{ matrix.runs-on }}
+    permissions:
+      contents: read
+      packages: write
+
+    steps:
+      - name: Checkout ACA-Py Plugins repository
+        uses: actions/checkout@v5
+
+      - name: Set up Python
+        uses: actions/setup-python@v6
+        with:
+          python-version: ${{ matrix.python-version }}
+
+      - name: Extract version and Python version from pyproject.toml
+        id: version
+        run: |
+          # Extract package name from pyproject.toml
+          PACKAGE_NAME=$(grep '^name = ' pyproject.toml | sed 's/name = "\(.*\)"/\1/')
+          echo "package_name=$PACKAGE_NAME" >> $PACKAGE_NAME
+
+          # Extract version from pyproject.toml
+          VERSION=$(grep '^version = ' pyproject.toml | sed 's/version = "\(.*\)"/\1/')
+          echo "version=$VERSION" >> $GITHUB_OUTPUT
+
+          # Extract Python version from pyproject.toml
+          PYTHON_VERSION=$(grep '^requires-python = ' pyproject.toml | sed 's/requires-python = ">=\([0-9]\+\.[0-9]\+\)"/\1/')
+          echo "python_version=$PYTHON_VERSION" >> $GITHUB_OUTPUT
+
+          echo "Building ACA-Py plugins bundle for version: $VERSION with Python: $PYTHON_VERSION"
+
+      - name: Set up Docker Buildx
+        uses: docker/setup-buildx-action@v3
+        with:
+          cache-binary: false
+          install: true
+          version: latest
+
+      - name: Log in to GitHub Container Registry
+        uses: docker/login-action@v3
+        with:
+          registry: ghcr.io
+          username: ${{ github.repository_owner }}
+          password: ${{ secrets.GITHUB_TOKEN }}
+
+      - name: Set lowercase repository owner
+        id: repo-owner
+        run: echo "owner=$(echo '${{ github.repository_owner }}' | tr '[:upper:]' '[:lower:]')" >> $GITHUB_OUTPUT
+
+      - name: Extract metadata for Docker tags
+        id: meta
+        uses: docker/metadata-action@v5
+        with:
+          images: ghcr.io/${{ steps.repo-owner.outputs.owner }}/${{ steps.version.outputs.package_name }}
+          tags: |
+            type=raw,value=${{ steps.version.outputs.version }}
+            type=raw,value=latest
+
+      - name: Build and push Docker image with all plugins
+        uses: docker/build-push-action@v6
+        with:
+          context: .
+          file: ./Dockerfile
+          build-args: |
+            ACA_PY_VERSION=${{ steps.version.outputs.version }}
+            REPO_OWNER=${{ github.repository_owner }}
+            PYTHON_VERSION=${{ steps.version.outputs.python_version }}
+          platforms: linux/${{ matrix.arch }}
+          push: true
+          tags: ${{ steps.meta.outputs.tags }}
+          labels: ${{ steps.meta.outputs.labels }}
+          cache-from: type=gha,scope=acapy-plugins-${{ matrix.arch }}
+          cache-to: type=gha,scope=acapy-plugins-${{ matrix.arch }},mode=max
+
+      - name: Display published image info
+        run: |
+          echo "✅ Successfully published ACA-Py with all plugins"
+          echo "Image: ghcr.io/${{ github.repository_owner }}/${{ steps.version.outputs.package_name }}:${{ steps.version.outputs.version }}"
+          echo "Architecture: ${{ matrix.arch }}"
+          echo "Tags: ${{ steps.meta.outputs.tags }}"
+
+  publish-manifest:
+    needs: build-and-publish
+    runs-on: ubuntu-latest
+    permissions:
+      contents: read
+      packages: write
+
+    steps:
+      - name: Extract version
+        id: version
+        run: |
+          if [ "${{ github.event_name }}" = "release" ]; then
+            VERSION="${{ github.event.release.tag_name }}"
+          else
+            VERSION="${{ github.event.inputs.version }}"
+          fi
+          echo "version=$VERSION" >> $GITHUB_OUTPUT
+
+      - name: Set up Docker Buildx
+        uses: docker/setup-buildx-action@v3
+        with:
+          cache-binary: false
+          install: true
+          version: latest
+
+      - name: Log in to GitHub Container Registry
+        uses: docker/login-action@v3
+        with:
+          registry: ghcr.io
+          username: ${{ github.repository_owner }}
+          password: ${{ secrets.GITHUB_TOKEN }}
+
+      - name: Create and push multi-arch manifest
+        run: |
+          docker manifest create \
+            ghcr.io/${{ github.repository_owner }}/${{ steps.version.outputs.package_name }}:${{ steps.version.outputs.version }} \
+            --amend ghcr.io/${{ github.repository_owner }}/${{ steps.version.outputs.package_name }}:${{ steps.version.outputs.version }}-amd64 \
+            --amend ghcr.io/${{ github.repository_owner }}/${{ steps.version.outputs.package_name }}:${{ steps.version.outputs.version }}-arm64
+
+          docker manifest push ghcr.io/${{ github.repository_owner }}/${{ steps.version.outputs.package_name }}:${{ steps.version.outputs.version }}
+
+          # Also update latest tag
+          docker manifest create \
+            ghcr.io/${{ github.repository_owner }}/${{ steps.version.outputs.package_name }}:latest \
+            --amend ghcr.io/${{ github.repository_owner }}/${{ steps.version.outputs.package_name }}:${{ steps.version.outputs.version }}-amd64 \
+            --amend ghcr.io/${{ github.repository_owner }}/${{ steps.version.outputs.package_name }}:${{ steps.version.outputs.version }}-arm64
+
+          docker manifest push ghcr.io/${{ github.repository_owner }}/${{ steps.version.outputs.package_name }}:latest
+
+      - name: Display final image info
+        run: |
+          echo "🎉 Multi-architecture image published successfully!"
+          echo "Image: ghcr.io/${{ github.repository_owner }}/${{ steps.version.outputs.package_name }}:${{ steps.version.outputs.version }}"
+          echo "Latest: ghcr.io/${{ github.repository_owner }}/${{ steps.version.outputs.package_name }}:latest"
+          echo "Architectures: amd64, arm64"
+          echo "Version: ${{ steps.version.outputs.version }}"

.gitignore

@@ -110,12 +110,6 @@ Pipfile.lock
 # mypy
 .mypy_cache/
 
-###
-### Visual Studio Code
-###
-
-.vscode/
-
 ###
 ### MacOS
 ###

DOCSITE.md

@@ -1,6 +1,6 @@
 # ACA-Py Plugins Documentation
 
-The documentation site for the ACA-Py plugins can be found at: [https://openwallet-foundation.github.io/acapy-plugins](https://openwallet-foundation.github.io/acapy-plugins).
+The documentation site for the ACA-Py plugins can be found at: [https://plugins.aca-py.org](https://plugins.aca-py.org).
 
 ## Managing the Documentation Site