Skip to content

Commit 0b331d5

Browse files
authored
Merge branch 'main' into dependabot/pip/examples/stacks/django/pip-058635d13d
Signed-off-by: John Lago <750845+Lagoja@users.noreply.github.com>
2 parents a0c40c3 + 07ba8de commit 0b331d5

288 files changed

Lines changed: 1949 additions & 24067 deletions

File tree

Some content is hidden

Large Commits have some content hidden by default. Use the searchbox below for content that may be hidden.

.envrc

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -1,4 +1,4 @@
1-
#!/bin/bash
1+
#!/usr/bin/env bash
22

33
# Automatically sets up your devbox environment whenever you cd into this
44
# directory via our direnv integration:

.github/workflows/cli-tests.yaml

Lines changed: 51 additions & 9 deletions
Original file line numberDiff line numberDiff line change
@@ -48,12 +48,14 @@ env:
4848
HOMEBREW_NO_EMOJI: 1
4949
HOMEBREW_NO_ENV_HINTS: 1
5050
HOMEBREW_NO_INSTALL_CLEANUP: 1
51-
51+
NIX_CONFIG: |
52+
access-tokens = github.com=${{ secrets.GITHUB_TOKEN }}
53+
5254
jobs:
5355
build-devbox:
5456
strategy:
5557
matrix:
56-
os: [ubuntu-latest, macos-13]
58+
os: [ubuntu-latest, macos-latest]
5759
runs-on: ${{ matrix.os }}
5860
steps:
5961
- uses: actions/checkout@v4
@@ -98,7 +100,7 @@ jobs:
98100
golangci-lint:
99101
strategy:
100102
matrix:
101-
os: [ubuntu-latest, macos-13]
103+
os: [ubuntu-latest, macos-latest]
102104
runs-on: ${{ matrix.os }}
103105
timeout-minutes: 10
104106
steps:
@@ -126,7 +128,7 @@ jobs:
126128
matrix:
127129
is-main:
128130
- ${{ github.ref == 'refs/heads/main' && 'is-main' || 'not-main' }}
129-
os: [ubuntu-latest, macos-13]
131+
os: [ubuntu-latest, macos-latest]
130132
# This is an optimization that runs tests twice, with and without
131133
# the devbox.json tests. We can require the other tests to complete before
132134
# merging, while keeping the others as an additional non-required signal
@@ -138,7 +140,7 @@ jobs:
138140
nix-version: ["2.12.0", "2.19.2", "2.30.2"]
139141
exclude:
140142
# Only runs tests on macos if explicitly requested, or on a schedule
141-
- os: "${{ (inputs.run-mac-tests || github.event.schedule != '') && 'dummy' || 'macos-13' }}"
143+
- os: "${{ (inputs.run-mac-tests || github.event.schedule != '') && 'dummy' || 'macos-latest' }}"
142144

143145

