Skip to content
This repository has been archived by the owner on Nov 4, 2024. It is now read-only.

Commit

Permalink
Merge pull request #329 from tophat/infra_fix_325
Browse files Browse the repository at this point in the history
refactor: update dependencies, better caching
  • Loading branch information
noahnu authored Aug 19, 2022
2 parents ffc6895 + 9fd200d commit beb97fa
Show file tree
Hide file tree
Showing 10 changed files with 1,237 additions and 1,222 deletions.
1 change: 1 addition & 0 deletions .github/workflows/ci.yml
Original file line number Diff line number Diff line change
Expand Up @@ -10,6 +10,7 @@ on:
env:
CI: 1
PUPPETEER_SKIP_CHROMIUM_DOWNLOAD: true
DOCKER_BUILDKIT: 1

jobs:
linting:
Expand Down
786 changes: 0 additions & 786 deletions .yarn/releases/yarn-3.2.1.cjs

This file was deleted.

783 changes: 783 additions & 0 deletions .yarn/releases/yarn-3.2.2.cjs

Large diffs are not rendered by default.

2 changes: 1 addition & 1 deletion .yarnrc.yml
Original file line number Diff line number Diff line change
Expand Up @@ -14,4 +14,4 @@ plugins:

pnpEnableEsmLoader: false

yarnPath: .yarn/releases/yarn-3.2.1.cjs
yarnPath: .yarn/releases/yarn-3.2.2.cjs
22 changes: 11 additions & 11 deletions package.json
Original file line number Diff line number Diff line change
Expand Up @@ -33,30 +33,30 @@
},
"homepage": "https://sanity-runner.js.org",
"devDependencies": {
"@monodeploy/plugin-github": "^0.5.0",
"@monodeploy/plugin-github": "^0.6.1",
"@tophat/conventional-changelog-config": "^0.6.2",
"@tophat/eslint-config": "^3.2.0",
"@tophat/eslint-config": "^3.3.0",
"@tophat/eslint-import-resolver-require": "^0.1.3",
"@typescript-eslint/eslint-plugin": "^5.30.4",
"@typescript-eslint/parser": "^5.30.4",
"@typescript-eslint/eslint-plugin": "^5.33.1",
"@typescript-eslint/parser": "^5.33.1",
"all-contributors-cli": "^6.20.0",
"esbuild": "^0.14.48",
"eslint": "^8.19.0",
"esbuild": "^0.15.5",
"eslint": "^8.22.0",
"eslint-config-prettier": "^8.5.0",
"eslint-import-resolver-node": "^0.3.6",
"eslint-import-resolver-typescript": "^3.2.0",
"eslint-import-resolver-typescript": "^3.4.2",
"eslint-plugin-import": "^2.26.0",
"eslint-plugin-jest": "^26.5.3",
"eslint-plugin-jsx-a11y": "^6.6.0",
"eslint-plugin-jest": "^26.8.3",
"eslint-plugin-jsx-a11y": "^6.6.1",
"eslint-plugin-prettier": "^4.2.1",
"eslint-plugin-react": "^7.30.1",
"eslint-plugin-react-hooks": "^4.6.0",
"glob": "^7.2.0",
"monodeploy": "^3.1.0",
"monodeploy": "^3.3.0",
"prettier": "^2.7.1",
"ts-node": "^10.9.1",
"typescript": "4.7.4"
},
"private": true,
"packageManager": "yarn@3.2.1"
"packageManager": "yarn@3.2.2"
}
2 changes: 1 addition & 1 deletion packages/client/client.Dockerfile
Original file line number Diff line number Diff line change
@@ -1,4 +1,4 @@
FROM node:16.15-slim
FROM node:16.17-slim

RUN apt-get update && \
apt-get install -yq jq git unzip && \
Expand Down
2 changes: 1 addition & 1 deletion packages/client/package.json
Original file line number Diff line number Diff line change
Expand Up @@ -31,7 +31,7 @@
"build": "run -T tsc -p .",
"prepack": "run clean && run build",
"docker:pre": "mkdir -p artifacts && yarn pack -o artifacts/%s.tgz",
"docker:build": "run docker:pre && docker build . -f client.Dockerfile -t ghcr.io/tophat/sanity-runner-client",
"docker:build": "run docker:pre && docker build --build-arg BUILDKIT_INLINE_CACHE=1 --cache-from ghcr.io/tophat/sanity-runner-client . -f client.Dockerfile -t ghcr.io/tophat/sanity-runner-client",
"docker:tag": "docker tag ghcr.io/tophat/sanity-runner-client:latest ghcr.io/tophat/sanity-runner-client:$(cat package.json | jq -r '.version')",
"docker:tag:prerelease": "docker tag ghcr.io/tophat/sanity-runner-client:latest ghcr.io/tophat/sanity-runner-client:next",
"docker:push": "docker push ghcr.io/tophat/sanity-runner-client:$(cat package.json | jq -r '.version')",
Expand Down
2 changes: 1 addition & 1 deletion packages/service/package.json
Original file line number Diff line number Diff line change
Expand Up @@ -23,7 +23,7 @@
"build:lib": "run -T tsc -p .",
"prepack": "run clean && run build:bundle && run build:lib",
"docker:pre": "mkdir -p artifacts && yarn pack -o artifacts/%s.tgz",
"docker:build": "run docker:pre && docker build . -f service.Dockerfile --target base -t ghcr.io/tophat/sanity-runner-service:latest && docker build . -f service.Dockerfile --target datadog -t ghcr.io/tophat/sanity-runner-service:latest-datadog",
"docker:build": "run docker:pre && docker build --build-arg BUILDKIT_INLINE_CACHE=1 --cache-from ghcr.io/tophat/sanity-runner-service . -f service.Dockerfile --target base -t ghcr.io/tophat/sanity-runner-service:latest && docker build --build-arg BUILDKIT_INLINE_CACHE=1 --cache-from ghcr.io/tophat/sanity-runner-service . -f service.Dockerfile --target datadog -t ghcr.io/tophat/sanity-runner-service:latest-datadog",
"docker:prod": "run docker:build && docker run -p 9000:8080 ghcr.io/tophat/sanity-runner-service:latest",
"docker:datadog:prod": "run docker:build && docker run -p 9000:8080 --env DD_LOG_LEVEL=debug --env DD_FORWARD_LOG=False --env DD_FLUSH_TO_LOG=True ghcr.io/tophat/sanity-runner-service:latest-datadog",
"docker:tag": "run docker:base:tag && run docker:datadog:tag",
Expand Down
2 changes: 1 addition & 1 deletion packages/types/package.json
Original file line number Diff line number Diff line change
Expand Up @@ -34,7 +34,7 @@
},
"devDependencies": {
"@types/node": "^16.11.36",
"esbuild": "^0.14.48",
"esbuild": "^0.15.5",
"typescript": "4.7.4"
}
}
Loading

0 comments on commit beb97fa

Please sign in to comment.