Skip to content

Commit 7d9965f

Browse files
committed
Auto merge of #4460 - Turbo87:volta, r=locks
Use Volta to pin Node.js and yarn versions see https://volta.sh
2 parents 2a9a85e + 5bba9ff commit 7d9965f

File tree

3 files changed

+7
-26
lines changed

3 files changed

+7
-26
lines changed

.github/renovate.json5

Lines changed: 0 additions & 16 deletions
Original file line numberDiff line numberDiff line change
@@ -31,15 +31,6 @@
3131
"datasourceTemplate": "crate",
3232
"versioningTemplate": "semver",
3333
},
34-
{
35-
"fileMatch": ["^.github/workflows/[^\\.]+\\.ya?ml$"],
36-
"matchStrings": ["NODE_VERSION:\\s*(?<currentValue>.*?)\n"],
37-
"depNameTemplate": "node",
38-
"datasourceTemplate": "github-releases",
39-
"lookupNameTemplate": "nodejs/node",
40-
"extractVersionTemplate": "^v(?<version>.*)$",
41-
"versioningTemplate": "node"
42-
},
4334
{
4435
"fileMatch": ["^.github/workflows/[^\\.]+\\.ya?ml$"],
4536
"matchStrings": ["RUST_VERSION:\\s*(?<currentValue>.*?)\n"],
@@ -77,13 +68,6 @@
7768
"matchPackageNames": ["rust"],
7869
"commitMessageTopic": "Rust",
7970
"labels": ["A-backend"],
80-
}, {
81-
// Groups the `NODE_VERSION` update with the rest of the Node.js updates
82-
// and assigns the `A-frontend` label to the PR.
83-
"matchManagers": ["regex"],
84-
"matchPackageNames": ["node"],
85-
"commitMessageTopic": "Node.js",
86-
"labels": ["A-frontend"],
8771
}, {
8872
"matchPackagePatterns": [
8973
"^conduit$",

.github/workflows/ci.yml

Lines changed: 2 additions & 9 deletions
Original file line numberDiff line numberDiff line change
@@ -11,7 +11,6 @@ on:
1111

1212
env:
1313
DIESEL_CLI_VERSION: 1.4.1
14-
NODE_VERSION: 16.13.2
1514
RUST_VERSION: 1.58.0
1615

1716
jobs:
@@ -28,10 +27,7 @@ jobs:
2827

2928
steps:
3029
- uses: actions/checkout@v2
31-
32-
- uses: actions/setup-node@v2
33-
with:
34-
node-version: ${{ env.NODE_VERSION }}
30+
- uses: volta-cli/action@v1
3531

3632
- name: Install node modules
3733
run: yarn install
@@ -58,10 +54,7 @@ jobs:
5854

5955
steps:
6056
- uses: actions/checkout@v2
61-
62-
- uses: actions/setup-node@v2
63-
with:
64-
node-version: ${{ env.NODE_VERSION }}
57+
- uses: volta-cli/action@v1
6558

6659
- run: yarn install
6760

package.json

Lines changed: 5 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -139,9 +139,13 @@
139139
},
140140
"engines": {
141141
"node": "16.13.2",
142-
"npm": "^8.0.0"
142+
"yarn": "1.22.17"
143143
},
144144
"ember": {
145145
"edition": "octane"
146+
},
147+
"volta": {
148+
"node": "16.13.2",
149+
"yarn": "1.22.17"
146150
}
147151
}

0 commit comments

Comments
 (0)