Merge pull request #26 from RustLangES/cd-archs

Agregando más arquitecturas

Author: SergioRibera

.github/workflows/release.yml

@@ -2,45 +2,78 @@ name: Release Build and Publish
 
 permissions:
   contents: write
+  pull-requests: read
 
 on:
   push:
     tags:
       - "v*"
+  pull_request:
   workflow_dispatch:
     inputs:
       release_name:
-        description: "Name of release"
+        description: "Name of release (optional)"
         required: false
         default: ""
+      create_release:
+        description: "Create a GitHub release? (true/false)"
+        required: false
+        default: "false"
 
 jobs:
   build:
     runs-on: ubuntu-latest
+    strategy:
+      fail-fast: false
+      matrix:
+        include:
+          - arch: "x86_64"
+            rust_target: "x86_64-unknown-none"
+            name: "x86_64"
+          - arch: "aarch64"
+            rust_target: "aarch64-unknown-none"
+            name: "aarch64"
+          - arch: "aarch64"
+            rust_target: "aarch64-unknown-uefi"
+            name: "aarch64-uefi"
+          - arch: "riscv64"
+            rust_target: "riscv64imac-unknown-none-elf"
+            name: "riscv64-imac"
+          - arch: "riscv64"
+            rust_target: "riscv64gc-unknown-none-elf"
+            name: "riscv64-gc"
+    env:
+      RUST_PROFILE: "release"
+      ARCH: "${{ matrix.arch }}"
+      RUST_TARGET: "${{ matrix.rust_target }}"
+      IMAGE_NAME: "memsos_${{ matrix.name }}-${{ github.event.inputs.release_name || (github.event_name == 'pull_request' && format('pr-{0}', github.event.pull_request.number) || github.ref_name) }}"
 
     steps:
       - uses: actions/checkout@v4
-      - uses: dtolnay/rust-toolchain@stable
 
-      - name: Build release
-        run: cargo build --release
-      
-      - name: Install xorriso
-        run: sudo apt-get install xorriso
+      - name: Install Nix
+        uses: cachix/install-nix-action@v30
+        with:
+          nix_path: nixpkgs=channel:nixos-unstable
+          github_access_token: ${{ secrets.GITHUB_TOKEN }}
+          extra_nix_config: |
+            experimental-features = nix-command flakes
 
-      - name: Convert BIOS image to ISO
+      - name: Normalize IMAGE_NAME
         run: |
-          mkdir -p isos
-          cp target/bios.img isos/bios.img
-          xorriso -as mkisofs -o isos/bios.iso isos/bios.img
+          IMAGE_NAME=$(echo "${{ env.IMAGE_NAME }}" | tr -cd '[:alnum:]._-')
+          echo "IMAGE_NAME=${IMAGE_NAME}" >> $GITHUB_ENV
 
-      - name: Convert UEFI image to ISO
+      - name: Build with Nix
         run: |
-          cp target/uefi.img isos/uefi.img
-          xorriso -as mkisofs -o isos/uefi.iso isos/uefi.img
+          echo "Building for ${{ matrix.arch }} with target ${{ matrix.rust_target }}..."
+          nix build .#${{ matrix.name }}
 
-      - name: Get tag or manual release name
-        id: tag_name
+          mkdir -p isos
+          cp result/memsos-${{ matrix.name }}.iso isos/${{ env.IMAGE_NAME }}.iso
+
+      - name: Get release name
+        id: release_name
         run: |
           if [ -n "${{ github.event.inputs.release_name }}" ]; then
             echo "RELEASE_NAME=${{ github.event.inputs.release_name }}" >> $GITHUB_ENV
@@ -52,19 +85,39 @@ jobs:
         id: commit_history
         run: |
           if [ -n "${{ github.event.inputs.release_name }}" ]; then
-            # Si es un lanzamiento manual, muestra los últimos 10 commits
             echo "COMMIT_HISTORY=$(git log --pretty=format:'- %s (by @%an)' -n 10)" >> $GITHUB_ENV
           else
-            # Si es un lanzamiento automático, muestra los commits desde el último tag
             echo "COMMIT_HISTORY=$(git log --pretty=format:'- %s (by @%an)' $(git describe --tags --abbrev=0)..HEAD)" >> $GITHUB_ENV
           fi
 
