From 0bc85d66b03c4479499c251ca758773e28dd418f Mon Sep 17 00:00:00 2001 From: rouzwelt Date: Tue, 6 Aug 2024 01:51:11 +0000 Subject: [PATCH] update --- .../workflows/manual-vscode-pre-release.yaml | 9 +++----- .github/workflows/manual-vscode-release.yaml | 9 +++----- .github/workflows/rainix.yaml | 9 +++----- flake.nix | 22 +------------------ 4 files changed, 10 insertions(+), 39 deletions(-) diff --git a/.github/workflows/manual-vscode-pre-release.yaml b/.github/workflows/manual-vscode-pre-release.yaml index cb57a69..7bc15a6 100644 --- a/.github/workflows/manual-vscode-pre-release.yaml +++ b/.github/workflows/manual-vscode-pre-release.yaml @@ -11,17 +11,14 @@ jobs: fetch-depth: 0 submodules: recursive - - uses: DeterminateSystems/nix-installer-action@v4 - - uses: DeterminateSystems/magic-nix-cache-action@v2 - - - name: Install NodeJS v21 + - name: Install NodeJS v22 uses: actions/setup-node@v4 with: - node-version: 21 + node-version: 22 cache: 'npm' - name: Install Deps - run: nix run .#install + run: npm install - name: Build Prod run: npm run build-prod diff --git a/.github/workflows/manual-vscode-release.yaml b/.github/workflows/manual-vscode-release.yaml index 90f9fda..d27a84a 100644 --- a/.github/workflows/manual-vscode-release.yaml +++ b/.github/workflows/manual-vscode-release.yaml @@ -11,17 +11,14 @@ jobs: fetch-depth: 0 submodules: recursive - - uses: DeterminateSystems/nix-installer-action@v4 - - uses: DeterminateSystems/magic-nix-cache-action@v2 - - - name: Install NodeJS v21 + - name: Install NodeJS v22 uses: actions/setup-node@v4 with: - node-version: 21 + node-version: 22 cache: 'npm' - name: Install Deps - run: nix run .#install + run: npm install - name: Build Prod run: npm run build-prod diff --git a/.github/workflows/rainix.yaml b/.github/workflows/rainix.yaml index e0d5e25..51af7d4 100644 --- a/.github/workflows/rainix.yaml +++ b/.github/workflows/rainix.yaml @@ -9,17 +9,14 @@ jobs: steps: - uses: actions/checkout@v4 - - uses: DeterminateSystems/nix-installer-action@v4 - - uses: DeterminateSystems/magic-nix-cache-action@v2 - - - name: Install NodeJS v21 + - name: Install NodeJS v22 uses: actions/setup-node@v4 with: - node-version: 21 + node-version: 22 cache: 'npm' - name: Install Deps - run: nix run .#install + run: npm install - name: Build Prod run: npm run build-prod diff --git a/flake.nix b/flake.nix index 8a001b0..2b12d8c 100644 --- a/flake.nix +++ b/flake.nix @@ -10,31 +10,11 @@ let pkgs = rainix.pkgs.${system}; in rec { - packages = { - install = rainix.mkTask.${system} { - name = "install"; - body = '' - set -euxo pipefail - npm install - ''; - additionalBuildInputs = [ - pkgs.wasm-bindgen-cli - rainix.rust-toolchain.${system} - rainix.rust-build-inputs.${system} - rainix.node-build-inputs.${system} - ]; - }; - }; - # For `nix develop`: devShell = pkgs.mkShell { nativeBuildInputs = [ - rainix.rust-toolchain.${system} - rainix.rust-build-inputs.${system} rainix.node-build-inputs.${system} - ] ++ (with pkgs; [ - wasm-bindgen-cli - ]); + ]; }; } );