Skip to content

Commit

Permalink
Fixed local iso building
Browse files Browse the repository at this point in the history
  • Loading branch information
anntnzrb committed Jun 22, 2021
1 parent da96ba0 commit 96e4027
Show file tree
Hide file tree
Showing 5 changed files with 50 additions and 10 deletions.
4 changes: 2 additions & 2 deletions .github/workflows/build.yaml
Original file line number Diff line number Diff line change
Expand Up @@ -37,10 +37,10 @@ jobs:
- name: Build ISO
run: |
# Write out the channels file so it can be included
guix describe -f channels > channels.scm
guix time-machine -C './guix/base-channels.scm' -- describe -f channels > './guix/channels.scm'
# Build the image
image=$(guix system image -t iso9660 installer.scm)
image=$(guix time-machine -C './guix/channels.scm' -- system image -t iso9660 './guix/installer.scm')
# Copy the image to the local folder with a better name
export RELEASE_TAG=$(date +"%Y%m%d%H%M")
Expand Down
4 changes: 2 additions & 2 deletions .gitignore
Original file line number Diff line number Diff line change
@@ -1,2 +1,2 @@
./channels.scm
./guix-installer.iso
*.iso
./guix/channels.scm
40 changes: 34 additions & 6 deletions build-iso.sh
Original file line number Diff line number Diff line change
@@ -1,9 +1,37 @@
#!/bin/sh

# Write out the current channels to be included with the image
guix describe -f channels > ./channels.scm
# -----------------------------------------------------------------------------
# Utilities
# -----------------------------------------------------------------------------

# Build the image and copy it to the current directory
image=$(guix system image -t iso9660 ./installer.scm)
echo "Built image: $image"
cp $image ./guix-installer.iso
die() {
# **
# Prints a message to stderr & exits script with non-successful code "1"
# *

printf '%s\n' "$@" >&2
exit 1
}

# -----------------------------------------------------------------------------
# Main
# -----------------------------------------------------------------------------

# Write out the channels file so it can be included
guix time-machine -C './guix/base-channels.scm' -- \
describe -f channels > './guix/channels.scm'

# Build the image
printf 'Attempting to build the image...\n\n'
image=$(guix time-machine -C './guix/channels.scm' -- system image -t iso9660 './guix/installer.scm') \
|| die 'Could not create image.'

release_tag=$(date +"%Y%m%d%H%M")
cp "${image}" "./guix-installer-${release_tag}.iso" ||
die 'An error occurred while copying.'

printf 'Image was succesfully built: %s\n' "${image}"

# cleanup
unset -f die
unset -v image release_tag
12 changes: 12 additions & 0 deletions guix/base-channels.scm
Original file line number Diff line number Diff line change
@@ -0,0 +1,12 @@
;; Reference :: https://gitlab.com/nonguix/nonguix

(cons* (channel
(name 'nonguix)
(url "https://gitlab.com/nonguix/nonguix")
;; Enable signature verification:
(introduction
(make-channel-introduction
"897c1a470da759236cc11798f4e0a5f7d4d59fbc"
(openpgp-fingerprint
"2A39 3FFF 68F4 EF7A 3D29 12AF 6F51 20A0 22FB B2D5"))))
%default-channels)
File renamed without changes.

0 comments on commit 96e4027

Please sign in to comment.