Skip to content

Commit a7efd88

Browse files
paulmelnikowpaulmelnikow
authored
Revert to standard CI image and remove lingering references to fonts (badges#2326)
Follow-on to badges#2311.
1 parent 3ad742e commit a7efd88

File tree

9 files changed

+29
-85
lines changed

9 files changed

+29
-85
lines changed

‎.circleci/config.yml

Lines changed: 26 additions & 26 deletions
Original file line numberDiff line numberDiff line change
@@ -3,15 +3,15 @@ version: 2
33
jobs:
44
npm-install:
55
docker:
6-
- image: shieldsio/shields-ci-node-8:0.0.3
6+
- image: circleci/node:8
77
steps:
88
- checkout
99

1010
- restore_cache:
1111
keys:
12-
- v1-dependencies-{{ checksum "package.json" }}
12+
- v2-dependencies-{{ checksum "package.json" }}
1313
# fallback to using the latest cache if no exact match is found
14-
- v1-dependencies-
14+
- v2-dependencies-
1515

1616
- run:
1717
name: Install dependencies
@@ -20,19 +20,19 @@ jobs:
2020
- save_cache:
2121
paths:
2222
- node_modules
23-
key: v1-dependencies-{{ checksum "package.json" }}
23+
key: v2-dependencies-{{ checksum "package.json" }}
2424

2525
main:
2626
docker:
27-
- image: shieldsio/shields-ci-node-8:0.0.3
27+
- image: circleci/node:8
2828
- image: redis
2929
steps:
3030
- checkout
3131

3232
- restore_cache:
33-
key: v1-dependencies-{{ checksum "package.json" }}
33+
key: v2-dependencies-{{ checksum "package.json" }}
3434
# https://github.com/badges/shields/issues/1937
35-
key: v1-dependencies-
35+
key: v2-dependencies-
3636

3737
- run:
3838
name: Install dependencies
@@ -65,15 +65,15 @@ jobs:
6565

6666
main@node-latest:
6767
docker:
68-
- image: shieldsio/shields-ci-node-latest:0.0.3
68+
- image: circleci/node:latest
6969
- image: redis
7070
steps:
7171
- checkout
7272

7373
- restore_cache:
74-
key: v1-dependencies-{{ checksum "package.json" }}
74+
key: v2-dependencies-{{ checksum "package.json" }}
7575
# https://github.com/badges/shields/issues/1937
76-
key: v1-dependencies-
76+
key: v2-dependencies-
7777

7878
- run:
7979
name: Install dependencies
@@ -106,14 +106,14 @@ jobs:
106106

107107
danger:
108108
docker:
109-
- image: shieldsio/shields-ci-node-8:0.0.3
109+
- image: circleci/node:8
110110
steps:
111111
- checkout
112112

113113
- restore_cache:
114-
key: v1-dependencies-{{ checksum "package.json" }}
114+
key: v2-dependencies-{{ checksum "package.json" }}
115115
# https://github.com/badges/shields/issues/1937
116-
key: v1-dependencies-
116+
key: v2-dependencies-
117117

118118
- run:
119119
name: Install dependencies
@@ -126,14 +126,14 @@ jobs:
126126

127127
frontend:
128128
docker:
129-
- image: shieldsio/shields-ci-node-8:0.0.3
129+
- image: circleci/node:8
130130
steps:
131131
- checkout
132132

133133
- restore_cache:
134-
key: v1-dependencies-{{ checksum "package.json" }}
134+
key: v2-dependencies-{{ checksum "package.json" }}
135135
# https://github.com/badges/shields/issues/1937
136-
key: v1-dependencies-
136+
key: v2-dependencies-
137137

138138
- run:
139139
name: Install dependencies
@@ -149,9 +149,9 @@ jobs:
149149
when: always
150150
command: npm run build
151151

152-
services-pr:
152+
services:
153153
docker:
154-
- image: shieldsio/shields-ci-node-8:0.0.3
154+
- image: circleci/node:8
155155
steps:
156156
- checkout
157157

@@ -162,9 +162,9 @@ jobs:
162162
echo "{\"gh_token\":\"$GITHUB_TOKEN\"}" > private/secret.json
163163
164164
- restore_cache:
165-
key: v1-dependencies-{{ checksum "package.json" }}
165+
key: v2-dependencies-{{ checksum "package.json" }}
166166
# https://github.com/badges/shields/issues/1937
167-
key: v1-dependencies-
167+
key: v2-dependencies-
168168

169169
- run:
170170
name: Install dependencies
@@ -188,9 +188,9 @@ jobs:
188188
echo 'This is not a pull request. Skipping.'
189189
fi
190190
191-
services-pr@node-latest:
191+
services@node-latest:
192192
docker:
193-
- image: shieldsio/shields-ci-node-latest:0.0.3
193+
- image: circleci/node:latest
194194
steps:
195195
- checkout
196196

@@ -201,9 +201,9 @@ jobs:
201201
echo "{\"gh_token\":\"$GITHUB_TOKEN\"}" > private/secret.json
202202
203203
- restore_cache:
204-
key: v1-dependencies-{{ checksum "package.json" }}
204+
key: v2-dependencies-{{ checksum "package.json" }}
205205
# https://github.com/badges/shields/issues/1937
206-
key: v1-dependencies-
206+
key: v2-dependencies-
207207

208208
- run:
209209
name: Install dependencies
@@ -245,10 +245,10 @@ workflows:
245245
- frontend:
246246
requires:
247247
- npm-install
248-
- services-pr:
248+
- services:
249249
requires:
250250
- npm-install
251-
- services-pr@node-latest:
251+
- services@node-latest:
252252
requires:
253253
- npm-install
254254
- danger:

‎.circleci/images/README.md

Lines changed: 0 additions & 35 deletions
This file was deleted.

‎.circleci/images/node-8/Dockerfile

Lines changed: 0 additions & 4 deletions
This file was deleted.

‎.circleci/images/node-latest/Dockerfile

Lines changed: 0 additions & 4 deletions
This file was deleted.

‎.circleci/images/prepare-container.sh

Lines changed: 0 additions & 9 deletions
This file was deleted.

‎Dockerfile

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -1,6 +1,6 @@
11
FROM node:8.9.4-alpine
22

3-
RUN apk add --no-cache gettext imagemagick librsvg ttf-dejavu git
3+
RUN apk add --no-cache gettext imagemagick librsvg git
44

55
RUN mkdir -p /usr/src/app
66
RUN mkdir /usr/src/app/private

‎Makefile

Lines changed: 2 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -30,8 +30,7 @@ prepare-server-deploy: website
3030
git -C ${SERVER_TMP} commit --no-verify -m '[DEPLOY] Add frontend for debugging'
3131
mkdir -p ${SERVER_TMP}/private
3232
cp private/secret-production.json ${SERVER_TMP}/private/secret.json
33-
cp Verdana.ttf ${SERVER_TMP}
34-
git -C ${SERVER_TMP} add -f private/secret.json Verdana.ttf
33+
git -C ${SERVER_TMP} add -f private/secret.json
3534
git -C ${SERVER_TMP} commit --no-verify -m '[DEPLOY] MUST NOT BE ON GITHUB'
3635

3736
clean-server-deploy:
@@ -70,7 +69,7 @@ deploy-gh-pages-clean:
7069
git worktree prune
7170

7271
deploy-heroku:
73-
git add -f Verdana.ttf private/secret.json build/
72+
git add -f private/secret.json build/
7473
git commit --no-verify -m'MUST NOT BE ON GITHUB'
7574
git push -f heroku HEAD:master
7675
git reset HEAD~1

‎doc/self-hosting.md

Lines changed: 0 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -60,7 +60,6 @@ Once you have installed the [Heroku Toolbelt][]:
6060
heroku login
6161
heroku create your-app-name
6262
heroku config:set BUILDPACK_URL=https://github.com/mojodna/heroku-buildpack-multi.git#build-env
63-
cp /path/to/Verdana.ttf .
6463
make deploy
6564
heroku open
6665
```

‎package.json

Lines changed: 0 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -81,8 +81,6 @@
8181
"test:services:pr:run": "HANDLE_INTERNAL_ERRORS=false mocha --delay lib/service-test-runner/cli.js --stdin < pull-request-services.log",
8282
"test:services:pr": "npm run test:services:pr:prepare && npm run test:services:pr:run",
8383
"test": "npm run lint && npm run test:js:frontend && npm run test:js:package && npm run test:js:server",
84-
"circle-images:build": "docker build -t shieldsio/shields-ci-node-8:${IMAGE_TAG} -f .circleci/images/node-8/Dockerfile . && docker build -t shieldsio/shields-ci-node-latest:${IMAGE_TAG} -f .circleci/images/node-latest/Dockerfile .",
85-
"circle-images:push": "docker push shieldsio/shields-ci-node-8:${IMAGE_TAG} && docker push shieldsio/shields-ci-node-latest:${IMAGE_TAG}",
8684
"depcheck": "check-node-version --node \">= 8.0\"",
8785
"postinstall": "npm run depcheck",
8886
"prebuild": "npm run depcheck",

0 commit comments

Comments
 (0)