Skip to content

Commit dc22725

Browse files
committed
fix: update CI
1 parent 47de7bc commit dc22725

File tree

7 files changed

+42
-26
lines changed

7 files changed

+42
-26
lines changed

.github/workflows/feature.yml

Lines changed: 1 addition & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -13,8 +13,7 @@ concurrency:
1313
jobs:
1414
use-library-js-feature:
1515
permissions:
16-
packages: read
1716
contents: read
1817
actions: write
1918
checks: write
20-
uses: MatrixAI/.github/.github/workflows/library-js-feature.yml@feature-actions
19+
uses: MatrixAI/.github/.github/workflows/library-js-feature.yml@master

.github/workflows/staging.yml

Lines changed: 1 addition & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -13,12 +13,11 @@ concurrency:
1313
jobs:
1414
use-library-js-staging:
1515
permissions:
16-
packages: read
1716
contents: write
1817
actions: write
1918
checks: write
2019
pull-requests: write
21-
uses: MatrixAI/.github/.github/workflows/library-js-staging.yml@feature-actions
20+
uses: MatrixAI/.github/.github/workflows/library-js-staging.yml@master
2221
secrets:
2322
GH_TOKEN: ${{ secrets.GH_TOKEN }}
2423
GIT_AUTHOR_EMAIL: ${{ secrets.GIT_AUTHOR_EMAIL }}

.github/workflows/tag.yml

Lines changed: 1 addition & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -9,7 +9,6 @@ on:
99
jobs:
1010
use-library-js-tag:
1111
permissions:
12-
packages: read
1312
contents: read
1413
actions: write
15-
uses: MatrixAI/.github/.github/workflows/library-js-tag.yml@feature-actions
14+
uses: MatrixAI/.github/.github/workflows/library-js-tag.yml@master

flake.lock

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

flake.nix

Lines changed: 7 additions & 8 deletions
Original file line numberDiff line numberDiff line change
@@ -1,21 +1,20 @@
11
{
22
inputs = {
3-
nixpkgs.url = "github:nixos/nixpkgs";
3+
nixpkgs-matrix = {
4+
type = "indirect";
5+
id = "nixpkgs-matrix";
6+
};
47
flake-utils.url = "github:numtide/flake-utils";
58
};
69

7-
outputs = { nixpkgs, flake-utils, ... }:
10+
outputs = { nixpkgs-matrix, flake-utils, ... }:
811
flake-utils.lib.eachDefaultSystem (system:
912
let
10-
pkgs = nixpkgs.legacyPackages.${system};
13+
pkgs = nixpkgs-matrix.legacyPackages.${system};
1114
shell = { ci ? false }:
1215
with pkgs;
1316
pkgs.mkShell {
14-
nativeBuildInputs = [
15-
nodejs_20
16-
shellcheck
17-
gitAndTools.gh
18-
];
17+
nativeBuildInputs = [ nodejs_20 shellcheck gitAndTools.gh ];
1918
PKG_IGNORE_TAG = 1;
2019
shellHook = ''
2120
echo "Entering $(npm pkg get name)"

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: 6 additions & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -1,3 +1,5 @@
1+
$ErrorActionPreference = "Stop"
2+
13
function Save-ChocoPackage {
24
param (
35
$PackageName
@@ -21,10 +23,10 @@ if ( $null -eq $env:ChocolateyInstall ) {
2123
New-Item -Path "${PSScriptRoot}\..\tmp\chocolatey" -ItemType "directory" -ErrorAction:SilentlyContinue
2224
choco source add --name="cache" --source="${PSScriptRoot}\..\tmp\chocolatey" --priority=1
2325

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
26+
# Install nodejs v20.5.1 (will use cache if exists)
27+
$nodejs = "nodejs"
28+
choco install "$nodejs" --version="20.5.1" --require-checksums -y
2729
# 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) ) {
30+
if ( -not (Test-Path -Path "${PSScriptRoot}\..\tmp\chocolatey\$nodejs\$nodejs.20.5.1.nupkg" -PathType Leaf) ) {
2931
Save-ChocoPackage -PackageName $nodejs
3032
}

0 commit comments

Comments
 (0)