Skip to content
Permalink

Comparing changes

This is a direct comparison between two commits made in this repository or its related repositories. View the default comparison for this range or learn more about diff comparisons.

Open a pull request

Create a new pull request by comparing changes across two branches. If you need to, you can also . Learn more about diff comparisons here.
base repository: SocialGouv/www
Failed to load repositories. Confirm that selected base ref is valid, then try again.
Loading
base: 010f3ac89c33853bb06e23d9a7c8c424944d703d
Choose a base ref
..
head repository: SocialGouv/www
Failed to load repositories. Confirm that selected head ref is valid, then try again.
Loading
compare: 6fed28d4c0f864e67279f417d4418fd95ef039dd
Choose a head ref
Showing with 1,490 additions and 995 deletions.
  1. +1 −0 .dockerignore
  2. +23 −0 .github/workflows/deactivate.yaml
  3. +0 −15 .github/workflows/deactivate.yml
  4. +22 −0 .github/workflows/debug-kube.yaml
  5. +2 −0 .github/workflows/github-stats.yml
  6. +19 −0 .github/workflows/preproduction.yaml
  7. +0 −41 .github/workflows/preproduction.yml
  8. +16 −0 .github/workflows/production.yaml
  9. +0 −40 .github/workflows/production.yml
  10. +6 −17 .github/workflows/release.yml
  11. +16 −0 .github/workflows/review-auto.yaml
  12. +19 −0 .github/workflows/review.yaml
  13. +0 −37 .github/workflows/review.yml
  14. +10 −0 .kontinuous/config.yaml
  15. +10 −0 .kontinuous/env/preprod/values.yaml
  16. +9 −0 {.kube-workflow → .kontinuous/env}/prod/values.yaml
  17. +12 −1 {.kube-workflow → .kontinuous}/values.yaml
  18. +434 −0 CHANGELOG.md
  19. +1 −1 Dockerfile
  20. +1 −0 README.md
  21. +1 −1 package.json
  22. +15 −4 pages/index.js
  23. +1 −1 pages/mentions-legales.js
  24. +0 −51 pages/startups/1000jours.mdx
  25. +5 −5 pages/startups/archifiltre.mdx
  26. +53 −0 pages/startups/bpco.mdx
  27. +6 −28 pages/startups/carnet.de.bord.mdx
  28. +22 −66 pages/startups/dora.mdx
  29. +57 −0 pages/startups/nata.mdx
  30. +14 −7 pages/startups/tumeplay.mdx
  31. +7 −3 pages/startups/work-in-france.mdx
  32. +4 −4 public/github-stats.json
  33. BIN public/images/startups/bpco.png
  34. BIN public/images/startups/nata.jpg
  35. +1 −1 scripts/beta-sync.js
  36. +1 −1 src/composants/Footer.js
  37. +1 −1 src/composants/Layout.js
  38. +1 −1 src/composants/LayoutArticle.js
  39. +13 −8 src/composants/SectionCards.js
  40. +1 −0 src/composants/TimelineEvent.js
  41. +0 −2 src/custom.css
  42. +4 −1 src/data/members.yml
  43. +12 −0 src/data/news.yml
  44. +17 −1 src/data/startups.yml
  45. +653 −657 yarn.lock
1 change: 1 addition & 0 deletions .dockerignore
Original file line number Diff line number Diff line change
@@ -3,3 +3,4 @@
*.md
**/node_modules
.next
.kontinuous
23 changes: 23 additions & 0 deletions .github/workflows/deactivate.yaml
Original file line number Diff line number Diff line change
@@ -0,0 +1,23 @@
name: ♻️ Deactivate
on:
pull_request:
types: [closed]
delete:
branches:
- "**"
- "!v*"
- "!master"
- "!main"
- "!dev"
- "!develop"
- "!**/persist"
- "!persist/**"
- "!**/persist/**"
- "!persist-**"
- "!**-persist"
- "!**-persist-**"

jobs:
socialgouv:
uses: socialgouv/workflows/.github/workflows/use-ks-gh-deactivate.yaml@v1
secrets: inherit
15 changes: 0 additions & 15 deletions .github/workflows/deactivate.yml

This file was deleted.

22 changes: 22 additions & 0 deletions .github/workflows/debug-kube.yaml
Original file line number Diff line number Diff line change
@@ -0,0 +1,22 @@
name: Debug kube

on:
workflow_dispatch:
push:
branches:
- "feat/**"
- "fix/**"


jobs:
dump:
name: Debug kube
runs-on: ubuntu-latest
steps:
- uses: azure/setup-kubectl@v3
- name: extract kubeconfig
run: |
echo -n "${{secrets.KUBECONFIG}}" | base64 --decode > kubeconfig
- name: list kube data
run: |
KUBECONFIG=./kubeconfig kubectl config get-contexts
2 changes: 2 additions & 0 deletions .github/workflows/github-stats.yml
Original file line number Diff line number Diff line change
@@ -1,6 +1,7 @@
name: Github Stats

on:
workflow_dispatch:
schedule:
- cron: "42 23 * * 1"

@@ -42,3 +43,4 @@ jobs:
uses: stefanzweifel/git-auto-commit-action@v4
with:
commit_message: "fix: Update Github stats."
commit_author: "GitHub bot <actions@github.com>"
19 changes: 19 additions & 0 deletions .github/workflows/preproduction.yaml
Original file line number Diff line number Diff line change
@@ -0,0 +1,19 @@
name: 😎 PreProd
on:
workflow_dispatch:
push:
branches:
- "master"
- "main"
tags-ignore:
- v*

