Move rock and snap-related files into the packaging directory

OpenPrinting · Jan 13, 2025 · 0aae4cc · 0aae4cc
1 parent ab04369
commit 0aae4cc
Show file tree

Hide file tree

Showing 23 changed files with 11 additions and 11 deletions.
diff --git a/.github/workflows/auto-update.yml b/.github/workflows/auto-update.yml
@@ -29,7 +29,7 @@ jobs:
           token: ${{ secrets.GITHUB_TOKEN }}
           repo: ${{ github.repository }}
           version-schema: 'v(\d+\.\d+\.\d+)'
-          yaml-path: 'packages/snapcraft.yaml'
+          yaml-path: 'packaging/snapcraft.yaml'
 
       - name: Run desktop-snaps action (Rockcraft)
         if: ${{ github.event_name == 'schedule' || github.event.inputs.workflow_choice == 'rockcraft' || github.event.inputs.workflow_choice == 'both' }}
@@ -38,5 +38,5 @@ jobs:
           token: ${{ secrets.GITHUB_TOKEN }}
           repo: ${{ github.repository }}
           rock-version-schema: 'v(\d+\.\d+\.\d+)'
-          yaml-path: 'packages/rockcraft.yaml'
-          readme-path: packages/README.md
+          yaml-path: 'packaging/rockcraft.yaml'
+          readme-path: packaging/README.md
diff --git a/.github/workflows/packages-ci.yml b/.github/workflows/packages-ci.yml
@@ -22,7 +22,7 @@ jobs:
         uses: canonical/craft-actions/rockcraft-pack@main
         id: rockcraft
         with:
-          path: packages
+          path: packaging
 
       - name: Upload Rock Artifact
         uses: actions/upload-artifact@v4
@@ -40,7 +40,7 @@ jobs:
         uses: snapcore/action-build@v1
         id: snapcraft
         with:
-          path: packages
+          path: packaging
 
   test:
     needs: build-rock

diff --git a/.github/workflows/registry-actions.yml b/.github/workflows/registry-actions.yml
@@ -1,4 +1,4 @@
-name: Pack and Publish OCI Image to Docker Registry and GitHub Packages
+name: Pack and Publish OCI Image to Docker Registry and GitHub packaging
 
 on:
   push:
@@ -32,7 +32,7 @@ jobs:
         uses: canonical/craft-actions/rockcraft-pack@main
         id: rockcraft
         with:
-          path: packages
+          path: packaging
 
       - name: Upload Rock Artifact
         uses: actions/upload-artifact@v4
@@ -84,8 +84,8 @@ jobs:
           USERNAME: ${{ secrets.DOCKER_USERNAME }}
           ORG: ${{ github.repository_owner }}
         run: |
-          IMAGE="$(yq '.name' packages/rockcraft.yaml)"
-          VERSION="$(yq '.version' packages/rockcraft.yaml)"
+          IMAGE="$(yq '.name' packaging/rockcraft.yaml)"
+          VERSION="$(yq '.version' packaging/rockcraft.yaml)"
           ROCK="$(ls *.rock | tail -n 1)"
           ORG_NAME=$(echo "${ORG}" | tr '[:upper:]' '[:lower:]')
           sudo rockcraft.skopeo --insecure-policy copy oci-archive:"${ROCK}" docker-daemon:"${ORG_NAME}/${IMAGE}:${VERSION}-edge"
@@ -107,8 +107,8 @@ jobs:
           USERNAME: ${{ secrets.DOCKER_USERNAME }}
           ORG: ${{ github.repository_owner }}
         run: |
-            IMAGE="$(yq '.name' packages/rockcraft.yaml)"
-            VERSION="$(yq '.version' packages/rockcraft.yaml)"
+            IMAGE="$(yq '.name' packaging/rockcraft.yaml)"
+            VERSION="$(yq '.version' packaging/rockcraft.yaml)"
             ROCK="$(ls *.rock | tail -n 1)"
             ORG_NAME=$(echo "${ORG}" | tr '[:upper:]' '[:lower:]')
             sudo rockcraft.skopeo --insecure-policy copy oci-archive:"${ROCK}" docker-daemon:"${ORG_NAME}/${IMAGE}:${VERSION}-stable"

