Merge pull request #54 from DeterminateSystems/bring-back-store-diffing-optionally

Bring back store diffing (optionally)
This commit is contained in:
Cole Helbling 2024-05-22 13:16:34 -07:00 committed by GitHub
commit a47252d944
No known key found for this signature in database
GPG key ID: B5690EEEBB952194
5 changed files with 11 additions and 2 deletions

View file

@ -94,6 +94,7 @@ cat action.yml| nix run nixpkgs#yq-go -- '[[ "Parameter", "Description", "Requir
| Parameter | Description | Required | Default | | Parameter | Description | Required | Default |
| --------------------------- | --------------------------------------------------------------------------------------------------------------- | -------- | -------------------------------------------------------- | | --------------------------- | --------------------------------------------------------------------------------------------------------------- | -------- | -------------------------------------------------------- |
| `diagnostic-endpoint` | Diagnostic endpoint url where diagnostics and performance data is sent. To disable set this to an empty string. | | https://install.determinate.systems/magic-nix-cache/perf | | `diagnostic-endpoint` | Diagnostic endpoint url where diagnostics and performance data is sent. To disable set this to an empty string. | | https://install.determinate.systems/magic-nix-cache/perf |
| `diff-store` | Whether or not to diff the store before and after Magic Nix Cache runs. | | `false` |
| `flakehub-api-server` | The FlakeHub API server. | | https://api.flakehub.com | | `flakehub-api-server` | The FlakeHub API server. | | https://api.flakehub.com |
| `flakehub-cache-server` | The FlakeHub binary cache server. | | https://cache.flakehub.com | | `flakehub-cache-server` | The FlakeHub binary cache server. | | https://cache.flakehub.com |
| `flakehub-flake-name` | The name of your flake on FlakeHub. The empty string will autodetect your FlakeHub flake. | | `""` | | `flakehub-flake-name` | The name of your flake on FlakeHub. The empty string will autodetect your FlakeHub flake. | | `""` |

View file

@ -34,6 +34,11 @@ inputs:
startup-notification-port: startup-notification-port:
description: "The port magic-nix-cache uses for daemon startup notification." description: "The port magic-nix-cache uses for daemon startup notification."
default: 41239 default: 41239
diff-store:
description: "Whether or not to diff the store before and after Magic Nix Cache runs"
default: false
required: false
source-binary: source-binary:
description: Run a version of the cache binary from somewhere already on disk. Conflicts with all other `source-*` options. description: Run a version of the cache binary from somewhere already on disk. Conflicts with all other `source-*` options.
source-branch: source-branch:

3
dist/index.js generated vendored
View file

@ -94915,6 +94915,7 @@ var MagicNixCacheAction = class {
const flakeHubApiServer = inputs_exports.getString("flakehub-api-server"); const flakeHubApiServer = inputs_exports.getString("flakehub-api-server");
const flakeHubFlakeName = inputs_exports.getString("flakehub-flake-name"); const flakeHubFlakeName = inputs_exports.getString("flakehub-flake-name");
const useGhaCache = inputs_exports.getBool("use-gha-cache"); const useGhaCache = inputs_exports.getBool("use-gha-cache");
const diffStore = inputs_exports.getBool("diff-store");
const daemonCliFlags = [ const daemonCliFlags = [
"--startup-notification-url", "--startup-notification-url",
`http://127.0.0.1:${notifyPort}`, `http://127.0.0.1:${notifyPort}`,
@ -94926,7 +94927,7 @@ var MagicNixCacheAction = class {
diagnosticEndpoint, diagnosticEndpoint,
"--nix-conf", "--nix-conf",
nixConfPath nixConfPath
].concat( ].concat(diffStore ? ["--diff-store"] : []).concat(
useFlakeHub ? [ useFlakeHub ? [
"--use-flakehub", "--use-flakehub",
"--flakehub-cache-server", "--flakehub-cache-server",

2
dist/index.js.map generated vendored

File diff suppressed because one or more lines are too long

View file

@ -165,6 +165,7 @@ class MagicNixCacheAction {
const flakeHubApiServer = inputs.getString("flakehub-api-server"); const flakeHubApiServer = inputs.getString("flakehub-api-server");
const flakeHubFlakeName = inputs.getString("flakehub-flake-name"); const flakeHubFlakeName = inputs.getString("flakehub-flake-name");
const useGhaCache = inputs.getBool("use-gha-cache"); const useGhaCache = inputs.getBool("use-gha-cache");
const diffStore = inputs.getBool("diff-store");
const daemonCliFlags: string[] = [ const daemonCliFlags: string[] = [
"--startup-notification-url", "--startup-notification-url",
@ -178,6 +179,7 @@ class MagicNixCacheAction {
"--nix-conf", "--nix-conf",
nixConfPath, nixConfPath,
] ]
.concat(diffStore ? ["--diff-store"] : [])
.concat( .concat(
useFlakeHub useFlakeHub
? [ ? [