Skip to content

Commit

Permalink
Merge branch 'master' into beta
Browse files Browse the repository at this point in the history
  • Loading branch information
douglasduteil authored Jun 24, 2020
2 parents 8f88862 + e49ba39 commit 973bb74
Show file tree
Hide file tree
Showing 4 changed files with 204 additions and 294 deletions.
4 changes: 2 additions & 2 deletions .gitlab-ci.yml
Original file line number Diff line number Diff line change
Expand Up @@ -4,8 +4,8 @@ include:
ref: v17.0.0-beta.29

variables:
# AUTO_DEVOPS_RELEASE_AUTO: "true"
# AUTO_DEVOPS_PRODUCTION_AUTO: "/^v[1-9]+\\.[0-9]+\\.[0-9]+$/"
AUTO_DEVOPS_RELEASE_AUTO: "🔖"
AUTO_DEVOPS_PRODUCTION_AUTO: "🚀"

# NOTE(douglasduteil): use custom build job
# The website it statically built with Nextjs
Expand Down
2 changes: 1 addition & 1 deletion Dockerfile
Original file line number Diff line number Diff line change
@@ -1,3 +1,3 @@
FROM registry.gitlab.factory.social.gouv.fr/socialgouv/docker/nginx4spa:1.34.0
FROM registry.gitlab.factory.social.gouv.fr/socialgouv/docker/nginx4spa:1.37.1

COPY ./out /usr/share/nginx/html
14 changes: 7 additions & 7 deletions package.json
Original file line number Diff line number Diff line change
Expand Up @@ -22,21 +22,21 @@
"k8s": "yarn --silent --cwd .k8s"
},
"devDependencies": {
"@mdx-js/loader": "^1.6.5",
"@mdx-js/mdx": "^1.6.5",
"@mdx-js/loader": "^1.6.6",
"@mdx-js/mdx": "^1.6.6",
"@mdx-js/tag": "^0.20.3",
"@socialgouv/eslint-config-react": "^0.25.0",
"@socialgouv/eslint-config-recommended": "^0.25.0",
"@socialgouv/eslint-config-react": "^0.35.0",
"@socialgouv/eslint-config-recommended": "^0.35.0",
"@zeit/next-css": "^1.0.1",
"@zeit/next-mdx": "^1.2.0",
"eslint": "^7.2.0",
"eslint": "^7.3.1",
"js-yaml-loader": "^1.2.2",
"next": "^9.4.4",
"next-images": "^1.3.1",
"node-fetch": "^2.6.0",
"prettier": "^1.19.1",
"raw-loader": "^4.0.1",
"remark-autolink-headings": "^5.2.2"
"remark-autolink-headings": "^6.0.1"
},
"dependencies": {
"github-base": "^1.0.0",
Expand All @@ -51,7 +51,7 @@
"react-tooltip": "^3.11.6",
"react-typeform-embed-2": "0.2.1",
"react-vertical-timeline-component": "^3.0.2",
"remark-highlight.js": "^5.2.0",
"remark-highlight.js": "^6.0.0",
"styled-components": "^5.1.1",
"template.data.gouv.fr": "^1.1.8",
"trim-right": "^1.0.1"
Expand Down
Loading

0 comments on commit 973bb74

Please sign in to comment.