Skip to content

Commit 988cdf0

Browse files
committed
Use cicd matrix
1 parent 30fe795 commit 988cdf0

File tree

3 files changed

+3
-8
lines changed

3 files changed

+3
-8
lines changed

.github/workflows/cli-tests.yaml

Lines changed: 2 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -183,6 +183,7 @@ jobs:
183183
strategy:
184184
matrix:
185185
os: [ubuntu-latest, macos-13]
186+
use-detsys: [true, false]
186187
runs-on: ${{ matrix.os }}
187188
steps:
188189
- uses: actions/checkout@v4
@@ -197,6 +198,7 @@ jobs:
197198
- name: Install nix and devbox packages
198199
run: |
199200
export NIX_INSTALLER_NO_CHANNEL_ADD=1
201+
export DEVBOX_FEATURE_DETSYS_INSTALLER=${{ matrix.use-detsys }}
200202
201203
# Setup github authentication to ensure Github's rate limits are not hit.
202204
# If this works, we can consider refactoring this into a reusable github action helper.
Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -1,3 +1,3 @@
11
package featureflag
22

3-
var UseDetSysInstaller = cicdOnly("DETSYS_INSTALLER")
3+
var UseDetSysInstaller = disable("DETSYS_INSTALLER")

internal/boxcli/featureflag/feature.go

Lines changed: 0 additions & 7 deletions
Original file line numberDiff line numberDiff line change
@@ -43,13 +43,6 @@ func enable(name string) *feature {
4343
return features[name]
4444
}
4545

46-
func cicdOnly(name string) *feature {
47-
if os.Getenv("CI") != "" || os.Getenv("CIRCLECI") != "" || os.Getenv("GITHUB_ACTIONS") != "" {
48-
enable(name)
49-
}
50-
return disable(name)
51-
}
52-
5346
var logMap = map[string]bool{}
5447

5548
func (f *feature) Enabled() bool {

0 commit comments

Comments
 (0)