Configure github actions (#8)

grihabor · Oct 6, 2024 · 86053e1 · 86053e1
1 parent 944cfe0
commit 86053e1
Show file tree

Hide file tree

Showing 71 changed files with 601 additions and 76 deletions.
diff --git a/.github/workflows/build.yaml b/.github/workflows/build.yaml
@@ -0,0 +1,29 @@
+name: Test
+'on': push
+jobs:
+  build-2-21:
+    runs-on: ubuntu-latest
+    steps:
+      - uses: actions/checkout@v4
+      - uses: cachix/install-nix-action@v25
+        with:
+          nix_path: nixpkgs=channel:nixos-unstable
+      - uses: cachix/cachix-action@v14
+        with:
+          name: pants-nix
+          authToken: ${{ secrets.CACHIX_AUTH_TOKEN }}
+      - run: nix build '.#"release_2.21.0"'
+      - run: touch pants.toml && nix shell '.#"release_2.21.0"' --command pants --version
+  build-2-22:
+    runs-on: ubuntu-latest
+    steps:
+      - uses: actions/checkout@v4
+      - uses: cachix/install-nix-action@v25
+        with:
+          nix_path: nixpkgs=channel:nixos-unstable
+      - uses: cachix/cachix-action@v14
+        with:
+          name: pants-nix
+          authToken: ${{ secrets.CACHIX_AUTH_TOKEN }}
+      - run: nix build '.#"release_2.22.0"'
+      - run: touch pants.toml && nix shell '.#"release_2.22.0"' --command pants --version
diff --git a/common/lib.nix b/common/lib.nix
@@ -4,8 +4,10 @@ let
     hash,
     rustVersion,
     cargoLock,
+    patches,
   }: (
     {
+      lib,
       fetchFromGitHub,
       python3,
       stdenv,
@@ -146,14 +148,10 @@ let
             find src/python -type d -exec bash -c "if [ -n \"$ls {}/*.py\" ]; then touch {}/__init__.py; fi" \;
           '';
 
-          prePatch = ''
-            patch -p1 --batch -u -i ${./patch-process-manager.txt}
-            patch -p1 --batch -u -i ${./patch-jar-tool.txt}
-            patch -p1 --batch -u -i ${./patch-coursier-fetch.txt}
-            patch -p1 --batch -u -i ${./patch-process.txt}
-            patch -p1 --batch -u -i ${./patch-jdk-sh.txt}
-            patch -p1 --batch -u -i ${./patch-process-extra-env-2.22.txt}
-          '';
+          prePatch =
+            lib.strings.concatMapStrings
+            (patch_path: "patch -p1 --batch -u -i ${./patch-process-manager.txt}")
+            patches;
 
           preBuild = ''
 

diff --git a/gen/lib.py b/gen/lib.py
@@ -130,6 +130,7 @@ async def _prefetch_package_hash(package) -> tuple[str, str] | None:
 
 async def _generate_tag(repo: Repo, version: str, force: bool = False) -> None:
     tag = f"release_{version}"
+    version_ = Version.from_tag(tag)
 
     tag_dir = Path("tags") / tag
     if not force and tag_dir.exists():
@@ -155,6 +156,19 @@ async def _generate_tag(repo: Repo, version: str, force: bool = False) -> None:
         cargo_lock_url=f"https://raw.githubusercontent.com/pantsbuild/pants/{tag}/src/rust/engine/Cargo.lock",
         rust_toolchain_url=f"https://raw.githubusercontent.com/pantsbuild/pants/{tag}/src/rust/engine/rust-toolchain",
         output_hashes="\n      ".join(f'"{pname}" = "{hash_}";' for pname, hash_ in output_hashes),
+        patches="\n    ".join(
+            [
+                *[
+                    "./patch-process-manager.txt",
+                    "./patch-jar-tool.txt",
+                    "./patch-coursier-fetch.txt",
+                    "./patch-process.txt",
+                    "./patch-jdk-sh.txt",
+                ],
+                *(["./patch-process-extra-env-2.22.txt"] if Version(2, 22, 0) <= version_ < Version(2, 23, 0) else []),
+                *(["./patch-process-extra-env.txt"] if Version(2, 23, 0) <= version_ else []),
+            ]
+        ),
     )
     (tag_dir / "default.nix").write_text(result)
 

diff --git a/tags/release_2.19.0/default.nix b/tags/release_2.19.0/default.nix
@@ -24,7 +24,14 @@ let
       "prodash-16.0.0" = "sha256-Dkn4BmsF1SnSDAoqW5QkjdzGHEq41y7S20Q/DkRCpVQ=";
     };
   };
