ci: use node/pnpm versions from config files [skip ci]

This commit is contained in:
Amin Yahyaabadi 2024-10-25 00:20:06 -07:00
parent ac7fe2df3f
commit e0e749b984
3 changed files with 12 additions and 34 deletions

View File

@ -20,16 +20,11 @@ jobs:
Build: Build:
runs-on: ${{ matrix.os }} runs-on: ${{ matrix.os }}
name: Build name: Build
if: ${{ !contains(github.event.head_commit.message, '[skip ci]') }}
strategy: strategy:
fail-fast: false fail-fast: false
matrix: matrix:
os: os:
- ubuntu-22.04 - ubuntu-22.04
node:
- 22.6.0
pnpm:
- 9.11.0
steps: steps:
- uses: actions/checkout@v4 - uses: actions/checkout@v4
with: with:
@ -38,12 +33,10 @@ jobs:
- name: Setup Node - name: Setup Node
uses: actions/setup-node@v4 uses: actions/setup-node@v4
with: with:
node-version: ${{ matrix.node }} node-version-file: "./.nvmrc"
- name: Setup Pnpm - name: Setup Pnpm
uses: pnpm/action-setup@v2 uses: pnpm/action-setup@v4
with:
version: ${{ matrix.pnpm }}
- name: Install - name: Install
run: | run: |
@ -84,7 +77,6 @@ jobs:
BuildExecutable: BuildExecutable:
name: Build-Executable-${{ matrix.os }} name: Build-Executable-${{ matrix.os }}
needs: [Build] needs: [Build]
if: ${{ !contains(github.event.head_commit.message, '[skip ci]') }}
runs-on: ${{ matrix.os }} runs-on: ${{ matrix.os }}
strategy: strategy:
fail-fast: false fail-fast: false
@ -94,10 +86,6 @@ jobs:
- ubuntu-24.04 - ubuntu-24.04
- macos-13 - macos-13
- macos-14 # arm64 - macos-14 # arm64
node:
- 22
pnpm:
- 9.11.0
steps: steps:
- uses: actions/checkout@v4 - uses: actions/checkout@v4
@ -109,12 +97,10 @@ jobs:
- name: Setup Node - name: Setup Node
uses: actions/setup-node@v4 uses: actions/setup-node@v4
with: with:
node-version: ${{ matrix.node }} node-version-file: "./.nvmrc"
- name: Setup Pnpm - name: Setup Pnpm
uses: pnpm/action-setup@v2 uses: pnpm/action-setup@v4
with:
version: ${{ matrix.pnpm }}
- name: Cache node_modules - name: Cache node_modules
uses: actions/cache@v4 uses: actions/cache@v4
@ -123,7 +109,7 @@ jobs:
~/.pnpm-store ~/.pnpm-store
D:\.pnpm-store D:\.pnpm-store
./node_modules ./node_modules
key: "setupcpp-node_modules-cache-OS:${{ matrix.os }}-node:${{ matrix.node }}-pnpm:${{ matrix.pnpm }}-${{ hashFiles('./.npmrc') }}-deps:${{ hashFiles('./package.json') }}" key: "setupcpp-node_modules-cache-OS:${{ matrix.os }}-${{ hashFiles('./.npmrc', './package.json', '.nvmrc', './packages/*/package.json') }}"
restore-keys: | restore-keys: |
"setupcpp-node_modules-cache-OS:${{ matrix.os }}-" "setupcpp-node_modules-cache-OS:${{ matrix.os }}-"
@ -146,7 +132,6 @@ jobs:
Test: Test:
name: Test-${{ matrix.os }} name: Test-${{ matrix.os }}
if: ${{ !contains(github.event.head_commit.message, '[skip ci]') }}
needs: [Build] needs: [Build]
runs-on: ${{ matrix.os }} runs-on: ${{ matrix.os }}
strategy: strategy:
@ -161,10 +146,6 @@ jobs:
- macos-14 - macos-14
- macos-13 - macos-13
- macos-12 - macos-12
node:
- 22
pnpm:
- 9.11.0
steps: steps:
- uses: actions/checkout@v4 - uses: actions/checkout@v4
with: with:
@ -178,12 +159,10 @@ jobs:
- name: Setup Node - name: Setup Node
uses: actions/setup-node@v4 uses: actions/setup-node@v4
with: with:
node-version: ${{ matrix.node }} node-version-file: "./.nvmrc"
- name: Setup Pnpm - name: Setup Pnpm
uses: pnpm/action-setup@v2 uses: pnpm/action-setup@v4
with:
version: ${{ matrix.pnpm }}
- name: Cache node_modules - name: Cache node_modules
uses: actions/cache@v4 uses: actions/cache@v4
@ -192,7 +171,7 @@ jobs:
~/.pnpm-store ~/.pnpm-store
D:\.pnpm-store D:\.pnpm-store
./node_modules ./node_modules
key: "setupcpp-node_modules-cache-OS:${{ matrix.os }}-node:${{ matrix.node }}-pnpm:${{ matrix.pnpm }}-${{ hashFiles('./.npmrc') }}-deps:${{ hashFiles('./package.json') }}" key: "setupcpp-node_modules-cache-OS:${{ matrix.os }}-${{ hashFiles('./.npmrc', './package.json', '.nvmrc', './packages/*/package.json') }}"
restore-keys: | restore-keys: |
"setupcpp-node_modules-cache-OS:${{ matrix.os }}-" "setupcpp-node_modules-cache-OS:${{ matrix.os }}-"
@ -234,7 +213,6 @@ jobs:
Docker: Docker:
name: Docker-${{ matrix.container.image }} name: Docker-${{ matrix.container.image }}
if: ${{ !contains(github.event.head_commit.message, '[skip ci]') }}
needs: [Build] needs: [Build]
runs-on: ${{ matrix.os }} runs-on: ${{ matrix.os }}
strategy: strategy:
@ -242,10 +220,6 @@ jobs:
matrix: matrix:
os: os:
- ubuntu-24.04 - ubuntu-24.04
node:
- 22
pnpm:
- 9.11.0
container: container:
- { file: "ubuntu-llvm.dockerfile", image: "setup-cpp-ubuntu-llvm", tag: "22.04-0.44.0" } - { file: "ubuntu-llvm.dockerfile", image: "setup-cpp-ubuntu-llvm", tag: "22.04-0.44.0" }
- { file: "fedora-llvm.dockerfile", image: "setup-cpp-fedora-llvm", tag: "40-0.44.0" } - { file: "fedora-llvm.dockerfile", image: "setup-cpp-fedora-llvm", tag: "40-0.44.0" }

View File

@ -26,6 +26,9 @@
"[yaml]": { "[yaml]": {
"editor.defaultFormatter": "dprint.dprint" "editor.defaultFormatter": "dprint.dprint"
}, },
"[github-actions-workflow]": {
"editor.defaultFormatter": "dprint.dprint"
},
"cSpell.advanced.feature.useReferenceProviderWithRename": true, "cSpell.advanced.feature.useReferenceProviderWithRename": true,
"cSpell.checkOnlyEnabledFileTypes": false, "cSpell.checkOnlyEnabledFileTypes": false,
"cSpell.numSuggestions": 3, "cSpell.numSuggestions": 3,

View File

@ -81,6 +81,7 @@ words:
- noreply - noreply
- nothrow - nothrow
- npmrc - npmrc
- nvmrc
- Opencppcoverage - Opencppcoverage
- OSSDK - OSSDK
- papm - papm