refactor nix ci (#47)

* refactor nix config

Signed-off-by: Thing-han, Lim <[email protected]>

* refactor nix ci

Signed-off-by: Thing-han, Lim <[email protected]>

---------

Signed-off-by: Thing-han, Lim <[email protected]>

Author: potsrevennil

.github/actions/setup-nix/action.yaml

@@ -7,17 +7,21 @@ inputs:
   script:
     description: The script to be run in the nix shell
     required: false
+  devShell:
+    description: The name of the devShell
+    required: true
+    default: 'default'
 
 runs:
   using: composite
   steps:
-    - uses: nixbuild/nix-quick-install-action@v27
-      with: {load_nixConfig: false}
+    - uses: DeterminateSystems/nix-installer-action@v12
+    - uses: DeterminateSystems/magic-nix-cache-action@main
     - name: Prepare nix dev shell
-      shell: nix develop .#ci -c bash -e {0}
+      shell: nix develop .#${{ inputs.devShell }} -c bash -e {0}
       run: |
     - name: Dependency check
-      shell: nix develop .#ci -c bash -e {0}
+      shell: nix develop .#${{ inputs.devShell }} -c bash -e {0}
       if: inputs.script != ''
       env:
         INPUT_SCRIPT: ${{ inputs.script }}

.github/workflows/build.yaml

@@ -9,21 +9,23 @@ on:
 jobs:
   build_test:
     runs-on: ubuntu-latest
+    defaults:
+      run:
+        shell: nix develop .#ci -c bash -e {0}
     steps:
     - uses: actions/checkout@v4
     - name: Setup nix
       uses: ./.github/actions/setup-nix
       with:
+        devShell: ci
         script: |
           astyle --version
           arm-none-eabi-gcc --version
           qemu-system-arm --version
     - name: Lint
-      shell: nix develop .#ci -c bash -e {0}
       run: |
           lint
     - name: Build targets
-      shell: nix develop .#ci -c bash -e {0}
       run: |
           make_platform() {
               echo "::group::make platform $1"
@@ -44,28 +46,24 @@ jobs:
 
     - name: Functional test
       id: func_test
-      shell: nix develop .#ci -c bash -e {0}
       run: |
           tests-qemu func
     - name: Speed test
       id: speed_test
-      shell: nix develop .#ci -c bash -e {0}
       if: |
         success()
         || steps.func_test.conclusion == 'failure'
       run: |
           tests-qemu speed
     - name: Stack test
       id: stack_test
-      shell: nix develop .#ci -c bash -e {0}
       if: |
         success()
         || steps.func_test.conclusion == 'failure'
         || steps.speed_test.conclusion == 'failure'
       run: |
           tests-qemu stack
     - name: Nistkat test
-      shell: nix develop .#ci -c bash -e {0}
       if: |
         success()
         || steps.func_test.conclusion == 'failure'

flake.nix

@@ -24,25 +24,22 @@
           mbed-os = pkgs.callPackage ./mbed-os.nix {
             targets = [ "TARGET_MPS2_M3" "TARGET_MPS2_M4" "TARGET_MPS2_M7" ];
           };
-          astyle = pkgs.astyle.overrideAttrs (old: rec {
-            version = "3.4.13";
-            src = pkgs.fetchurl {
-              url = "mirror://sourceforge/${old.pname}/${old.pname}-${version}.tar.bz2";
-              hash = "sha256-eKYQq9OelOD5E+nuXNoehbtizWM1U97LngDT2SAQGc4=";
-            };
-          });
+
           core = builtins.attrValues {
-            libopencm3 = libopencm3;
-            mbed-os = mbed-os;
-            astyle = astyle;
+            astyle = pkgs.astyle.overrideAttrs (old: rec {
+              version = "3.4.13";
+              src = pkgs.fetchurl {
+                url = "mirror://sourceforge/${old.pname}/${old.pname}-${version}.tar.bz2";
+                hash = "sha256-eKYQq9OelOD5E+nuXNoehbtizWM1U97LngDT2SAQGc4=";
+              };
+            });
 
             inherit (pkgs)
               # formatter & linters
               nixpkgs-fmt
               shfmt
 
               # build dependencies
-              gcc-arm-embedded-13# arm-gnu-toolchain-13.2.rel1
               qemu# 8.2.4
 
               yq;
@@ -53,34 +50,39 @@
               pyserial# 3.5
               click;
           };
+
+          arm-pkgs = builtins.attrValues {
+            libopencm3 = libopencm3;
+            mbed-os = mbed-os;
+            inherit (pkgs)
+              gcc-arm-embedded-13; # arm-gnu-toolchain-13.2.rel1
+          };
+
+          wrapShell = mkShell: attrs:
+            mkShell (attrs // {
+              shellHook = ''
+                export PATH=$PWD/scripts:$PWD/scripts/ci:$PATH
+              '';
+            });
         in
         {
-          devShells.default = pkgs.mkShellNoCC {
-            packages = core ++ builtins.attrValues {
+          devShells.default = wrapShell pkgs.mkShellNoCC {
+            packages = core ++ arm-pkgs ++ builtins.attrValues {
               inherit (pkgs)
                 direnv
                 nix-direnv
 
                 # debug dependencies
                 openocd; # 0.12.0
             };
-
-            shellHook = ''
-              export OPENCM3_DIR=${libopencm3}
-              export MBED_OS_DIR=${mbed-os}
-              export PATH=$PWD/scripts:$PWD/scripts/ci:$PATH
-              eval "$(_TESTS_COMPLETE=bash_source tests)"
-            '';
+            OPENCM3_DIR = ''${libopencm3}'';
+            MBED_OS_DIR = ''${mbed-os}'';
           };
 
-          devShells.ci = pkgs.mkShellNoCC {
-            packages = core;
-
-            shellHook = ''
-              export OPENCM3_DIR=${libopencm3}
-              export MBED_OS_DIR=${mbed-os}
-              export PATH=$PWD/scripts:$PWD/scripts/ci:$PATH
-            '';
+          devShells.ci = wrapShell pkgs.mkShellNoCC {
+            packages = core ++ arm-pkgs;
+            OPENCM3_DIR = ''${libopencm3}'';
+            MBED_OS_DIR = ''${mbed-os}'';
           };
         };
       flake = {