diff --git a/.github/workflows/just.yml b/.github/workflows/just.yml index d7390fbd3..e11d268d4 100644 --- a/.github/workflows/just.yml +++ b/.github/workflows/just.yml @@ -95,9 +95,15 @@ jobs: name: ${{ matrix.project }} steps: - uses: actions/checkout@3d3c42e5aac5ba805825da76410c181273ba90b1 # v7.0.1 + # Each example pins its Solana CLI in Cargo.toml `[workspace.metadata.cli]`. + - name: Read pinned Solana version + id: solana + working-directory: ${{ matrix.project }} + run: echo "version=$(sed -n 's/^solana = "\(.*\)"/\1/p' Cargo.toml)" >> "$GITHUB_OUTPUT" - uses: ./.github/actions/setup with: - node-version-file: ${{ matrix.project }}/.nvmrc + solana-version: ${{ steps.solana.outputs.version || 'stable' }} + node-version-file: .nvmrc pnpm-lock-glob: ${{ matrix.project }}/pnpm-lock.yaml install-just: 'true' cargo-cache-workspaces: ${{ matrix.project }} diff --git a/.github/workflows/typescript.yml b/.github/workflows/typescript.yml index edbd109fa..5364ac4d2 100644 --- a/.github/workflows/typescript.yml +++ b/.github/workflows/typescript.yml @@ -30,7 +30,7 @@ jobs: - uses: pnpm/action-setup@b906affcce14559ad1aafd4ab0e942779e9f58b1 # v4 - uses: actions/setup-node@49933ea5288caeca8642d1e84afbd3f7d6820020 # v4.4.0 with: - node-version: 20 + node-version-file: .nvmrc cache: pnpm # --frozen-lockfile: fail if pnpm-lock.yaml is out of date # --ignore-workspace: only install root deps, not all 94 subprojects diff --git a/.nvmrc b/.nvmrc index 2bd5a0a98..ce62013c3 100644 --- a/.nvmrc +++ b/.nvmrc @@ -1 +1 @@ -22 +24.22.1 diff --git a/games/gacha/pinocchio/.nvmrc b/games/gacha/pinocchio/.nvmrc deleted file mode 100644 index 3fe3b1570..000000000 --- a/games/gacha/pinocchio/.nvmrc +++ /dev/null @@ -1 +0,0 @@ -24.13.0 diff --git a/games/world-cup/pinocchio/.nvmrc b/games/world-cup/pinocchio/.nvmrc index 3fe3b1570..ce62013c3 100644 --- a/games/world-cup/pinocchio/.nvmrc +++ b/games/world-cup/pinocchio/.nvmrc @@ -1 +1 @@ -24.13.0 +24.22.1