diff --git a/packages/README.md → packaging/README.md b/packages/README.md → packaging/README.md
diff --git a/packages/TESTING.md → packaging/TESTING.md b/packages/TESTING.md → packaging/TESTING.md
diff --git a/packages/cups-proxyd/Makefile → packaging/cups-proxyd/Makefile b/packages/cups-proxyd/Makefile → packaging/cups-proxyd/Makefile
diff --git a/packages/cups-proxyd/cups-proxyd.c → packaging/cups-proxyd/cups-proxyd.c b/packages/cups-proxyd/cups-proxyd.c → packaging/cups-proxyd/cups-proxyd.c
diff --git a/...s/cups-proxyd/org.cups.cupsd.Notifier.xml → ...g/cups-proxyd/org.cups.cupsd.Notifier.xml b/...s/cups-proxyd/org.cups.cupsd.Notifier.xml → ...g/cups-proxyd/org.cups.cupsd.Notifier.xml
diff --git a/packages/cups-proxyd/proxy.c → packaging/cups-proxyd/proxy.c b/packages/cups-proxyd/proxy.c → packaging/cups-proxyd/proxy.c
diff --git a/packages/cupsd.conf → packaging/cupsd.conf b/packages/cupsd.conf → packaging/cupsd.conf
diff --git a/...s/use-snapctl-with-slot-cups-server.patch → ...s/use-snapctl-with-slot-cups-server.patch b/...s/use-snapctl-with-slot-cups-server.patch → ...s/use-snapctl-with-slot-cups-server.patch
diff --git a/packages/rockcraft.yaml → packaging/rockcraft.yaml b/packages/rockcraft.yaml → packaging/rockcraft.yaml
diff --git a/packages/scripts/port-occupied.c → packaging/scripts/port-occupied.c b/packages/scripts/port-occupied.c → packaging/scripts/port-occupied.c
diff --git a/packages/scripts/reload-cups-browsed → packaging/scripts/reload-cups-browsed b/packages/scripts/reload-cups-browsed → packaging/scripts/reload-cups-browsed
diff --git a/packages/scripts/reload-cupsd → packaging/scripts/reload-cupsd b/packages/scripts/reload-cupsd → packaging/scripts/reload-cupsd
diff --git a/packages/scripts/run-cups-browsed → packaging/scripts/run-cups-browsed b/packages/scripts/run-cups-browsed → packaging/scripts/run-cups-browsed
diff --git a/packages/scripts/run-cupsd → packaging/scripts/run-cupsd b/packages/scripts/run-cupsd → packaging/scripts/run-cupsd
diff --git a/packages/scripts/run-cupsd.sh → packaging/scripts/run-cupsd.sh b/packages/scripts/run-cupsd.sh → packaging/scripts/run-cupsd.sh
diff --git a/packages/scripts/run-dbus.sh → packaging/scripts/run-dbus.sh b/packages/scripts/run-dbus.sh → packaging/scripts/run-dbus.sh
diff --git a/packages/scripts/run-util → packaging/scripts/run-util b/packages/scripts/run-util → packaging/scripts/run-util
diff --git a/packages/scripts/stop-cups-browsed → packaging/scripts/stop-cups-browsed b/packages/scripts/stop-cups-browsed → packaging/scripts/stop-cups-browsed
diff --git a/packages/scripts/stop-cupsd → packaging/scripts/stop-cupsd b/packages/scripts/stop-cupsd → packaging/scripts/stop-cupsd
diff --git a/packages/snapcraft.yaml → packaging/snapcraft.yaml b/packages/snapcraft.yaml → packaging/snapcraft.yaml