ci: attempt to use cross-rs image for release job

Author: cilki

.github/workflows/release.yml

@@ -25,7 +25,7 @@ jobs:
   linux:
     name: linux / ${{ matrix.target }}
     runs-on: ubuntu-latest
-    needs: github
+    # needs: github
     strategy:
       fail-fast: false
       matrix:
@@ -35,29 +35,23 @@ jobs:
           - i686-unknown-linux-gnu
           - x86_64-unknown-linux-gnu
           - x86_64-unknown-linux-musl
+    container:
+      image: ghcr.io/cross-rs/${{ matrix.target }}:latest
+      options: --user=root
     steps:
-      # TODO this needs to run in the cross container
-      # - name: Install dependencies
-      #   run: |
-      #     sudo apt-get update
-      #     sudo apt-get install -y libudev-dev libgtk-4-dev libglib2.0-dev
-
-      - uses: actions-rs/toolchain@v1
-        with:
-          toolchain: nightly
-          profile: minimal
-          override: true
-          target: ${{ matrix.target }}
+      - name: Install dependencies
+        run: |
+          apt-get update
+          apt-get install -y libudev-dev libgtk-4-dev libglib2.0-dev
 
       - uses: actions/checkout@v4
         with:
           fetch-tags: true
 
       - uses: actions-rs/cargo@v1
         with:
-          use_cross: true
           command: build
-          args: --release --target ${{ matrix.target }}
+          args: --release --target ${{ matrix.target }} --features gui
 
       - uses: actions/upload-artifact@v4
         with:

goldboot-image/src/lib.rs