+  patches = [
+    ./patch-process-manager.txt
+    ./patch-jar-tool.txt
+    ./patch-coursier-fetch.txt
+    ./patch-process.txt
+    ./patch-jdk-sh.txt
+  ];
 in
   lib.makePants {
-    inherit version hash rustVersion cargoLock;
+    inherit version hash rustVersion cargoLock patches;
   }
diff --git a/tags/release_2.19.1/default.nix b/tags/release_2.19.1/default.nix
@@ -24,7 +24,14 @@ let
       "prodash-16.0.0" = "sha256-Dkn4BmsF1SnSDAoqW5QkjdzGHEq41y7S20Q/DkRCpVQ=";
     };
   };
+  patches = [
+    ./patch-process-manager.txt
+    ./patch-jar-tool.txt
+    ./patch-coursier-fetch.txt
+    ./patch-process.txt
+    ./patch-jdk-sh.txt
+  ];
 in
   lib.makePants {
-    inherit version hash rustVersion cargoLock;
+    inherit version hash rustVersion cargoLock patches;
   }
diff --git a/tags/release_2.19.1rc0/default.nix b/tags/release_2.19.1rc0/default.nix
@@ -24,7 +24,14 @@ let
       "prodash-16.0.0" = "sha256-Dkn4BmsF1SnSDAoqW5QkjdzGHEq41y7S20Q/DkRCpVQ=";
     };
   };
+  patches = [
+    ./patch-process-manager.txt
+    ./patch-jar-tool.txt
+    ./patch-coursier-fetch.txt
+    ./patch-process.txt
+    ./patch-jdk-sh.txt
+  ];
 in
   lib.makePants {
-    inherit version hash rustVersion cargoLock;
+    inherit version hash rustVersion cargoLock patches;
   }
diff --git a/tags/release_2.19.1rc1/default.nix b/tags/release_2.19.1rc1/default.nix
@@ -24,7 +24,14 @@ let
       "prodash-16.0.0" = "sha256-Dkn4BmsF1SnSDAoqW5QkjdzGHEq41y7S20Q/DkRCpVQ=";
     };
   };
+  patches = [
+    ./patch-process-manager.txt
+    ./patch-jar-tool.txt
+    ./patch-coursier-fetch.txt
+    ./patch-process.txt
+    ./patch-jdk-sh.txt
+  ];
 in
   lib.makePants {
-    inherit version hash rustVersion cargoLock;
+    inherit version hash rustVersion cargoLock patches;
   }
diff --git a/tags/release_2.19.2/default.nix b/tags/release_2.19.2/default.nix
@@ -24,7 +24,14 @@ let
       "prodash-16.0.0" = "sha256-Dkn4BmsF1SnSDAoqW5QkjdzGHEq41y7S20Q/DkRCpVQ=";
     };
   };
+  patches = [
+    ./patch-process-manager.txt
+    ./patch-jar-tool.txt
+    ./patch-coursier-fetch.txt
+    ./patch-process.txt
+    ./patch-jdk-sh.txt
+  ];
 in
   lib.makePants {
-    inherit version hash rustVersion cargoLock;
+    inherit version hash rustVersion cargoLock patches;
   }
diff --git a/tags/release_2.19.2rc0/default.nix b/tags/release_2.19.2rc0/default.nix
@@ -24,7 +24,14 @@ let
       "prodash-16.0.0" = "sha256-Dkn4BmsF1SnSDAoqW5QkjdzGHEq41y7S20Q/DkRCpVQ=";
     };
   };
+  patches = [
+    ./patch-process-manager.txt
+    ./patch-jar-tool.txt
+    ./patch-coursier-fetch.txt
+    ./patch-process.txt
+    ./patch-jdk-sh.txt
+  ];
 in
   lib.makePants {
-    inherit version hash rustVersion cargoLock;
+    inherit version hash rustVersion cargoLock patches;
   }
diff --git a/tags/release_2.19.3/default.nix b/tags/release_2.19.3/default.nix
@@ -24,7 +24,14 @@ let
       "prodash-16.0.0" = "sha256-Dkn4BmsF1SnSDAoqW5QkjdzGHEq41y7S20Q/DkRCpVQ=";
     };
   };
+  patches = [
+    ./patch-process-manager.txt
+    ./patch-jar-tool.txt
+    ./patch-coursier-fetch.txt
+    ./patch-process.txt
+    ./patch-jdk-sh.txt
+  ];
 in
   lib.makePants {
-    inherit version hash rustVersion cargoLock;
+    inherit version hash rustVersion cargoLock patches;
   }
diff --git a/tags/release_2.19.3rc0/default.nix b/tags/release_2.19.3rc0/default.nix
@@ -24,7 +24,14 @@ let
       "prodash-16.0.0" = "sha256-Dkn4BmsF1SnSDAoqW5QkjdzGHEq41y7S20Q/DkRCpVQ=";
     };
   };
+  patches = [
+    ./patch-process-manager.txt
+    ./patch-jar-tool.txt
+    ./patch-coursier-fetch.txt
+    ./patch-process.txt
+    ./patch-jdk-sh.txt
+  ];
 in
   lib.makePants {
-    inherit version hash rustVersion cargoLock;
+    inherit version hash rustVersion cargoLock patches;
   }
diff --git a/tags/release_2.19.3rc1/default.nix b/tags/release_2.19.3rc1/default.nix
@@ -24,7 +24,14 @@ let
       "prodash-16.0.0" = "sha256-Dkn4BmsF1SnSDAoqW5QkjdzGHEq41y7S20Q/DkRCpVQ=";
     };
   };
+  patches = [
+    ./patch-process-manager.txt
+    ./patch-jar-tool.txt
+    ./patch-coursier-fetch.txt
+    ./patch-process.txt
+    ./patch-jdk-sh.txt
+  ];
 in
   lib.makePants {
-    inherit version hash rustVersion cargoLock;
+    inherit version hash rustVersion cargoLock patches;
   }
diff --git a/tags/release_2.20.0.dev0/default.nix b/tags/release_2.20.0.dev0/default.nix
@@ -23,7 +23,14 @@ let
       "prodash-16.0.0" = "sha256-Dkn4BmsF1SnSDAoqW5QkjdzGHEq41y7S20Q/DkRCpVQ=";
     };
   };
+  patches = [
+    ./patch-process-manager.txt
+    ./patch-jar-tool.txt
+    ./patch-coursier-fetch.txt
+    ./patch-process.txt
+    ./patch-jdk-sh.txt
+  ];
 in
   lib.makePants {
-    inherit version hash rustVersion cargoLock;
+    inherit version hash rustVersion cargoLock patches;
   }
diff --git a/tags/release_2.20.0.dev1/default.nix b/tags/release_2.20.0.dev1/default.nix
@@ -23,7 +23,14 @@ let
       "prodash-16.0.0" = "sha256-Dkn4BmsF1SnSDAoqW5QkjdzGHEq41y7S20Q/DkRCpVQ=";
     };
   };
+  patches = [
+    ./patch-process-manager.txt
+    ./patch-jar-tool.txt
+    ./patch-coursier-fetch.txt
+    ./patch-process.txt
+    ./patch-jdk-sh.txt
+  ];
 in
   lib.makePants {
-    inherit version hash rustVersion cargoLock;
+    inherit version hash rustVersion cargoLock patches;
   }
diff --git a/tags/release_2.20.0.dev2/default.nix b/tags/release_2.20.0.dev2/default.nix
@@ -24,7 +24,14 @@ let
       "prodash-16.0.0" = "sha256-Dkn4BmsF1SnSDAoqW5QkjdzGHEq41y7S20Q/DkRCpVQ=";
     };
   };
+  patches = [
+    ./patch-process-manager.txt
+    ./patch-jar-tool.txt
+    ./patch-coursier-fetch.txt
+    ./patch-process.txt
+    ./patch-jdk-sh.txt
+  ];
 in
   lib.makePants {
-    inherit version hash rustVersion cargoLock;
+    inherit version hash rustVersion cargoLock patches;
   }
diff --git a/tags/release_2.20.0.dev3/default.nix b/tags/release_2.20.0.dev3/default.nix
@@ -24,7 +24,14 @@ let
       "prodash-16.0.0" = "sha256-Dkn4BmsF1SnSDAoqW5QkjdzGHEq41y7S20Q/DkRCpVQ=";
     };
   };
+  patches = [
+    ./patch-process-manager.txt
+    ./patch-jar-tool.txt
+    ./patch-coursier-fetch.txt
+    ./patch-process.txt
+    ./patch-jdk-sh.txt
+  ];
 in
   lib.makePants {
-    inherit version hash rustVersion cargoLock;
+    inherit version hash rustVersion cargoLock patches;
   }
