Skip to content

Commit 19f3100

Browse files
authored
Upgrade to Node v10 (#41)
* Fixing caches * boo * Dep upgrades Upgraded lambda runtime to node 10 Upgraded deps with vulnerabilities
1 parent 7a1d55b commit 19f3100

File tree

5 files changed

+337
-254
lines changed

5 files changed

+337
-254
lines changed

.circleci/config.yml

Lines changed: 11 additions & 9 deletions
Original file line numberDiff line numberDiff line change
@@ -1,16 +1,16 @@
11
version: 2
22
jobs:
3-
node8:
3+
node12:
44
working_directory: ~/ci
55
docker:
6-
- image: circleci/node:8
6+
- image: circleci/node:12
77
steps:
88
- checkout
99
- run:
1010
name: update-npm
1111
command: 'sudo npm install -g npm@latest'
12-
# - restore_cache:
13-
# key: dependency-cache-{{ checksum "package.json" }}
12+
# - restore_cache:
13+
# key: dependency-cache-{{ checksum "package.json" }}
1414
- run:
1515
name: install-npm-wee
1616
command: npm install
@@ -39,8 +39,8 @@ jobs:
3939
- run:
4040
name: update-npm
4141
command: 'sudo npm install -g npm@latest'
42-
# - restore_cache:
43-
# key: dependency-cache-{{ checksum "package.json" }}
42+
# - restore_cache:
43+
# key: dependency-cache-{{ checksum "package.json" }}
4444
- run:
4545
name: install-npm-wee
4646
command: npm install
@@ -78,18 +78,20 @@ jobs:
7878

7979
workflows:
8080
version: 2
81-
build_and_deploy:
81+
branch_logic:
8282
jobs:
83-
- node8:
83+
- node12:
8484
filters:
8585
branches:
86-
ignore: master
86+
ignore: master
8787

8888
- node10:
8989
filters:
9090
branches:
9191
ignore: master
9292

93+
master_logic:
94+
jobs:
9395
- deploy:
9496
filters:
9597
branches:

.circleci/deploy.sh

Lines changed: 6 additions & 6 deletions
Original file line numberDiff line numberDiff line change
@@ -17,21 +17,21 @@ VERSION=$( node -pe "require('./package.json').version")
1717
make build package || exit 100
1818

1919
aws serverlessrepo create-application-version \
20-
--application-id arn:aws:serverlessrepo:us-east-1:${ACCOUNT_ID}:applications/${APPLICATION} \
21-
--semantic-version ${VERSION} \
22-
--source-code-url https://github.com/uvasoftware/scanii-lambda/releases/tag/v${VERSION} \
20+
--application-id arn:aws:serverlessrepo:us-east-1:"${ACCOUNT_ID}":applications/${APPLICATION} \
21+
--semantic-version "${VERSION}" \
22+
--source-code-url https://github.com/uvasoftware/scanii-lambda/releases/tag/v"${VERSION}" \
2323
--template-body file://scanii-lambda.yaml >/dev/null || exit 99
2424

2525
echo "SAM application ${APPLICATION} version ${VERSION} published!"
2626

2727
# tag repo
2828
git config --global user.email "[email protected]"
2929
git config --global user.name "CircleCI"
30-
git tag -a v${VERSION} -m "Release by CircleCI v${VERSION}"
31-
git push origin v${VERSION}
30+
git tag -a v"${VERSION}" -m "Release by CircleCI v${VERSION}"
31+
git push origin v"${VERSION}"
3232

3333
# bumping version
34-
npm --no-git-tag-version version patch
34+
npm --no-git-tag-version version minor
3535
VERSION=$( node -pe "require('./package.json').version")
3636
echo "next version is: $VERSION"
3737

0 commit comments

Comments
 (0)