Skip to content

Commit

Permalink
Refactor expertise form
Browse files Browse the repository at this point in the history
  • Loading branch information
nutfdt committed Jun 20, 2024
1 parent 8a93e04 commit 16e4f8d
Show file tree
Hide file tree
Showing 258 changed files with 13,427 additions and 10,468 deletions.
2 changes: 1 addition & 1 deletion .github/workflows/build-filebeat-rootless.yml
Original file line number Diff line number Diff line change
Expand Up @@ -22,4 +22,4 @@ jobs:
with:
file: ./infra/filebeat.Dockerfile
push: true
tags: ghcr.io/datalab-mi/basegun/filebeat-rootless:6.5.4
tags: ghcr.io/dnum-mi/basegun/filebeat-rootless:6.5.4
98 changes: 0 additions & 98 deletions .github/workflows/deploy.yml

This file was deleted.

18 changes: 0 additions & 18 deletions .github/workflows/dso-automatic-sync.yml

This file was deleted.

31 changes: 18 additions & 13 deletions .github/workflows/pr.yml
Original file line number Diff line number Diff line change
Expand Up @@ -34,8 +34,7 @@ jobs:
with:
context: ./backend
push: true
tags: ghcr.io/datalab-mi/basegun/basegun-backend:${{ github.head_ref }}
target: dev
tags: ghcr.io/dnum-mi/basegun/basegun-backend:${{ github.head_ref }}

build-frontend:
name: Build Frontend
Expand All @@ -54,30 +53,36 @@ jobs:
with:
context: ./frontend
push: true
tags: ghcr.io/datalab-mi/basegun/basegun-frontend:${{ github.head_ref }}
target: prod
tags: ghcr.io/dnum-mi/basegun/basegun-frontend:${{ github.head_ref }}

test-backend:
name: Test Backend
needs: build-backend
runs-on: ubuntu-latest
container:
image: ghcr.io/datalab-mi/basegun/basegun-backend:${{ github.head_ref }}
image: ghcr.io/dnum-mi/basegun/basegun-backend:${{ github.head_ref }}
env:
WORKSPACE: dev
AWS_REGION: gra
AWS_DEFAULT_REGION: gra
AWS_ACCESS_KEY_ID: ${{ secrets.AWS_ACCESS_KEY_ID }}
AWS_SECRET_ACCESS_KEY: ${{ secrets.AWS_SECRET_ACCESS_KEY }}
S3_URL_ENDPOINT: https://s3.gra.io.cloud.ovh.net/
S3_BUCKET_NAME: basegun-s3
steps:
- run: cd /app && python -m unittest
- run: cd /app && pytest

test-frontend-format:
name: Test Frontend Formatting
runs-on: ubuntu-latest
steps:
- uses: actions/checkout@v4
- name: Run Prettier check
working-directory: frontend
run: |
npm ci
npm run format-check
test-e2e:
name: Run E2E tests
needs: [build-backend, build-frontend]
uses: ./.github/workflows/test-on-kube.yml
secrets:
API_OVH_TOKEN: ${{ secrets.API_OVH_TOKEN }}
AWS_ACCESS_KEY_ID: ${{ secrets.AWS_ACCESS_KEY_ID }}
AWS_SECRET_ACCESS_KEY: ${{ secrets.AWS_SECRET_ACCESS_KEY }}
X_OVH_TOKEN: ${{ secrets.PREPROD_OVH_TOKEN }}
uses: ./.github/workflows/test-e2e.yml
4 changes: 2 additions & 2 deletions .github/workflows/preprod.yml
Original file line number Diff line number Diff line change
Expand Up @@ -28,15 +28,15 @@ jobs:
uses: vlaurin/action-ghcr-prune@main
with:
token: ${{ secrets.PERSO_ACCESS_TOKEN }}
organization: datalab-mi
organization: dnum-mi
container: basegun/basegun-backend
dry-run: false
prune-untagged: true
- name: Delete untagged images
uses: vlaurin/action-ghcr-prune@main
with:
token: ${{ secrets.PERSO_ACCESS_TOKEN }}
organization: datalab-mi
organization: dnum-mi
container: basegun/basegun-frontend
dry-run: false
prune-untagged: true
Expand Down
4 changes: 2 additions & 2 deletions .github/workflows/prod.yml
Original file line number Diff line number Diff line change
Expand Up @@ -47,15 +47,15 @@ jobs:
uses: vlaurin/action-ghcr-prune@main
with:
token: ${{ secrets.PERSO_ACCESS_TOKEN }}
organization: datalab-mi
organization: dnum-mi
container: basegun/basegun-backend
dry-run: false
untagged: true
- name: Delete untagged images
uses: vlaurin/action-ghcr-prune@main
with:
token: ${{ secrets.PERSO_ACCESS_TOKEN }}
organization: datalab-mi
organization: dnum-mi
container: basegun/basegun-frontend
dry-run: false
untagged: true
Expand Down
27 changes: 27 additions & 0 deletions .github/workflows/test-e2e.yml
Original file line number Diff line number Diff line change
@@ -0,0 +1,27 @@
name: Test E2E

on:
workflow_call:

jobs:
test-e2e:
runs-on: ubuntu-latest
steps:
- uses: actions/checkout@v3

- name: Start stack using docker compose
run: docker compose up -d

- name: Cypress run
uses: cypress-io/github-action@v6
with:
working-directory: ./frontend
command: npm run test:e2e-ci

- name: Send artifacts
uses: actions/upload-artifact@v3
if: ${{ failure() }}
with:
name: cypress-screenshots
path: |
./frontend/cypress/screenshots/
95 changes: 0 additions & 95 deletions .github/workflows/test-on-kube.yml

This file was deleted.

6 changes: 3 additions & 3 deletions .gitlab-ci-dso.yml
Original file line number Diff line number Diff line change
Expand Up @@ -3,7 +3,7 @@ include:
file: vault-ci.yml
ref: main
- project: $CATALOG_PATH
file: kaniko-ci.yml
file: kaniko-ci-mirror.yml
ref: main

default:
Expand All @@ -30,7 +30,7 @@ docker-build-frontend:
BUILD_ARGS: --build-arg=VERSION=1.1.1
stage: docker-build
extends:
- .kaniko:build-push
- .kaniko-mirror:build-push

docker-build-backend:
variables:
Expand All @@ -40,4 +40,4 @@ docker-build-backend:
BUILD_ARGS: --build-arg=VERSION=1.1.1
stage: docker-build
extends:
- .kaniko:build-push
- .kaniko-mirror:build-push
4 changes: 2 additions & 2 deletions .pre-commit-config.yaml
Original file line number Diff line number Diff line change
Expand Up @@ -12,8 +12,8 @@ repos:
args: ["--profile", "black"]
- repo: local
hooks:
- id: eslint
name: eslint
- id: prettier
name: prettier
entry: bash -c 'cd ./frontend && npm run format'
language: system
files: ^frontend/
1 change: 1 addition & 0 deletions CODEOWNERS
Validating CODEOWNERS rules …
Original file line number Diff line number Diff line change
@@ -0,0 +1 @@
* @thomashbrnrd @nutfdt
Loading

0 comments on commit 16e4f8d

Please sign in to comment.