Skip to content

Commit 4d8479a

Browse files
committed
fix: pin version of macos
1 parent e0b791e commit 4d8479a

File tree

2 files changed

+2
-24
lines changed

2 files changed

+2
-24
lines changed

.github/workflows/nix-build.yml

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -24,7 +24,7 @@ jobs:
2424
arch: amd64
2525
- runner: large-linux-arm
2626
arch: arm64
27-
- runner: macos-latest-xlarge
27+
- runner: macos-14-xlarge
2828
arch: arm64
2929
runs-on: ${{ matrix.runner }}
3030
timeout-minutes: 180

nix/checks.nix

Lines changed: 1 addition & 23 deletions
Original file line numberDiff line numberDiff line change
@@ -171,29 +171,7 @@
171171
#First we need to create a generic pg cluster for pgtap tests and run those
172172
export GRN_PLUGINS_DIR=${pkgs.supabase-groonga}/lib/groonga/plugins
173173
PGTAP_CLUSTER=$(mktemp -d)
174-
# Set USER environment variable to handle root user restriction on macOS
175-
# This is a common pattern in Nix builds to handle user-related issues
176-
export USER="$(whoami)"
177-
if [[ "$(uname)" == "Darwin" ]]; then
178-
# On macOS, ensure we're not running as root for initdb
179-
if [[ "$USER" == "root" ]]; then
180-
export USER="nobody"
181-
fi
182-
fi
183-
184-
# Initialize database with proper flags based on version
185-
if [ "${majorVersion}" = "orioledb-17" ]; then
186-
initdb -D "$PGTAP_CLUSTER" \
187-
--allow-group-access \
188-
--username=supabase_admin \
189-
--locale-provider=icu \
190-
--encoding=UTF-8 \
191-
--icu-locale=en_US.UTF-8
192-
else
193-
initdb -D "$PGTAP_CLUSTER" \
194-
--allow-group-access \
195-
--username=supabase_admin
196-
fi
174+
initdb --locale=C --username=supabase_admin -D "$PGTAP_CLUSTER"
197175
substitute ${./tests/postgresql.conf.in} "$PGTAP_CLUSTER"/postgresql.conf \
198176
--subst-var-by PGSODIUM_GETKEY_SCRIPT "${getkey-script}/bin/pgsodium-getkey"
199177
echo "listen_addresses = '*'" >> "$PGTAP_CLUSTER"/postgresql.conf

0 commit comments

Comments
 (0)