+      - name: Upload ISO as artifact
+        uses: actions/upload-artifact@v4
+        with:
+          name: iso-${{ matrix.name }}
+          path: isos/${{ env.IMAGE_NAME }}.iso
+
+  create-release:
+    runs-on: ubuntu-latest
+    needs: build
+    if: ${{ (github.event.inputs.create_release == 'true' || github.event_name == 'push') && github.event_name != 'pull_request' }}
+    steps:
+      - name: Download ISOs
+        uses: actions/download-artifact@v4
+        with:
+          path: isos
+
+      - name: Combine ISOs into a single folder
+        run: |
+          mkdir -p combined_isos
+          for iso in isos/iso-*/*.iso; do
+            cp "$iso" combined_isos/
+          done
+
       - name: Create Release
         uses: softprops/action-gh-release@v2
         with:
-          tag_name: ${{ env.RELEASE_NAME }}
-          name: ${{ env.RELEASE_NAME }}
-          body: ${{ env.COMMIT_HISTORY }}
+          tag_name: ${{ needs.build.outputs.RELEASE_NAME }}
+          name: ${{ needs.build.outputs.RELEASE_NAME }}
+          body: ${{ needs.build.outputs.COMMIT_HISTORY }}
           files: |
-            isos/bios.iso
-            isos/uefi.iso
+            combined_isos/*.iso

.gitignore

@@ -5,4 +5,4 @@ memfile
 limine
 iso_root
 ovmf
-memsos-x86_64.iso
+memsos*.iso

Cargo.lock

@@ -7,4 +7,4 @@ edition = "2021"
 ovmf-prebuilt = "0.1.0-alpha.1"
 
 [workspace]
-members = [ "crates/core", "crates/os", "kernel"]
+members = ["crates/core", "crates/os", "kernel"]

Cargo.toml

@@ -1,11 +1,24 @@
-QEMU_FLAGS :=  env_var_or_default("QEMU_FLAGS", "")
-IMAGE_NAME := "memsos-x86_64"
+# Arch: x86_64, aarch64, riscv64
+ARCH := env("ARCH", "x86_64")
+RUST_TARGET := env("RUST_TARGET", "x86_64-unknown-none")
+IMAGE_NAME := env("IMAGE_NAME", "memsos_" + ARCH)
+QEMU_FLAGS := env("QEMU_FLAGS", "")
 OVMF_DIR := "ovmf"
 LIMINE_DIR := "limine"
-ARCH := "x86_64"
 
-# Run vm
+# UEFI prefix from ARCH
+UEFI_SUFFIX := `\
+  if [ "{{ARCH}}" = "x86_64" ]; then \
+    echo "X64"; \
+  elif [ "{{ARCH}}" = "aarch64" ]; then \
+    echo "AA64"; \
+  elif [ "{{ARCH}}" = "riscv64" ]; then \
+    echo "RISCV64"; \
+  else \
+    echo "IA32"; \
+  fi`
 
+# Run vm
 run-uefi: build ovmf
   qemu-system-{{ARCH}} \
     -M q35 \
@@ -29,7 +42,6 @@ run-bios: build
 
 
 # OVMF build
-
 ovmf:
     test -d {{OVMF_DIR}} || (mkdir -p {{OVMF_DIR}} && curl -Lo {{OVMF_DIR}}/ovmf-code-{{ARCH}}.fd https://github.com/osdev0/edk2-ovmf-nightly/releases/latest/download/ovmf-code-{{ARCH}}.fd &&  curl -Lo {{OVMF_DIR}}/ovmf-vars-{{ARCH}}.fd https://github.com/osdev0/edk2-ovmf-nightly/releases/latest/download/ovmf-vars-{{ARCH}}.fd)
 
@@ -40,31 +52,28 @@ limine:
   make -C {{LIMINE_DIR}}
 
 # Kernel build
-
 kernel:
   just kernel/
 
 
 # Image build
-
 build: limine kernel
   rm -rf iso_root
   mkdir -p iso_root/boot
   cp -v kernel/kernel iso_root/boot/
   mkdir -p iso_root/boot/limine
   cp -v limine.conf iso_root/boot/limine/
-  mkdir -p iso_root/EFI/BOOT    
+  mkdir -p iso_root/EFI/BOOT
 
   cp -v limine/limine-bios.sys limine/limine-bios-cd.bin limine/limine-uefi-cd.bin iso_root/boot/limine/
-  cp -v limine/BOOTX64.EFI iso_root/EFI/BOOT/
-  cp -v limine/BOOTIA32.EFI iso_root/EFI/BOOT/
+  cp -v limine/BOOT{{UEFI_SUFFIX}}.EFI iso_root/EFI/BOOT/
   xorriso -as mkisofs -b boot/limine/limine-bios-cd.bin \
     -no-emul-boot -boot-load-size 4 -boot-info-table \
     --efi-boot boot/limine/limine-uefi-cd.bin \
     -efi-boot-part --efi-boot-image --protective-msdos-label \
     iso_root -o {{IMAGE_NAME}}.iso
- 
-  ./limine/limine bios-install {{IMAGE_NAME}}.iso 
+
+  ./limine/limine bios-install {{IMAGE_NAME}}.iso
   rm -rf iso_root
 
 clean: