Merge upstream - Githubissues

mkenigs commented 5 months ago

moved the setting of upgrade-nix-store-path-url behind the nix-community feature
moved some enterprise volume creation behind the nix-community feature, and just deleted some of it
bumped nixpkgs and fenix since we need a newer rustc
grab a nix tarball out of the nix flake's hydraJobs rather than using FlakeHub

mkenigs commented 5 months ago

The merge was definitely non-trivial so I'd recommend reviewing how GitHub displays the merge commit https://github.com/NixOS/experimental-nix-installer/pull/15/commits/4993d8c94679087033ed9df327e44ac4773df38b or using something like git show --diff-merges=r

abathur commented 5 months ago

Apologies for sluggishness here. I was planning to get to this Friday morning, but Thursday evening mother nature threw us a power-outage that has yet to resolve. Hopefully Tuesday or Wednesday, by current projections.

With the big caveat that I'm fairly distracted:

I looked at the merge diff as you suggest and I think all of that makes sense.

The only real note I had is that the overall diff might be a little smaller if we just disabled the enterprise flag at the CLI and hard-set the value for it to false instead of rewriting the conditionals? (It probably doesn't make sense to waste a cycle here on it since we can just refactor it later. If you agree I'll probably just open an issue for it with some links--but maybe you'll disagree about preserving the conditionals?)

I went back to diff between the "fixed" kiteless.yml I added and the base ci.yml at the version I pulled it in from (using git diff v0.2.0:.github/workflows/ci.yml 6fb93b22929057b46ed312bc8a9b710346492442:.github/workflows/kiteless.yml). Not sure all of these are still relevant (and these lines may have been changed subsequently), but it's a small bite I could take and there's at least some chance it'll help sort out the CI failures.

This looks like:

diff --git a/.github/workflows/ci.yml b/.github/workflows/kiteless.yml
index d539178..09cac00 100644
--- a/.github/workflows/ci.yml
+++ b/.github/workflows/kiteless.yml
@@ -1,9 +1,8 @@
-name: CI
+name: kiteless CI

 on:
   pull_request:
   push:
-    branches: [main]

 jobs:
   lints:
@@ -12,7 +11,7 @@ jobs:
     steps:
       - uses: actions/checkout@v3
       - name: Install Nix
-        uses: DeterminateSystems/nix-installer-action@start-daemon-and-init
+        uses: DeterminateSystems/nix-installer-action@v4
         with:
           github-token: ${{ secrets.GITHUB_TOKEN }}
       - name: Cache lint store (x86_64-linux)
@@ -36,7 +35,7 @@ jobs:
     steps:
       - uses: actions/checkout@v3
       - name: Install Nix
-        uses: DeterminateSystems/nix-installer-action@start-daemon-and-init
+        uses: DeterminateSystems/nix-installer-action@v4
         with:
           github-token: ${{ secrets.GITHUB_TOKEN }}
       - name: Cache build store (x86_64-linux)
@@ -67,7 +66,7 @@ jobs:
     steps:
       - uses: actions/checkout@v3
       - name: Install Nix
-        uses: DeterminateSystems/nix-installer-action@start-daemon-and-init
+        uses: DeterminateSystems/nix-installer-action@v4
         with:
           github-token: ${{ secrets.GITHUB_TOKEN }}
       - name: Cache build store (x86_64-linux)
@@ -100,7 +99,7 @@ jobs:
           cp nix-installer.sh install-root/nix-installer.sh
           mv nix-installer install-root/nix-installer-x86_64-linux
       - name: Initial install
-        uses: DeterminateSystems/nix-installer-action@start-daemon-and-init
+        uses: DeterminateSystems/nix-installer-action@v4
         with:
           local-root: install-root/
           logger: pretty
@@ -129,7 +128,7 @@ jobs:
             exit 1
           fi
       - name: Repeated install
-        uses: DeterminateSystems/nix-installer-action@start-daemon-and-init
+        uses: DeterminateSystems/nix-installer-action@v4
         with:
           local-root: install-root/
           logger: pretty
@@ -201,10 +200,10 @@ jobs:
           cp nix-installer.sh install-root/nix-installer.sh
           mv nix-installer install-root/nix-installer-x86_64-linux
       - name: Initial install
-        uses: DeterminateSystems/nix-installer-action@start-daemon-and-init
+        uses: DeterminateSystems/nix-installer-action@v4
         with:
           init: none
-          planner: linux-multi
+          planner: linux
           local-root: install-root/
           logger: pretty
           log-directives: nix_installer=trace
@@ -234,10 +233,10 @@ jobs:
             exit 1
           fi
       - name: Repeated install
-        uses: DeterminateSystems/nix-installer-action@start-daemon-and-init
+        uses: DeterminateSystems/nix-installer-action@v4
         with:
           init: none
-          planner: linux-multi
+          planner: linux
           local-root: install-root/
           logger: pretty
           log-directives: nix_installer=trace
@@ -314,7 +313,7 @@ jobs:
           sudo chmod +x /bin/steamos-readonly
           sudo useradd -m deck
       - name: Initial install
-        uses: DeterminateSystems/nix-installer-action@start-daemon-and-init
+        uses: DeterminateSystems/nix-installer-action@v4
         with:
           local-root: install-root/
           logger: pretty
@@ -349,7 +348,7 @@ jobs:
             exit 1
           fi
       - name: Repeated install
-        uses: DeterminateSystems/nix-installer-action@start-daemon-and-init
+        uses: DeterminateSystems/nix-installer-action@v4
         with:
           local-root: install-root/
           logger: pretty
@@ -416,7 +415,7 @@ jobs:
     steps:
       - uses: actions/checkout@v3
       - name: Install Nix
-        uses: DeterminateSystems/nix-installer-action@start-daemon-and-init
+        uses: DeterminateSystems/nix-installer-action@v4
         with:
           github-token: ${{ secrets.GITHUB_TOKEN }}
       # Runs clippy as part of the preBuild.
@@ -446,7 +445,7 @@ jobs:
           cp nix-installer.sh install-root/nix-installer.sh
           mv nix-installer install-root/nix-installer-x86_64-darwin
       - name: Initial install
-        uses: DeterminateSystems/nix-installer-action@start-daemon-and-init
+        uses: DeterminateSystems/nix-installer-action@v4
         with:
           local-root: install-root/
           logger: pretty
@@ -463,7 +462,7 @@ jobs:
           NIX_INSTALLER_LOG_DIRECTIVES: nix_installer=trace
           RUST_BACKTRACE: full
       - name: Repeated install
-        uses: DeterminateSystems/nix-installer-action@start-daemon-and-init
+        uses: DeterminateSystems/nix-installer-action@v4
         with:
           local-root: install-root/
           logger: pretty

mkenigs commented 5 months ago

Apologies for sluggishness here. I was planning to get to this Friday morning, but Thursday evening mother nature threw us a power-outage that has yet to resolve. Hopefully Tuesday or Wednesday, by current projections.

With the big caveat that I'm fairly distracted:
* I looked at the merge diff as you suggest and I think all of that makes sense.
  The only real note I had is that the overall diff might be a little smaller if we just disabled the enterprise flag at the CLI and hard-set the value for it to false instead of rewriting the conditionals? (It probably doesn't make sense to waste a cycle here on it since we can just refactor it later. If you agree I'll probably just open an issue for it with some links--but maybe you'll disagree about preserving the conditionals?)

So that would basically mean compiling support for enterprise_edition but always disabling it? My thought process was to completely avoid compiling that code. But the DetSys default value for enterprise_edition is false, so we could even just leave it in completely. Probably worth discussing sync.

abathur commented 5 months ago

Per sync: avoiding compilation sounds like a good reason to me. Can always revisit the diff-minimization part later if it gets annoying.

NixOS / experimental-nix-installer

Merge upstream #15