144146
runs-on: ${{ matrix.os }}
@@ -176,6 +178,30 @@ jobs:
176178
uses: jetify-com/devbox-install-action@jl/migrate-installer
177179
with:
178180
enable-cache: true
181+
- name: Setup Nix GitHub authentication
182+
run: |
183+
# Setup github authentication to ensure Github's rate limits are not hit
184+
# For macOS, we need to configure the system-wide nix.conf because the Nix daemon
185+
# runs as a different user and doesn't read the user's ~/.config/nix/nix.conf
186+
if [ "$RUNNER_OS" == "macOS" ]; then
187+
echo "Configuring system-wide Nix config for macOS daemon"
188+
# Ensure /etc/nix directory exists
189+
if [ ! -d /etc/nix ]; then
190+
sudo mkdir -p /etc/nix
191+
fi
192+
# Check if file exists, create it if not
193+
if [ ! -f /etc/nix/nix.conf ]; then
194+
echo "# Nix configuration" | sudo tee /etc/nix/nix.conf > /dev/null
195+
fi
196+
echo "access-tokens = github.com=${{ secrets.GITHUB_TOKEN }}" | sudo tee -a /etc/nix/nix.conf
197+
# Restart nix daemon to pick up the new configuration
198+
sudo launchctl stop org.nixos.nix-daemon || true
199+
sudo launchctl start org.nixos.nix-daemon || true
200+
sleep 2 # Give daemon time to restart
201+
fi
202+
# For Linux and as a backup for macOS, also configure user config
203+
mkdir -p ~/.config/nix
204+
echo "access-tokens = github.com=${{ secrets.GITHUB_TOKEN }}" > ~/.config/nix/nix.conf
179205
- name: Run fast tests
180206
if: matrix.run-project-tests == 'project-tests-off'
181207
run: |
@@ -197,7 +223,7 @@ jobs:
197223
needs: build-devbox
198224
strategy:
199225
matrix:
200-
os: [ubuntu-latest, macos-13]
226+
os: [ubuntu-latest, macos-latest]
201227
use-detsys: [true, false]
202228
runs-on: ${{ matrix.os }}
203229
steps:
@@ -215,12 +241,28 @@ jobs:
215241
export NIX_INSTALLER_NO_CHANNEL_ADD=1
216242
export DEVBOX_FEATURE_DETSYS_INSTALLER=${{ matrix.use-detsys }}
217243
218-
# Setup github authentication to ensure Github's rate limits are not hit.
219-
# If this works, we can consider refactoring this into a reusable github action helper.
244+
# Setup github authentication BEFORE running devbox to ensure Github's rate limits are not hit.
245+
# Configure user config first (Nix installer will respect this)
220246
mkdir -p ~/.config/nix
221247
echo "access-tokens = github.com=${{ secrets.GITHUB_TOKEN }}" > ~/.config/nix/nix.conf
222248
249+
# Run devbox which will auto-install Nix if needed
223250
devbox run echo "Installing packages..."
251+
252+
# After Nix is installed, configure system-wide config for the daemon on macOS
253+
if [ "$RUNNER_OS" == "macOS" ]; then
254+
echo "Configuring system-wide Nix config for macOS daemon"
255+
# Check if file exists, create directory if needed
256+
if [ ! -f /etc/nix/nix.conf ]; then
257+
sudo mkdir -p /etc/nix
258+
echo "# Nix configuration" | sudo tee /etc/nix/nix.conf > /dev/null
259+
fi
260+
echo "access-tokens = github.com=${{ secrets.GITHUB_TOKEN }}" | sudo tee -a /etc/nix/nix.conf
261+
# Restart nix daemon to pick up the new configuration
262+
sudo launchctl stop org.nixos.nix-daemon || true
263+
sudo launchctl start org.nixos.nix-daemon || true
264+
sleep 2 # Give daemon time to restart
265+
fi
224266
- name: Test removing package
225267
run: devbox rm go
226268

@@ -230,7 +272,7 @@ jobs:
230272
needs: build-devbox
231273
strategy:
232274
matrix:
233-
os: [ubuntu-latest, macos-13]
275+
os: [ubuntu-latest, macos-latest]
234276
nix-version: [2.15.1, 2.16.1, 2.17.0, 2.18.0, 2.19.2, 2.24.7]
235277
runs-on: ${{ matrix.os }}
236278
steps:

.github/workflows/vscode-ext-release.yaml

Lines changed: 4 additions & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -11,11 +11,11 @@ jobs:
1111
environment: release
1212
steps:
1313
- name: Checkout
14-
uses: actions/checkout@v4
15-
- name: Setup NodeJS 18
16-
uses: actions/setup-node@v4
14+
uses: actions/checkout@v5
15+
- name: Setup NodeJS 24
16+
uses: actions/setup-node@v5
1717
with:
18-
node-version: 18
18+
node-version: 24
1919
- name: Install dependencies
2020
run: |
2121
npm install -g yarn

README.md

Lines changed: 1 addition & 6 deletions
Original file line numberDiff line numberDiff line change
@@ -47,7 +47,7 @@ curl -fsSL https://get.jetify.com/devbox | bash
4747
```
4848

4949
Read more on the
50-
[Devbox docs](https://www.jetify.com/devbox/docs/installing_devbox/).
50+
[Devbox docs](https://www.jetify.com/devbox/docs/installing-devbox/).
5151

5252
## Benefits
5353

@@ -188,11 +188,6 @@ Devbox is an opensource project, so contributions are always welcome. Please rea
188188

189189
Thanks to [Nix](https://nixos.org/) for providing isolated shells.
190190

191-
## Translation
192-
193-
- [Chinese](./docs/translation/README-zh-CN.md)
194-
- [Korean](./docs/translation/README-ko-KR.md)
195-
196191
## License
197192

198193
This project is proudly open-source under the

docs/.dockerignore

Lines changed: 0 additions & 3 deletions
This file was deleted.

docs/.gitignore

Lines changed: 0 additions & 29 deletions
This file was deleted.

docs/.markdownlint.yaml

Lines changed: 0 additions & 10 deletions
This file was deleted.

docs/Dockerfile

Lines changed: 0 additions & 6 deletions
This file was deleted.

docs/README.md

Lines changed: 0 additions & 43 deletions
This file was deleted.

docs/app/.envrc

Lines changed: 0 additions & 9 deletions
This file was deleted.

0 commit comments

Comments
 (0)