Merge pull request #1413 from dsalaza4/main

feat(cross): #1223 use jobs approach

.github/workflows/dev.yml

@@ -340,21 +340,21 @@ jobs:
       - name: /tests/makeTemplate
         run: nix-env -if . && m . /tests/makeTemplate
 
-  linux_tests_scriptWithHelp:
+  linux_tests_makeScript:
     runs-on: ubuntu-latest
     steps:
       - uses: actions/checkout@f095bcc56b7c2baf48f3ac70d6d6782f4f553222
       - uses: docker://docker.io/nixos/nix@sha256:c3db4c484f6b1ee6c9bb8ca90307cfbeca8ef88156840911356a677eeaff4845
-        name: /tests/scriptWithHelp
+        name: /tests/makeScript
         with:
-          args: sh -c "chown -R root:root /github/workspace && nix-env -if . && m . /tests/scriptWithHelp"
-  macos_tests_scriptWithHelp:
+          args: sh -c "chown -R root:root /github/workspace && nix-env -if . && m . /tests/makeScript"
+  macos_tests_makeScript:
     runs-on: macos-latest
     steps:
       - uses: actions/checkout@f095bcc56b7c2baf48f3ac70d6d6782f4f553222
       - uses: cachix/install-nix-action@6ed004b9ccb68dbc28e7c85bee15fa93dbd214ac
-      - name: /tests/scriptWithHelp
-        run: nix-env -if . && m . /tests/scriptWithHelp
+      - name: /tests/makeScript
+        run: nix-env -if . && m . /tests/makeScript
 
   linux_tests_secretsForGpgFromEnv:
     runs-on: ubuntu-latest

.github/workflows/prod.yml

@@ -496,23 +496,23 @@ jobs:
         env:
           CACHIX_AUTH_TOKEN: ${{ secrets.CACHIX_AUTH_TOKEN }}
 
-  linux_tests_scriptWithHelp:
+  linux_tests_makeScript:
     runs-on: ubuntu-latest
     steps:
       - uses: actions/checkout@f095bcc56b7c2baf48f3ac70d6d6782f4f553222
       - uses: docker://docker.io/nixos/nix@sha256:c3db4c484f6b1ee6c9bb8ca90307cfbeca8ef88156840911356a677eeaff4845
-        name: /tests/scriptWithHelp
+        name: /tests/makeScript
         with:
-          args: sh -c "chown -R root:root /github/workspace && nix-env -if . && m . /tests/scriptWithHelp"
+          args: sh -c "chown -R root:root /github/workspace && nix-env -if . && m . /tests/makeScript"
         env:
           CACHIX_AUTH_TOKEN: ${{ secrets.CACHIX_AUTH_TOKEN }}
-  macos_tests_scriptWithHelp:
+  macos_tests_makeScript:
     runs-on: macos-latest
     steps:
       - uses: actions/checkout@f095bcc56b7c2baf48f3ac70d6d6782f4f553222
       - uses: cachix/install-nix-action@v15
-      - name: /tests/scriptWithHelp
-        run: nix-env -if . && m . /tests/scriptWithHelp
+      - name: /tests/makeScript
+        run: nix-env -if . && m . /tests/makeScript
         env:
           CACHIX_AUTH_TOKEN: ${{ secrets.CACHIX_AUTH_TOKEN }}
 

default.nix

@@ -9,4 +9,4 @@ let
     projectPath = import ./src/args/project-path args;
     projectSrc = ./.;
   };
-in import ./makes/main.nix args
+in (import ./makes/makes.nix args).jobs."/"

makes.nix

