🚧

.github/actions/deploy-eks/action.yml

@@ -3,41 +3,41 @@ description: Deploy to EKS
 
 inputs:
   aws-region:
-    description: "The AWS region where the EKS cluster is located"
+    description: The AWS region where the EKS cluster is located
     required: true
   aws-role-arn:
-    description: "The ARN of the AWS role to assume"
+    description: The ARN of the AWS role to assume
     required: true
   aws-role-session-name:
-    description: "The name of the AWS role session"
+    description: The name of the AWS role session
     required: true
   clean-start:
-    description: "Whether to clean up the EKS cluster before deploying"
+    description: Whether to clean up the EKS cluster before deploying
     required: false
     default: "false"
   cluster-name:
-    description: "The name of the EKS cluster"
+    description: The name of the EKS cluster
     required: true
   environment:
-    description: "The environment to deploy to"
+    description: The environment to deploy to
     required: true
   helm-version:
-    description: "The version of Helm to use"
+    description: The version of Helm to use
     required: false
     default: v3.17.0
   helmfile-plugins:
-    description: "The Helmfile plugins to install"
+    description: The Helmfile plugins to install
     required: false
     default: https://github.com/databus23/helm-diff
   helmfile-version:
-    description: "The version of Helmfile to use"
+    description: The version of Helmfile to use
     required: false
     default: v0.170.1
   image-tag:
-    description: "The tag of the Docker image to deploy"
+    description: The tag of the Docker image to deploy
     required: true
   namespace:
-    description: "The Kubernetes namespace to deploy to"
+    description: The Kubernetes namespace to deploy to
     required: true
 
 runs:

.github/actions/test-eks/action.yml

@@ -3,47 +3,67 @@ description: Run Tests against EKS
 
 inputs:
   clean-start:
-    description: "Whether this is a clean start or not"
+    description: Whether this is a clean start or not
     required: false
     default: "false"
   environment:
-    description: "The environment to deploy to"
+    description: The environment to deploy to
     required: true
   helm-version:
-    description: "The version of Helm to use"
+    description: The version of Helm to use
     required: false
     default: v3.17.0
   helmfile-plugins:
-    description: "The Helmfile plugins to install"
+    description: The Helmfile plugins to install
     required: false
     default: https://github.com/databus23/helm-diff
   helmfile-version:
-    description: "The version of Helmfile to use"
+    description: The version of Helmfile to use
     required: false
     default: v0.170.1
   image-tag:
-    description: "The tag of the Docker image to deploy"
+    description: The tag of the Docker image to deploy
     required: true
+  mise-version:
+    description: "The version of Mise to use"
+    required: false
+    default: "2025.2.3"
   namespace:
-    description: "The Kubernetes namespace to deploy to"
+    description: The Kubernetes namespace to deploy to
     required: true
   pytest-completions:
-    description: "How many completions to run"
+    description: How many completions to run
     required: false
     default: "1"
   regression-tests:
-    description: "Whether to run regression tests"
+    description: Whether to run regression tests
     required: false
     default: "true"
   run-tests:
-    description: "Whether to run tests"
+    description: Whether to run tests
     required: false
     default: "true"
 
 runs:
   using: composite
 
   steps:
+    - name: Set up Mise
+      uses: jdx/mise-action@v2
+      with:
+        version: ${{ inputs.mise-version }}
+        cache: true
+        experimental: true # Required for mise tasks
+        install: true
+      env:
+        MISE_JOBS: 4
+    - name: Load Mise env
+      shell: bash
+      run: |
+        mise env -s bash \
+            | grep -v 'export PATH=' \
+            | cut -d' ' -f2 \
+            >> "$GITHUB_ENV"
     - name: Helmfile run regression tests
       if: inputs.regression-tests == 'true'
       id: pytest-regression

.github/workflows/cicd.yml

@@ -461,22 +461,6 @@ jobs:
         with:
           persist-credentials: false
 
-      - name: Set up Mise
-        uses: jdx/mise-action@v2
-        with:
-          version: ${{ env.MISE_VERSION }}
-          cache: true
-          experimental: true # Required for mise tasks
-          install: true
-        env:
-          MISE_JOBS: 4
-      - name: Load Mise env
-        run: |
-          mise env -s bash \
-              | grep -v 'export PATH=' \
-              | cut -d' ' -f2 \
-              >> "$GITHUB_ENV"
-
       - uses: tailscale/github-action@main
         with:
           authkey: ${{ secrets.TAILSCALE_AUTHKEY }}
@@ -506,6 +490,7 @@ jobs:
           helmfile-plugins: https://github.com/databus23/helm-diff
           helmfile-version: ${{ env.HELMFILE_VERSION }}
           image-tag: ${{ needs.build.outputs.image_version }}
+          mise-version: ${{ env.MISE_VERSION }}
           namespace: acapy-cloud-dev
           pytest-completions: 1
           regression-tests: ${{ github.event.inputs.regression-tests || true }}
@@ -548,11 +533,16 @@ jobs:
                 workflow_id: 'cd.yml',
                 ref: 'chore/cd',
                 inputs: {
+                  'helm-version': process.env.HELM_VERSION,
+                  'helmfile-version': process.env.HELMFILE_VERSION,
+                  'mise-version': process.env.MISE_VERSION,
+                  'tailscale-version': process.env.TAILSCALE_VERSION,
+
                   'acapy-cloud-ref': process.env.ACAPY_CLOUD_REF,
                   'image-tag': process.env.IMAGE_TAG,
                   'reset-deployments': process.env.RESET_DEPLOYMENTS,
                   'regression-tests': process.env.REGRESSION_TESTS,
-                  'run-tests': process.env.RUN_TESTS
+                  'run-tests': process.env.RUN_TESTS,
                 }
               })
               console.log(result)