Merge branch 'main' into dependabot/npm_and_yarn/prettier-plugin-tail…

…windcss-0.6.3
canonical · Jun 13, 2024 · 9696abf · 9696abf
2 parents 6d99534 + afdd316
commit 9696abf
Show file tree

Hide file tree

Showing 2 changed files with 5 additions and 9 deletions.
diff --git a/.github/workflows/integration_tests.yaml b/.github/workflows/integration_tests.yaml
@@ -12,14 +12,12 @@ jobs:
 
       - uses: canonical/craft-actions/rockcraft-pack@main
         id: rockcraft
-
-      - name: Install Skopeo
-        run: |
-          sudo snap install skopeo --edge --devmode
+        with:
+          rockcraft-channel: edge
 
       - name: Import the image to Docker registry
         run: |
-          sudo skopeo --insecure-policy copy oci-archive:${{ steps.rockcraft.outputs.rock }} docker-daemon:sdcore-nms:0.1
+          sudo rockcraft.skopeo --insecure-policy copy oci-archive:${{ steps.rockcraft.outputs.rock }} docker-daemon:sdcore-nms:0.1
 
       - name: Run the image
         run: |

diff --git a/.github/workflows/publish.yaml b/.github/workflows/publish.yaml
@@ -17,9 +17,6 @@ jobs:
           username: ${{ github.actor }}
           password: ${{ secrets.GITHUB_TOKEN }}
 
-      - name: Install skopeo
-        run: |
-          sudo snap install --devmode --channel edge skopeo
       - name: Install yq
         run: |
           sudo snap install yq
@@ -29,12 +26,13 @@ jobs:
 
       - name: Import
         run: |
+          sudo snap install rockcraft --edge --classic
           image_name="$(yq '.name' rockcraft.yaml)"
           echo "image_name=${image_name}" >> $GITHUB_ENV
           version="$(yq '.version' rockcraft.yaml)"
           echo "version=${version}" >> $GITHUB_ENV
           rock_file=$(ls *.rock | tail -n 1)
-          sudo skopeo \
+          sudo rockcraft.skopeo \
             --insecure-policy \
             copy \
             oci-archive:"${rock_file}" \