Skip to content

Commit 309abe9

Browse files
authored
[easy][cicd] Bump devbox installer and switch to macos-13 (#2021)
## Summary The devbox installer has compatibility issues with macos-14 so changing from latest to 13 until that is fixed ## How was it tested?
1 parent 2b26785 commit 309abe9

File tree

3 files changed

+11
-11
lines changed

3 files changed

+11
-11
lines changed

.github/workflows/cli-tests.yaml

Lines changed: 8 additions & 8 deletions
Original file line numberDiff line numberDiff line change
@@ -52,7 +52,7 @@ jobs:
5252
build-devbox:
5353
strategy:
5454
matrix:
55-
os: [ubuntu-latest, macos-latest]
55+
os: [ubuntu-latest, macos-13]
5656
runs-on: ${{ matrix.os }}
5757
steps:
5858
- uses: actions/checkout@v4
@@ -79,14 +79,14 @@ jobs:
7979
golangci-lint:
8080
strategy:
8181
matrix:
82-
os: [ubuntu-latest, macos-latest]
82+
os: [ubuntu-latest, macos-13]
8383
runs-on: ${{ matrix.os }}
8484
timeout-minutes: 10
8585
steps:
8686
- uses: actions/checkout@v4
8787

8888
- name: Install devbox
89-
uses: jetify-com/devbox-install-action@v0.9.0
89+
uses: jetify-com/devbox-install-action@v0.10.0
9090
with:
9191
enable-cache: true
9292

@@ -107,7 +107,7 @@ jobs:
107107
matrix:
108108
is-main:
109109
- ${{ github.ref == 'refs/heads/main' && 'is-main' || 'not-main' }}
110-
os: [ubuntu-latest, macos-latest]
110+
os: [ubuntu-latest, macos-13]
111111
# This is an optimization that runs tests twice, with and without
112112
# the devbox.json tests. We can require the other tests to complete before
113113
# merging, while keeping the others as an additional non-required signal
@@ -119,7 +119,7 @@ jobs:
119119
nix-version: ["2.12.0", "2.19.2", "2.20.1"]
120120
exclude:
121121
# Only runs tests on macos if explicitly requested, or on a schedule
122-
- os: "${{ (inputs.run-mac-tests || github.event.schedule != '') && 'dummy' || 'macos-latest' }}"
122+
- os: "${{ (inputs.run-mac-tests || github.event.schedule != '') && 'dummy' || 'macos-13' }}"
123123

124124

125125
runs-on: ${{ matrix.os }}
@@ -158,7 +158,7 @@ jobs:
158158
brew install dash zsh
159159
fi
160160
- name: Install devbox
161-
uses: jetify-com/devbox-install-action@v0.9.0
161+
uses: jetify-com/devbox-install-action@v0.10.0
162162
with:
163163
enable-cache: true
164164
- name: Run fast tests
@@ -182,7 +182,7 @@ jobs:
182182
needs: build-devbox
183183
strategy:
184184
matrix:
185-
os: [ubuntu-latest, macos-latest]
185+
os: [ubuntu-latest, macos-13]
186186
runs-on: ${{ matrix.os }}
187187
steps:
188188
- uses: actions/checkout@v4
@@ -213,7 +213,7 @@ jobs:
213213
needs: build-devbox
214214
strategy:
215215
matrix:
216-
os: [ubuntu-latest, macos-latest]
216+
os: [ubuntu-latest, macos-13]
217217
nix-version: [2.15.1, 2.16.1, 2.17.0, 2.18.0, 2.19.2]
218218
runs-on: ${{ matrix.os }}
219219
steps:

docs/app/docs/continuous_integration/github_action.md

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -14,7 +14,7 @@ In your project's workflow YAML, add the following step:
1414

1515
```yaml
1616
- name: Install devbox
17-
uses: jetify-com/devbox-install-action@v0.8.0
17+
uses: jetify-com/devbox-install-action@v0.10.0
1818
```
1919
2020
## Example Workflow
@@ -33,7 +33,7 @@ jobs:
3333
- uses: actions/checkout@v4
3434

3535
- name: Install devbox
36-
uses: jetify-com/devbox-install-action@v0.8.0
36+
uses: jetify-com/devbox-install-action@v0.10.0
3737

3838
- name: Run arbitrary commands
3939
run: devbox run -- echo "done!"

internal/nix/nix.go

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -283,7 +283,7 @@ var versionInfo = sync.OnceValues(runNixVersion)
283283

284284
func runNixVersion() (VersionInfo, error) {
285285
// Arbitrary timeout to make sure we don't take too long or hang.
286-
ctx, cancel := context.WithTimeout(context.Background(), 10*time.Second)
286+
ctx, cancel := context.WithTimeout(context.Background(), 60*time.Second)
287287
defer cancel()
288288

289289
// Intentionally don't use the nix.command function here. We use this to

0 commit comments

Comments
 (0)