Merge branch 'v3' into add-microk8s-controller

canonical · May 24, 2024 · 3fe239b · 3fe239b
2 parents 32786af + b93a680
commit 3fe239b
Show file tree

Hide file tree

Showing 3 changed files with 6 additions and 1 deletion.
diff --git a/.github/workflows/jaas-snap-release.yaml b/.github/workflows/jaas-snap-release.yaml
@@ -12,3 +12,4 @@ jobs:
     with:
       folder: jaas
       release-channel: 3/edge
+    secrets: inherit
diff --git a/.github/workflows/jimmctl-snap-release.yaml b/.github/workflows/jimmctl-snap-release.yaml
@@ -12,4 +12,5 @@ jobs:
     with:
       folder: jimmctl
       release-channel: 3/edge
+    secrets: inherit
 
diff --git a/.github/workflows/snap-release.yaml b/.github/workflows/snap-release.yaml
@@ -9,6 +9,10 @@ on:
       release-channel:
         required: true
         type: string
+    secrets:
+      STORE_LOGIN:
+        required: true
+
 
 # Note this workflow requires a Github secret to provide auth against snapstore.
 # snapcraft export-login --snaps=PACKAGE_NAME --acls package_access,package_push,package_update,package_release exported.txt
@@ -47,6 +51,5 @@ jobs:
       env:
         SNAPCRAFT_STORE_CREDENTIALS: ${{ secrets.STORE_LOGIN }}
       with:
-        store_login: ${{ secrets.STORE_LOGIN }}
         snap: ${{needs.build.outputs.snap}}
         release: '${{ inputs.release-channel }}'