@@ -757,9 +757,13 @@ impl ImageHandle {
 
             // Jump to the block corresponding to the cluster
             dest.seek(SeekFrom::Start(entry.block_offset))?;
-            dest.read_exact(&mut block)?;
-
-            let hash: [u8; 32] = Sha256::new().chain_update(&block).finalize().into();
+            let hash: [u8; 32] = match dest.read_exact(&mut block) {
+                Ok(_) => Sha256::new().chain_update(&block).finalize().into(),
+                Err(_) => {
+                    // TODO check for EOF error
+                    [0u8; 32]
+                }
+            };
 
             if hash != entry.digest {
                 // Read cluster
@@ -791,7 +795,7 @@ impl ImageHandle {
 
                 // Write the cluster to the block
                 dest.seek(SeekFrom::Start(entry.block_offset))?;
-                // dest.write_all(&cluster.data)?;
+                dest.write_all(&cluster.data)?;
             }
 
             progress(

goldboot/src/cli/cmd/cast.rs

@@ -47,7 +47,7 @@ pub fn run(cmd: super::Commands) -> ExitCode {
             // Fully verify config before proceeding
             match foundry.validate() {
                 Err(err) => {
-                    error!(error = %err, "Failed to validate config file");
+                    error!(error = ?err, "Failed to validate config file");
                     return ExitCode::FAILURE;
                 }
                 _ => debug!("Validated config file"),
@@ -56,7 +56,7 @@ pub fn run(cmd: super::Commands) -> ExitCode {
             // Run the build finally
             match foundry.run(output) {
                 Err(err) => {
-                    error!(error = %err, "Failed to cast image");
+                    error!(error = ?err, "Failed to cast image");
                     ExitCode::FAILURE
                 }
                 _ => ExitCode::SUCCESS,

goldboot/src/cli/cmd/deploy.rs

@@ -47,7 +47,7 @@ pub fn run(cmd: super::Commands) -> ExitCode {
 
             match image_handle.write(output, ProgressBar::Write.new_empty()) {
                 Err(err) => {
-                    error!(error = %err, "Failed to write image");
+                    error!(error = ?err, "Failed to write image");
                     ExitCode::FAILURE
                 }
                 _ => ExitCode::SUCCESS,

goldboot/src/cli/cmd/init.rs

@@ -194,7 +194,7 @@ pub fn run(cmd: super::Commands) -> ExitCode {
             // Finally write out the config
             match config_path.write(&foundry) {
                 Err(err) => {
-                    error!(error = %err, "Failed to write config file");
+                    error!(error = ?err, "Failed to write config file");
                     ExitCode::FAILURE
                 }
                 _ => {

goldboot/src/cli/cmd/liveusb.rs

@@ -39,13 +39,13 @@ pub fn run(cmd: super::Commands) -> ExitCode {
                     .interact()
                     .unwrap()
                 {
-                    std::process::exit(0);
+                    return ExitCode::FAILURE;
                 }
             }
 
             match image_handles[0].write(dest, ProgressBar::Write.new_empty()) {
                 Err(err) => {
-                    error!(error = %err, "Failed to write image");
+                    error!(error = ?err, "Failed to write image");
                     ExitCode::FAILURE
                 }
                 _ => ExitCode::SUCCESS,

goldboot/src/foundry/molds/goldboot/mod.rs

@@ -56,13 +56,17 @@ impl DefaultSource for Goldboot {
 
 impl CastImage for Goldboot {
     fn cast(&self, worker: &FoundryWorker) -> Result<()> {
+        // Load goldboot executable
+        let exe = if let Some(path) = self.executable.as_ref() {
+            std::fs::read(path)?
+        } else {
+            get_latest_release(OsCategory::Linux, worker.arch)?
+        };
+
         let mut qemu = QemuBuilder::new(&worker, OsCategory::Linux)
             .vga("cirrus")
             .source(&worker.element.source)?
-            .drive_files(HashMap::from([(
-                "goldboot".to_string(),
-                get_latest_release(OsCategory::Linux, worker.arch)?,
-            )]))?
+            .drive_files(HashMap::from([("goldboot".to_string(), exe)]))?
             .start()?;
 
         // Start HTTP
@@ -90,7 +94,8 @@ impl CastImage for Goldboot {
             enter!("cp /mnt/goldboot /usr/bin/goldboot"),
             enter!("chmod +x /usr/bin/goldboot"),
             // Skip getty login
-            enter!("sed -i 's|ExecStart=.*$|ExecStart=/usr/bin/goldboot|' /usr/lib/systemd/system/[email protected]"),
+            enter!("echo 'exec /usr/bin/goldboot' >/root/.xinitrc"),
+            enter!("sed -i 's|ExecStart=.*$|ExecStart=/usr/bin/startx|' /usr/lib/systemd/system/[email protected]"),
             // Stop gracefully
             enter!("poweroff"),
 		])?;

goldboot/src/foundry/molds/goldboot/preseed.cfg

@@ -368,7 +368,7 @@ tasksel tasksel/first multiselect minimal
 #d-i pkgsel/run_tasksel boolean false
 
 # Individual additional packages to install
-d-i pkgsel/include string curl libgtk-4-1 tpm2-tools xorg
+d-i pkgsel/include string libgtk-4-1 tpm2-tools xorg
 # Whether to upgrade packages after debootstrap.
 # Allowed values: none, safe-upgrade, full-upgrade
 d-i pkgsel/upgrade select safe-upgrade
@@ -411,10 +411,13 @@ d-i grub-installer/with_other_os boolean true
 # or encrypted using an MD5 hash, see grub-md5-crypt(8).
 #d-i grub-installer/password-crypted password [MD5 hash]
 
+# Never show boot menu
+grub-pc grub-pc/timeout string 0
+
 # Use the following option to add additional boot parameters for the
 # installed system (if supported by the bootloader installer).
 # Note: options passed to the installer will be added automatically.
-d-i debian-installer/add-kernel-opts string quiet loglevel=3 rd.systemd.show_status=auto rd.udev.log_level=3
+d-i debian-installer/add-kernel-opts string quiet loglevel=0 rd.systemd.show_status=no rd.udev.log_level=0
 
 ### Finishing up the installation
 # During installations from serial console, the regular virtual consoles

goldboot/src/main.rs

@@ -74,6 +74,9 @@ pub fn main() -> ExitCode {
         #[cfg(feature = "gui")]
         None => goldboot::gui::load_gui(command_line.fullscreen),
         #[cfg(not(feature = "gui"))]
-        None => panic!("Not supported"),
+        None => {
+            error!("GUI support not compiled in");
+            return ExitCode::FAILURE;
+        }
     }
 }