@@ -1,11 +1,6 @@
 { fetchNixpkgs, fetchUrl, makeScript, outputs, projectPath, __nixpkgs__, ...
 }: {
-  jobs = {
-    "/test" = makeScript {
-      name = "test/job";
-      entrypoint = "echo Hello test";
-    };
-  };
+  imports = [ ./makes/makes.nix ];
   projectIdentifier = "makes-repo";
   cache = {
     readNixos = true;

makes/makes.nix

@@ -0,0 +1,29 @@
+{ __nixpkgs__, makeScript, outputs, projectPath, ... }:
+let makesVersion = "24.12";
+in {
+  imports = [
+    ./tests/commitlint/makes.nix
+    ./tests/computeOnAwsBatch/makes.nix
+    ./tests/makeScript/makes.nix
+    ./tests/makeSearchPaths/makes.nix
+    ./tests/makeTemplate/makes.nix
+    ./tests/secretsForGpgFromEnv/makes.nix
+    ./utils/makePythonLock/makes.nix
+    ./utils/makeRubyLock/makes.nix
+  ];
+
+  jobs."/" = makeScript {
+    aliases = [ "m-v${makesVersion}" "makes" "makes-v${makesVersion}" ];
+    replace = {
+      __argMakesSrc__ = projectPath "/";
+      __argNix__ = __nixpkgs__.nixVersions.nix_2_15;
+    };
+    entrypoint = ''
+      __MAKES_SRC__=__argMakesSrc__ \
+      __NIX__=__argNix__ \
+      python -u __argMakesSrc__/src/cli/main/__main__.py "$@"
+    '';
+    searchPaths.source = [ outputs."/cli/env/runtime" ];
+    name = "m";
+  };
+}

makes/tests/commitlint/makes.nix

@@ -0,0 +1,14 @@
+{ makeScript, __nixpkgs__, ... }: {
+  jobs."/tests/commitlint" = makeScript {
+    name = "commitlint";
+    entrypoint = ''
+      pushd makes/tests/commitlint
+
+      commit_hash="$(git --no-pager log --pretty=%h origin/main..HEAD)"
+
+      info "Linting commit $commit_hash"
+      git log -1 --pretty=%B $commit_hash | commitlint --parser-preset ./parser.js --config ./config.js
+    '';
+    searchPaths.bin = [ __nixpkgs__.commitlint __nixpkgs__.git ];
+  };
+}

makes/tests/computeOnAwsBatch/makes.nix

@@ -0,0 +1,21 @@
+{ computeOnAwsBatch, ... }: {
+  jobs."/tests/computeOnAwsBatch" = computeOnAwsBatch {
+    dryRun = true;
+    allowDuplicates = true;
+    attempts = 1;
+    attemptDurationSeconds = 60;
+    command = [ "foo" ];
+    definition = "foo";
+    environment = [ ];
+    includePositionalArgsInName = true;
+    name = "foo";
+    nextJob = { };
+    memory = 1;
+    parallel = 1;
+    propagateTags = true;
+    queue = "foo";
+    setup = [ ];
+    tags = { };
+    vcpus = 1;
+  };
+}

makes/tests/scriptWithHelp/README.md → makes/tests/makeScript/README.md

@@ -1,7 +1,7 @@
 # A Script With a Help
 
-- This is `makes/tests/scriptWithHelp/README.md`
+- This is `makes/tests/makeScript/README.md`
 - You might be looking at it beautifully rendered on GitHub / GitLab / etc.
 - You also might be looking at it beautifully rendedred on the CLI\*.
 
-\* `m . /tests/scriptWithHelp -h` (or `--help`)
+\* `m . /tests/makeScript -h` (or `--help`)

makes/tests/makeScript/makes.nix

@@ -0,0 +1,7 @@
+{ makeScript, ... }: {
+  jobs."/tests/makeScript" = makeScript {
+    entrypoint = "echo A script with a help, call with --help or -h to see it!";
+    name = "help";
+    help = ./README.md;
+  };
+}

makes/tests/makeSearchPaths/makes.nix

@@ -0,0 +1,7 @@
+{ makeDerivation, ... }: {
+  jobs."/tests/makeSearchPaths" = makeDerivation {
+    builder = "touch $out";
+    name = "test-make-search-paths";
+    searchPaths.source = [[ ./template.sh "a" "b" "c" ]];
+  };
+}

makes/tests/makeTemplate/makes.nix

@@ -0,0 +1,15 @@
+{ fromYaml, makeTemplate, ... }:
+let
+  testFile = fromYaml (builtins.readFile ./test.yaml);
+  testString = testFile.testTitle;
+in {
+  jobs."/tests/makeTemplate" = makeTemplate {
+    replace = {
+      __argFirst__ = "aaaaaaaaa";
+      __argSecond__ = "bbbb";
+      __argThird__ = testString;
+    };
+    name = "test-make-template";
+    template = ./template.txt;
+  };
+}

makes/tests/secretsForGpgFromEnv/makes.nix

@@ -0,0 +1,11 @@
+{ makeScript, outputs, ... }: {
+  jobs."/tests/secretsForGpgFromEnv" = makeScript {
+    entrypoint = "echo $secret";
+    name = "tests-secrets-for-gpg-from-env";
+    searchPaths.source = [
+      outputs."/envVars/example"
+      outputs."/secretsForGpgFromEnv/example"
+      outputs."/secretsForEnvFromSops/example"
+    ];
+  };
+}

makes/utils/makePythonLock/makes.nix

@@ -0,0 +1,13 @@
+{ __nixpkgs__, makeScript, ... }: {
+  jobs."/utils/makePythonLock" = makeScript {
+    entrypoint = ./entrypoint.sh;
+    name = "make-python-lock";
+    searchPaths.bin = [
+      __nixpkgs__.poetry
+      __nixpkgs__.python39
+      __nixpkgs__.python310
+      __nixpkgs__.python311
+      __nixpkgs__.python312
+    ];
+  };
+}

makes/utils/makeRubyLock/makes.nix

@@ -0,0 +1,13 @@
+{ __nixpkgs__, makeScript, ... }: {
+  jobs."/utils/makeRubyLock" = makeScript {
+    entrypoint = ./entrypoint.sh;
+    name = "make-ruby-lock";
+    replace = {
+      __argParser__ = ./parser.rb;
+      __argRuby31__ = __nixpkgs__.ruby_3_1;
+      __argRuby32__ = __nixpkgs__.ruby_3_2;
+      __argRuby33__ = __nixpkgs__.ruby_3_3;
+    };
+    searchPaths.bin = [ __nixpkgs__.nixVersions.nix_2_15 __nixpkgs__.yj ];
+  };
+}