From 5d4feb3d3caf37621b44033ec860f776883b4fcc Mon Sep 17 00:00:00 2001 From: Graham Christensen Date: Fri, 10 May 2024 16:45:17 -0400 Subject: [PATCH] Test the cache isn't enable when untrusted --- .github/workflows/ci.yml | 4 ++-- dist/index.js | 3 +-- package.json | 2 +- pnpm-lock.yaml | 8 ++++---- 4 files changed, 8 insertions(+), 9 deletions(-) diff --git a/.github/workflows/ci.yml b/.github/workflows/ci.yml index 8b30ad5..6dd06bc 100644 --- a/.github/workflows/ci.yml +++ b/.github/workflows/ci.yml @@ -63,9 +63,9 @@ jobs: trusted-users = root - name: Cache the store uses: ./ - - name: Check the cache for liveness + - name: Check the cache isn't enabled run: | - .github/workflows/cache-test.sh + [ $(nix config show substituters) == "https://cache.nixos.org/" ] run-x86_64-linux: name: Run x86_64 Linux diff --git a/dist/index.js b/dist/index.js index 1e568c5..c0fc53b 100644 --- a/dist/index.js +++ b/dist/index.js @@ -93752,7 +93752,7 @@ const got = source_create(defaults); const external_node_stream_promises_namespaceObject = __WEBPACK_EXTERNAL_createRequire(import.meta.url)("node:stream/promises"); ;// CONCATENATED MODULE: external "node:zlib" const external_node_zlib_namespaceObject = __WEBPACK_EXTERNAL_createRequire(import.meta.url)("node:zlib"); -;// CONCATENATED MODULE: ./node_modules/.pnpm/github.com+DeterminateSystems+detsys-ts@420b83a32e8bffc3ae51bdf17908994b0a323e92_qfkbfnjjxud556txwjeu7rl4qu/node_modules/detsys-ts/dist/index.js +;// CONCATENATED MODULE: ./node_modules/.pnpm/github.com+DeterminateSystems+detsys-ts@93a5166cd57eefcd448ea79923c11eb4b56d4563_rgjnyo4jd3kdijkrub73izga24/node_modules/detsys-ts/dist/index.js var __defProp = Object.defineProperty; var __export = (target, all) => { for (var name in all) @@ -94580,7 +94580,6 @@ var IdsToolbox = class { return false; } async preflightNixStoreInfo() { - this.nixStoreTrust = "unknown"; let output = ""; const options = {}; options.silent = true; diff --git a/package.json b/package.json index 160c6dd..205b74d 100644 --- a/package.json +++ b/package.json @@ -27,7 +27,7 @@ "dependencies": { "@actions/core": "^1.10.1", "@actions/exec": "^1.1.1", - "detsys-ts": "github:DeterminateSystems/detsys-ts#store-trust", + "detsys-ts": "github:DeterminateSystems/detsys-ts", "got": "^14.2.1", "tail": "^2.2.6" }, diff --git a/pnpm-lock.yaml b/pnpm-lock.yaml index 44cb951..9a6a9ac 100644 --- a/pnpm-lock.yaml +++ b/pnpm-lock.yaml @@ -12,8 +12,8 @@ dependencies: specifier: ^1.1.1 version: 1.1.1 detsys-ts: - specifier: github:DeterminateSystems/detsys-ts#store-trust - version: github.com/DeterminateSystems/detsys-ts/420b83a32e8bffc3ae51bdf17908994b0a323e92 + specifier: github:DeterminateSystems/detsys-ts + version: github.com/DeterminateSystems/detsys-ts/93a5166cd57eefcd448ea79923c11eb4b56d4563 got: specifier: ^14.2.1 version: 14.2.1 @@ -3818,8 +3818,8 @@ packages: engines: {node: '>=10'} dev: true - github.com/DeterminateSystems/detsys-ts/420b83a32e8bffc3ae51bdf17908994b0a323e92: - resolution: {tarball: https://codeload.github.com/DeterminateSystems/detsys-ts/tar.gz/420b83a32e8bffc3ae51bdf17908994b0a323e92} + github.com/DeterminateSystems/detsys-ts/93a5166cd57eefcd448ea79923c11eb4b56d4563: + resolution: {tarball: https://codeload.github.com/DeterminateSystems/detsys-ts/tar.gz/93a5166cd57eefcd448ea79923c11eb4b56d4563} name: detsys-ts version: 1.0.0 dependencies: