Merge go-debos#375 go-debos#387

375: Modernise example recipes and fix bug r=obbardc a=obbardc Fixes https://bugs.debian.org/cgi-bin/bugreport.cgi?bug=1006823 387: ci: remove deprecated set-output r=obbardc a=evelikov The option is deprecated and we should be using $GITHUB_OUTPUT instead. See the official announcement for details: https://github.blog/changelog/2022-10-11-github-actions-deprecating-save-state-and-set-output-commands/ Co-authored-by: Christopher Obbard <[email protected]> Co-authored-by: Emil Velikov <[email protected]>
kgoger · Jan 3, 2023 · bcee56f · bcee56f
3 parents 0c8e97d + cc75f7d + 37cea98
commit bcee56f
Show file tree

Hide file tree

Showing 3 changed files with 13 additions and 12 deletions.
diff --git a/.github/workflows/ci.yaml b/.github/workflows/ci.yaml
@@ -250,12 +250,12 @@ jobs:
                 "${{ secrets.DOCKERHUB_PASSWORD }}" != "" ]]; \
           then
             echo "Dockerhub secrets exist"
-            echo "::set-output name=has-secrets::true"
+            echo "has-secrets=true" >> $GITHUB_OUTPUT
           else
             echo "Dockerhub secrets do not exist; not pushing to Dockerhub"
             echo "Please set the following secrets on GitHub (settings > secrets > actions > new):"
             echo "DOCKERHUB_IMAGE, DOCKERHUB_USERNAME, DOCKERHUB_PASSWORD"
-            echo "::set-output name=has-secrets::false"
+            echo "has-secrets=false" >> $GITHUB_OUTPUT
           fi
 
   publish-dockerhub:

diff --git a/doc/examples/example.yaml → doc/examples/debian-example-ospack.yaml b/doc/examples/example.yaml → doc/examples/debian-example-ospack.yaml
@@ -1,6 +1,6 @@
-{{- $architecture := or .architecture "arm64" -}}
-{{- $suite := or .suite "buster" -}}
-{{ $image := or .image (printf "debian-%s-%s.tgz" $suite $architecture) }}
+{{ $architecture := or .architecture "arm64" }}
+{{ $suite := or .suite "bullseye" }}
+{{ $image := or .image (printf "debian-example-ospack-%s-%s.tar.gz" $suite $architecture) }}
 
 architecture: {{ $architecture }}
 
@@ -9,25 +9,26 @@ actions:
     suite: {{ $suite }}
     components:
       - main
-      - contrib
-      - non-free
     mirror: https://deb.debian.org/debian
     variant: minbase
 
   - action: apt
     description: Install some packages
-    packages: [ sudo, openssh-server, adduser, systemd-sysv, firmware-linux ]
+    packages:
+      - sudo
+      - openssh-server
+      - adduser
+      - systemd-sysv
 
   - action: run
     chroot: true
-    script: setup-user.sh
+    script: scripts/setup-user.sh
 
   - action: overlay
     source: overlays/sudo
 
   - action: run
-    chroot: true
-    command: echo debian > /etc/hostname
+    command: echo debian > ${ROOTDIR}/etc/hostname
 
   - action: pack
     file: {{ $image }}

diff --git a/doc/examples/setup-user.sh → doc/examples/scripts/setup-user.sh b/doc/examples/setup-user.sh → doc/examples/scripts/setup-user.sh
@@ -3,7 +3,7 @@
 set -e
 
 echo "I: create user"
-adduser --gecos User user
+adduser --gecos User --disabled-password user
 
 echo "I: set user password"
 echo "user:user" | chpasswd