diff --git a/tags/release_2.20.0.dev4/default.nix b/tags/release_2.20.0.dev4/default.nix
@@ -24,7 +24,14 @@ let
       "prodash-16.0.0" = "sha256-Dkn4BmsF1SnSDAoqW5QkjdzGHEq41y7S20Q/DkRCpVQ=";
     };
   };
+  patches = [
+    ./patch-process-manager.txt
+    ./patch-jar-tool.txt
+    ./patch-coursier-fetch.txt
+    ./patch-process.txt
+    ./patch-jdk-sh.txt
+  ];
 in
   lib.makePants {
-    inherit version hash rustVersion cargoLock;
+    inherit version hash rustVersion cargoLock patches;
   }
diff --git a/tags/release_2.20.0.dev5/default.nix b/tags/release_2.20.0.dev5/default.nix
@@ -24,7 +24,14 @@ let
       "prodash-16.0.0" = "sha256-Dkn4BmsF1SnSDAoqW5QkjdzGHEq41y7S20Q/DkRCpVQ=";
     };
   };
+  patches = [
+    ./patch-process-manager.txt
+    ./patch-jar-tool.txt
+    ./patch-coursier-fetch.txt
+    ./patch-process.txt
+    ./patch-jdk-sh.txt
+  ];
 in
   lib.makePants {
-    inherit version hash rustVersion cargoLock;
+    inherit version hash rustVersion cargoLock patches;
   }
diff --git a/tags/release_2.20.0.dev6/default.nix b/tags/release_2.20.0.dev6/default.nix
@@ -24,7 +24,14 @@ let
       "prodash-16.0.0" = "sha256-Dkn4BmsF1SnSDAoqW5QkjdzGHEq41y7S20Q/DkRCpVQ=";
     };
   };
+  patches = [
+    ./patch-process-manager.txt
+    ./patch-jar-tool.txt
+    ./patch-coursier-fetch.txt
+    ./patch-process.txt
+    ./patch-jdk-sh.txt
+  ];
 in
   lib.makePants {
-    inherit version hash rustVersion cargoLock;
+    inherit version hash rustVersion cargoLock patches;
   }
diff --git a/tags/release_2.20.0.dev7/default.nix b/tags/release_2.20.0.dev7/default.nix
@@ -24,7 +24,14 @@ let
       "prodash-16.0.0" = "sha256-Dkn4BmsF1SnSDAoqW5QkjdzGHEq41y7S20Q/DkRCpVQ=";
     };
   };
+  patches = [
+    ./patch-process-manager.txt
+    ./patch-jar-tool.txt
+    ./patch-coursier-fetch.txt
+    ./patch-process.txt
+    ./patch-jdk-sh.txt
+  ];
 in
   lib.makePants {
-    inherit version hash rustVersion cargoLock;
+    inherit version hash rustVersion cargoLock patches;
   }
diff --git a/tags/release_2.20.0/default.nix b/tags/release_2.20.0/default.nix
@@ -24,7 +24,14 @@ let
       "prodash-16.0.0" = "sha256-Dkn4BmsF1SnSDAoqW5QkjdzGHEq41y7S20Q/DkRCpVQ=";
     };
   };
+  patches = [
+    ./patch-process-manager.txt
+    ./patch-jar-tool.txt
+    ./patch-coursier-fetch.txt
+    ./patch-process.txt
+    ./patch-jdk-sh.txt
+  ];
 in
   lib.makePants {
-    inherit version hash rustVersion cargoLock;
+    inherit version hash rustVersion cargoLock patches;
   }
diff --git a/tags/release_2.20.0a0/default.nix b/tags/release_2.20.0a0/default.nix
@@ -24,7 +24,14 @@ let
       "prodash-16.0.0" = "sha256-Dkn4BmsF1SnSDAoqW5QkjdzGHEq41y7S20Q/DkRCpVQ=";
     };
   };
+  patches = [
+    ./patch-process-manager.txt
+    ./patch-jar-tool.txt
+    ./patch-coursier-fetch.txt
+    ./patch-process.txt
+    ./patch-jdk-sh.txt
+  ];
 in
   lib.makePants {
-    inherit version hash rustVersion cargoLock;
+    inherit version hash rustVersion cargoLock patches;
   }