Skip to content

Commit c7e6b6e

Browse files
4ian4ian
authored
Bump CircleCI/Semaphore cache versions (#8280)
1 parent dbb586a commit c7e6b6e

File tree

2 files changed

+29
-29
lines changed

2 files changed

+29
-29
lines changed

‎.circleci/config.yml‎

Lines changed: 14 additions & 14 deletions
Original file line numberDiff line numberDiff line change
@@ -47,9 +47,9 @@ jobs:
4747
# GDevelop.js dependencies
4848
- restore_cache:
4949
keys:
50-
- gd-macos-nodejs-dependencies-{{ checksum "newIDE/app/package.json" }}-{{ checksum "newIDE/electron-app/package.json" }}-{{ checksum "GDevelop.js/package.json" }}-{{ checksum "GDJS/package-lock.json" }}
50+
- gd-macos-nodejs-dependencies-v2-{{ checksum "newIDE/app/package.json" }}-{{ checksum "newIDE/electron-app/package.json" }}-{{ checksum "GDevelop.js/package.json" }}-{{ checksum "GDJS/package-lock.json" }}
5151
# fallback to using the latest cache if no exact match is found
52-
- gd-macos-nodejs-dependencies-
52+
- gd-macos-nodejs-dependencies-v2-
5353

5454
- run:
5555
name: Install GDevelop.js dependencies
@@ -71,7 +71,7 @@ jobs:
7171
- newIDE/app/node_modules
7272
- GDevelop.js/node_modules
7373
- GDJS/node_modules
74-
key: gd-macos-nodejs-dependencies-{{ checksum "newIDE/app/package.json" }}-{{ checksum "newIDE/electron-app/package.json" }}-{{ checksum "GDevelop.js/package.json" }}-{{ checksum "GDJS/package-lock.json" }}
74+
key: gd-macos-nodejs-dependencies-v2-{{ checksum "newIDE/app/package.json" }}-{{ checksum "newIDE/electron-app/package.json" }}-{{ checksum "GDevelop.js/package.json" }}-{{ checksum "GDJS/package-lock.json" }}
7575

7676
# Build GDevelop IDE (seems like we need to allow Node.js to use more space than usual)
7777
# Note: Code signing is done using CSC_LINK (see https://www.electron.build/code-signing).
@@ -141,9 +141,9 @@ jobs:
141141

142142
- restore_cache:
143143
keys:
144-
- gd-linux-nodejs-dependencies-{{ checksum "newIDE/app/package.json" }}-{{ checksum "newIDE/electron-app/package.json" }}-{{ checksum "GDevelop.js/package.json" }}-{{ checksum "GDJS/package-lock.json" }}
144+
- gd-linux-nodejs-dependencies-v2-{{ checksum "newIDE/app/package.json" }}-{{ checksum "newIDE/electron-app/package.json" }}-{{ checksum "GDevelop.js/package.json" }}-{{ checksum "GDJS/package-lock.json" }}
145145
# fallback to using the latest cache if no exact match is found
146-
- gd-linux-nodejs-dependencies-
146+
- gd-linux-nodejs-dependencies-v2-
147147

148148
# GDevelop IDE dependencies (using an exact version of GDevelop.js, built previously)
149149
- run:
@@ -156,7 +156,7 @@ jobs:
156156
- newIDE/app/node_modules
157157
- GDevelop.js/node_modules
158158
- GDJS/node_modules
159-
key: gd-linux-nodejs-dependencies-{{ checksum "newIDE/app/package.json" }}-{{ checksum "newIDE/electron-app/package.json" }}-{{ checksum "GDevelop.js/package.json" }}-{{ checksum "GDJS/package-lock.json" }}
159+
key: gd-linux-nodejs-dependencies-v2-{{ checksum "newIDE/app/package.json" }}-{{ checksum "newIDE/electron-app/package.json" }}-{{ checksum "GDevelop.js/package.json" }}-{{ checksum "GDJS/package-lock.json" }}
160160

161161
# Build GDevelop IDE (seems like we need to allow Node.js to use more space than usual)
162162
- run:
@@ -203,9 +203,9 @@ jobs:
203203
# GDevelop.js dependencies
204204
- restore_cache:
205205
keys:
206-
- gdevelop.js-linux-nodejs-dependencies-{{ checksum "GDevelop.js/package-lock.json" }}
206+
- gdevelop.js-linux-nodejs-dependencies-v2-{{ checksum "GDevelop.js/package-lock.json" }}
207207
# fallback to using the latest cache if no exact match is found
208-
- gdevelop.js-linux-nodejs-dependencies-
208+
- gdevelop.js-linux-nodejs-dependencies-v2-
209209

210210
- run:
211211
name: Install GDevelop.js dependencies and build it
@@ -220,7 +220,7 @@ jobs:
220220
- save_cache:
221221
paths:
222222
- GDevelop.js/node_modules
223-
key: gdevelop.js-linux-nodejs-dependencies-{{ checksum "GDevelop.js/package-lock.json" }}
223+
key: gdevelop.js-linux-nodejs-dependencies-v2-{{ checksum "GDevelop.js/package-lock.json" }}
224224

225225
# Upload artifacts (CircleCI)
226226
- store_artifacts:
@@ -262,9 +262,9 @@ jobs:
262262
# GDevelop.js dependencies
263263
- restore_cache:
264264
keys:
265-
- gdevelop.js-linux-nodejs-dependencies-{{ checksum "GDevelop.js/package-lock.json" }}
265+
- gdevelop.js-linux-nodejs-dependencies-v2-{{ checksum "GDevelop.js/package-lock.json" }}
266266
# fallback to using the latest cache if no exact match is found
267-
- gdevelop.js-linux-nodejs-dependencies-
267+
- gdevelop.js-linux-nodejs-dependencies-v2-
268268

269269
- run:
270270
name: Install GDevelop.js dependencies and build it
@@ -364,8 +364,8 @@ jobs:
364364
- restore_cache:
365365
name: Restore node_modules cache
366366
keys:
367-
- v1-win-node-{{ checksum "newIDE/app/package-lock.json" }}-{{ checksum "newIDE/electron-app/package-lock.json" }}-{{ checksum "GDJS/package-lock.json" }}
368-
- v1-win-node-
367+
- v2-win-node-{{ checksum "newIDE/app/package-lock.json" }}-{{ checksum "newIDE/electron-app/package-lock.json" }}-{{ checksum "GDJS/package-lock.json" }}
368+
- v2-win-node-
369369

370370
- run:
371371
name: Install dependencies
@@ -396,7 +396,7 @@ jobs:
396396
397397
- save_cache:
398398
name: Save node_modules cache
399-
key: v1-win-node-{{ checksum "newIDE/app/package-lock.json" }}-{{ checksum "newIDE/electron-app/package-lock.json" }}-{{ checksum "GDJS/package-lock.json" }}
399+
key: v2-win-node-{{ checksum "newIDE/app/package-lock.json" }}-{{ checksum "newIDE/electron-app/package-lock.json" }}-{{ checksum "GDJS/package-lock.json" }}
400400
paths:
401401
- newIDE/app/node_modules
402402
- newIDE/electron-app/node_modules

‎.semaphore/semaphore.yml‎

Lines changed: 15 additions & 15 deletions
Original file line numberDiff line numberDiff line change
@@ -22,7 +22,7 @@ blocks:
2222
[ "${SEMAPHORE_GIT_PR_SLUG}" = "${SEMAPHORE_GIT_REPO_SLUG}" ]
2323
}
2424
25-
NEWIDE_KEY="newIDE-app-node_modules-$SEMAPHORE_GIT_BRANCH-revision-$(checksum newIDE/app/package-lock.json)"
25+
NEWIDE_KEY="newIDE-app-node_modules-v2-$SEMAPHORE_GIT_BRANCH-revision-$(checksum newIDE/app/package-lock.json)"
2626
if can_use_cache && cache has_key "${NEWIDE_KEY}"; then
2727
echo "Cache hit: ${NEWIDE_KEY}"
2828
else
@@ -41,7 +41,7 @@ blocks:
4141
[ "${SEMAPHORE_GIT_PR_SLUG}" = "${SEMAPHORE_GIT_REPO_SLUG}" ]
4242
}
4343
44-
GDJS_KEY="GDJS-node_modules-$SEMAPHORE_GIT_BRANCH-revision-$(checksum GDJS/package-lock.json)"
44+
GDJS_KEY="GDJS-node_modules-v2-$SEMAPHORE_GIT_BRANCH-revision-$(checksum GDJS/package-lock.json)"
4545
if can_use_cache && cache has_key "${GDJS_KEY}"; then
4646
echo "Cache hit: ${GDJS_KEY}"
4747
else
@@ -61,7 +61,7 @@ blocks:
6161
[ "${SEMAPHORE_GIT_PR_SLUG}" = "${SEMAPHORE_GIT_REPO_SLUG}" ]
6262
}
6363
64-
GDJS_TESTS_KEY="GDJS-tests-node_modules-$SEMAPHORE_GIT_BRANCH-revision-$(checksum GDJS/tests/package-lock.json)"
64+
GDJS_TESTS_KEY="GDJS-tests-node_modules-v2-$SEMAPHORE_GIT_BRANCH-revision-$(checksum GDJS/tests/package-lock.json)"
6565
if can_use_cache && cache has_key "${GDJS_TESTS_KEY}"; then
6666
echo "Cache hit: ${GDJS_TESTS_KEY}"
6767
else
@@ -90,8 +90,8 @@ blocks:
9090
[ "${SEMAPHORE_GIT_PR_SLUG}" = "${SEMAPHORE_GIT_REPO_SLUG}" ]
9191
}
9292
93-
NEWIDE_KEY="newIDE-app-node_modules-$SEMAPHORE_GIT_BRANCH-revision-$(checksum newIDE/app/package-lock.json)"
94-
GDJS_KEY="GDJS-node_modules-$SEMAPHORE_GIT_BRANCH-revision-$(checksum GDJS/package-lock.json)"
93+
NEWIDE_KEY="newIDE-app-node_modules-v2-$SEMAPHORE_GIT_BRANCH-revision-$(checksum newIDE/app/package-lock.json)"
94+
GDJS_KEY="GDJS-node_modules-v2-$SEMAPHORE_GIT_BRANCH-revision-$(checksum GDJS/package-lock.json)"
9595
9696
if can_use_cache; then
9797
echo "Restoring caches..."
@@ -117,9 +117,9 @@ blocks:
117117
[ "${SEMAPHORE_GIT_PR_SLUG}" = "${SEMAPHORE_GIT_REPO_SLUG}" ]
118118
}
119119
120-
NEWIDE_KEY="newIDE-app-node_modules-$SEMAPHORE_GIT_BRANCH-revision-$(checksum newIDE/app/package-lock.json)"
121-
GDJS_KEY="GDJS-node_modules-$SEMAPHORE_GIT_BRANCH-revision-$(checksum GDJS/package-lock.json)"
122-
GDJS_TESTS_KEY="GDJS-tests-node_modules-$SEMAPHORE_GIT_BRANCH-revision-$(checksum GDJS/tests/package-lock.json)"
120+
NEWIDE_KEY="newIDE-app-node_modules-v2-$SEMAPHORE_GIT_BRANCH-revision-$(checksum newIDE/app/package-lock.json)"
121+
GDJS_KEY="GDJS-node_modules-v2-$SEMAPHORE_GIT_BRANCH-revision-$(checksum GDJS/package-lock.json)"
122+
GDJS_TESTS_KEY="GDJS-tests-node_modules-v2-$SEMAPHORE_GIT_BRANCH-revision-$(checksum GDJS/tests/package-lock.json)"
123123
124124
if can_use_cache; then
125125
echo "Restoring caches..."
@@ -151,8 +151,8 @@ blocks:
151151
[ "${SEMAPHORE_GIT_PR_SLUG}" = "${SEMAPHORE_GIT_REPO_SLUG}" ]
152152
}
153153
154-
NEWIDE_KEY="newIDE-app-node_modules-$SEMAPHORE_GIT_BRANCH-revision-$(checksum newIDE/app/package-lock.json)"
155-
GDJS_KEY="GDJS-node_modules-$SEMAPHORE_GIT_BRANCH-revision-$(checksum GDJS/package-lock.json)"
154+
NEWIDE_KEY="newIDE-app-node_modules-v2-$SEMAPHORE_GIT_BRANCH-revision-$(checksum newIDE/app/package-lock.json)"
155+
GDJS_KEY="GDJS-node_modules-v2-$SEMAPHORE_GIT_BRANCH-revision-$(checksum GDJS/package-lock.json)"
156156
157157
if can_use_cache; then
158158
echo "Restoring caches..."
@@ -177,7 +177,7 @@ blocks:
177177
[ "${SEMAPHORE_GIT_PR_SLUG}" = "${SEMAPHORE_GIT_REPO_SLUG}" ]
178178
}
179179
180-
GDJS_KEY="GDJS-node_modules-$SEMAPHORE_GIT_BRANCH-revision-$(checksum GDJS/package-lock.json)"
180+
GDJS_KEY="GDJS-node_modules-v2-$SEMAPHORE_GIT_BRANCH-revision-$(checksum GDJS/package-lock.json)"
181181
182182
if can_use_cache; then
183183
echo "Restoring cache..."
@@ -204,8 +204,8 @@ blocks:
204204
[ "${SEMAPHORE_GIT_PR_SLUG}" = "${SEMAPHORE_GIT_REPO_SLUG}" ]
205205
}
206206
207-
NEWIDE_KEY="newIDE-app-node_modules-$SEMAPHORE_GIT_BRANCH-revision-$(checksum newIDE/app/package-lock.json)"
208-
GDJS_KEY="GDJS-node_modules-$SEMAPHORE_GIT_BRANCH-revision-$(checksum GDJS/package-lock.json)"
207+
NEWIDE_KEY="newIDE-app-node_modules-v2-$SEMAPHORE_GIT_BRANCH-revision-$(checksum newIDE/app/package-lock.json)"
208+
GDJS_KEY="GDJS-node_modules-v2-$SEMAPHORE_GIT_BRANCH-revision-$(checksum GDJS/package-lock.json)"
209209
210210
if can_use_cache; then
211211
echo "Restoring caches..."
@@ -230,8 +230,8 @@ blocks:
230230
[ "${SEMAPHORE_GIT_PR_SLUG}" = "${SEMAPHORE_GIT_REPO_SLUG}" ]
231231
}
232232
233-
GDJS_KEY="GDJS-node_modules-$SEMAPHORE_GIT_BRANCH-revision-$(checksum GDJS/package-lock.json)"
234-
GDJS_TESTS_KEY="GDJS-tests-node_modules-$SEMAPHORE_GIT_BRANCH-revision-$(checksum GDJS/tests/package-lock.json)"
233+
GDJS_KEY="GDJS-node_modules-v2-$SEMAPHORE_GIT_BRANCH-revision-$(checksum GDJS/package-lock.json)"
234+
GDJS_TESTS_KEY="GDJS-tests-node_modules-v2-$SEMAPHORE_GIT_BRANCH-revision-$(checksum GDJS/tests/package-lock.json)"
235235
236236
if can_use_cache; then
237237
echo "Restoring caches..."

0 commit comments

Comments
 (0)