concurrency:
cancel-in-progress: true
group: ${{ github.workflow }}-${{ github.event_name }}-${{ github.event.ref }}

jobs:
socialgouv:
name: "🇫🇷 SocialGouv"
uses: socialgouv/workflows/.github/workflows/use-ks-gh-preproduction.yaml@v1
secrets: inherit
41 changes: 0 additions & 41 deletions .github/workflows/preproduction.yml

This file was deleted.

16 changes: 16 additions & 0 deletions .github/workflows/production.yaml
Original file line number Diff line number Diff line change
@@ -0,0 +1,16 @@
name: 🚀 Production
on:
workflow_dispatch:
push:
tags:
- v*

concurrency:
cancel-in-progress: true
group: ${{ github.workflow }}-${{ github.event_name }}-${{ github.event.ref }}

jobs:
socialgouv:
name: "🇫🇷 SocialGouv"
uses: socialgouv/workflows/.github/workflows/use-ks-gh-production.yaml@v1
secrets: inherit
40 changes: 0 additions & 40 deletions .github/workflows/production.yml

This file was deleted.

23 changes: 6 additions & 17 deletions .github/workflows/release.yml
Original file line number Diff line number Diff line change
@@ -3,26 +3,15 @@ name: Release
on:
workflow_dispatch:
push:
branches: [master, alpha, beta, next]
branches: [master, main, alpha, beta, next]

jobs:
release:
name: Release
runs-on: ubuntu-latest
steps:

- name: Checkout repository
uses: actions/checkout@v2
with:
fetch-depth: 0
persist-credentials: false

- name: Semantic Release
uses: cycjimmy/semantic-release-action@v2
with:
semantic_version: 17
extra_plugins: |
@semantic-release/changelog@5.0.1
@semantic-release/git@9.0.0
env:
GITHUB_TOKEN: ${{ secrets.SOCIALGROOVYBOT_BOTO_PAT }}
- uses: socialgouv/workflows/actions/semantic-release@v1
with:
github-token: ${{ secrets.SOCIALGROOVYBOT_BOTO_PAT }}
author-name: ${{ secrets.SOCIALGROOVYBOT_NAME }}
author-email: ${{ secrets.SOCIALGROOVYBOT_EMAIL }}
16 changes: 16 additions & 0 deletions .github/workflows/review-auto.yaml
Original file line number Diff line number Diff line change
@@ -0,0 +1,16 @@
name: 👓 Review Auto
on:
push:
branches:
- "feat/**"
- "fix/**"

concurrency:
cancel-in-progress: true
group: ${{ github.workflow }}-${{ github.event_name }}-${{ github.event.ref }}

jobs:
socialgouv:
name: "🇫🇷 SocialGouv"
uses: socialgouv/workflows/.github/workflows/use-ks-gh-review-auto.yaml@v1
secrets: inherit
19 changes: 19 additions & 0 deletions .github/workflows/review.yaml
Original file line number Diff line number Diff line change
@@ -0,0 +1,19 @@
name: 👀 Review
on:
push:
branches:
- "**"
- "!master"
- "!main"
- "!feat/**"
- "!fix/**"

concurrency:
cancel-in-progress: true
group: ${{ github.workflow }}-${{ github.event_name }}-${{ github.event.ref }}

jobs:
socialgouv:
name: "🇫🇷 SocialGouv"
uses: socialgouv/workflows/.github/workflows/use-ks-gh-review.yaml@v1
secrets: inherit
37 changes: 0 additions & 37 deletions .github/workflows/review.yml

This file was deleted.

10 changes: 10 additions & 0 deletions .kontinuous/config.yaml
Original file line number Diff line number Diff line change
@@ -0,0 +1,10 @@
projectName: fabrique
ciNamespace: ci-fabrique

dependencies:
fabrique:
extends:
- name: ovh
ifEnv: [dev,preprod]
- name: buildkit-service
ifEnv: [dev,preprod]
10 changes: 10 additions & 0 deletions .kontinuous/env/preprod/values.yaml
Original file line number Diff line number Diff line change
@@ -0,0 +1,10 @@
app:
autoscale:
enabled: true
resources:
requests:
cpu: 10m
memory: 32M
limits:
cpu: 20m
memory: 64M
Original file line number Diff line number Diff line change
@@ -5,3 +5,12 @@ app:
- www.incubateur.social.gouv.fr
- incubateur.social.gouv.fr
- fabrique.social.gouv.fr
autoscale:
enabled: true
resources:
requests:
cpu: 10m
memory: 32M
limits:
cpu: 40m
memory: 128M
13 changes: 12 additions & 1 deletion .kube-workflow/values.yaml → .kontinuous/values.yaml
Original file line number Diff line number Diff line change
@@ -1,10 +1,21 @@
app:
enabled: true
~chart: app # implicit
~needs: [build-app]
containerPort: 8080
imagePackage: app # implicit
ingress:
annotations:
nginx.ingress.kubernetes.io/configuration-snippet: |
more_set_headers "Content-Security-Policy: default-src 'none'; connect-src 'self' https://*.gouv.fr; font-src 'self'; img-src 'self'; prefetch-src 'self' https://*.gouv.fr; script-src 'self' https://*.gouv.fr; frame-src 'self' https://*.gouv.fr; style-src 'self' 'unsafe-inline'";
more_set_headers "X-Frame-Options: deny";
more_set_headers "X-XSS-Protection: 1; mode=block";
more_set_headers "X-Content-Type-Options: nosniff";
jobs:
runs:
build-app:
use: build
with:
imagePackage: app
buildArgs:
COMMIT_SHA: "{{ $.Values.global.sha }}"
Loading