Skip to content

Commit 146f476

Browse files
authored
Merge pull request #4 from DeterminateSystems/cache-disabled
fixup enabled/disabled
2 parents 777600e + b7725a3 commit 146f476

File tree

4 files changed

+7
-17
lines changed

4 files changed

+7
-17
lines changed

.github/workflows/ci.yml

Lines changed: 2 additions & 12 deletions
Original file line numberDiff line numberDiff line change
@@ -85,8 +85,6 @@ jobs:
8585
fail-fast: false
8686
matrix:
8787
determinate: [true, false]
88-
use-gha-cache: ["disabled", "no-preference", "enabled"]
89-
use-flakehub: ["disabled", "no-preference", "enabled"]
9088
id-token: ["write", "none"]
9189
systems:
9290
- nix-system: "aarch64-darwin"
@@ -111,18 +109,10 @@ jobs:
111109
with:
112110
_internal-strict-mode: true
113111
_internal-obliterate-actions-id-token-request-variables: ${{ matrix.id-token == 'none' }}
114-
use-gha-cache: ${{ matrix.use-gha-cache }}
115-
use-flakehub: ${{ matrix.use-flakehub }}
116112
- name: Check the cache for liveness
117113
env:
118-
EXPECT_FLAKEHUB: ${{ toJson(matrix.use-flakehub != 'disabled' && matrix.id-token == 'write') }}
119-
EXPECT_GITHUB_CACHE: ${{ toJson(
120-
(matrix.use-gha-cache != 'disabled')
121-
&& (
122-
(!(matrix.use-flakehub != 'disabled' && matrix.id-token == 'write'))
123-
|| (matrix.use-gha-cache == 'enabled')
124-
)
125-
) }}
114+
EXPECT_FLAKEHUB: ${{ toJson(matrix.id-token == 'write') }}
115+
EXPECT_GITHUB_CACHE: ${{ toJson(false) }}
126116
run: |
127117
.github/workflows/cache-test.sh
128118

dist/index.js

Lines changed: 2 additions & 2 deletions
Some generated files are not rendered by default. Learn more about customizing how changed files appear on GitHub.

0 commit comments

Comments
 (0)