Skip to content

Commit 00943e0

Browse files
committed
chore: upgraded project configuration to match Polykey
1 parent a476523 commit 00943e0

File tree

7 files changed

+78
-59
lines changed

7 files changed

+78
-59
lines changed

.gitlab-ci.yml

Lines changed: 1 addition & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -165,6 +165,7 @@ build:windows:
165165
- windows
166166
before_script:
167167
- mkdir -Force "$CI_PROJECT_DIR/tmp"
168+
- Import-Module $env:ChocolateyInstall\helpers\chocolateyProfile.psm1
168169
script:
169170
- .\scripts\choco-install.ps1
170171
- refreshenv

package-lock.json

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

package.json

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -37,10 +37,10 @@
3737
"bench": "tsc -p ./tsconfig.build.json && shx rm -rf ./benches/results && tsx ./benches/index.ts"
3838
},
3939
"devDependencies": {
40-
"@swc/core": "^1.3.76",
40+
"@swc/core": "1.3.82",
4141
"@swc/jest": "^0.2.29",
4242
"@types/jest": "^29.5.2",
43-
"@types/node": "^18.15.0",
43+
"@types/node": "^20.5.7",
4444
"@typescript-eslint/eslint-plugin": "^5.61.0",
4545
"@typescript-eslint/parser": "^5.61.0",
4646
"benny": "^3.7.1",

pkgs.nix

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -1,4 +1,4 @@
11
import (
2-
let rev = "f294325aed382b66c7a188482101b0f336d1d7db"; in
2+
let rev = "ea5234e7073d5f44728c499192544a84244bf35a"; in
33
builtins.fetchTarball "https://github.com/NixOS/nixpkgs/archive/${rev}.tar.gz"
44
)

scripts/brew-install.sh

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -10,5 +10,5 @@ export HOMEBREW_NO_INSTALLED_DEPENDENTS_CHECK=1
1010
export HOMEBREW_NO_AUTO_UPDATE=1
1111
export HOMEBREW_NO_ANALYTICS=1
1212

13-
brew install node@18
14-
brew link --overwrite node@18
13+
brew reinstall node@20
14+
brew link --overwrite node@20

scripts/choco-install.ps1

Lines changed: 4 additions & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -21,10 +21,10 @@ if ( $null -eq $env:ChocolateyInstall ) {
2121
New-Item -Path "${PSScriptRoot}\..\tmp\chocolatey" -ItemType "directory" -ErrorAction:SilentlyContinue
2222
choco source add --name="cache" --source="${PSScriptRoot}\..\tmp\chocolatey" --priority=1
2323

24-
# Install nodejs v18.15.0 (will use cache if exists)
25-
$nodejs = "nodejs.install"
26-
choco install "$nodejs" --version="18.15.0" --require-checksums -y
24+
# Install nodejs v20.5.1 (will use cache if exists)
25+
$nodejs = "nodejs"
26+
choco install "$nodejs" --version="20.5.1" --require-checksums -y
2727
# Internalise nodejs to cache if doesn't exist
28-
if ( -not (Test-Path -Path "${PSScriptRoot}\..\tmp\chocolatey\$nodejs\$nodejs.18.15.0.nupkg" -PathType Leaf) ) {
28+
if ( -not (Test-Path -Path "${PSScriptRoot}\..\tmp\chocolatey\$nodejs\$nodejs.20.5.1.nupkg" -PathType Leaf) ) {
2929
Save-ChocoPackage -PackageName $nodejs
3030
}

shell.nix

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -3,7 +3,7 @@
33
with pkgs;
44
mkShell {
55
nativeBuildInputs = [
6-
nodejs
6+
nodejs_20
77
shellcheck
88
gitAndTools.gh
99
];

0 commit comments

Comments
 (0)