diff --git a/.gitlab-ci.yml b/.gitlab-ci.yml index a533daaf2ac796212a6d7e585eae5b85d493dadd..e1aeda2b9a773407f64d95e0e9757ed461f9c54f 100644 --- a/.gitlab-ci.yml +++ b/.gitlab-ci.yml @@ -5,6 +5,10 @@ stages: - deploy include: + - .gitlab/ci/sentry.yml + - local: .gitlab/ci/deploy.yml + rules: + - if: $CI_PIPELINE_SOURCE != "merge_request_event" && $CI_COMMIT_BRANCH == $CI_DEFAULT_BRANCH - component: sc07.dev/sc07/ci/wiki@main inputs: wiki_token: $CI_TOKEN @@ -65,11 +69,3 @@ jest server: coverage_report: coverage_format: cobertura path: packages/server/coverage/cobertura-coverage.xml - -deploy: - stage: deploy - trigger: - include: .gitlab/ci/deploy.yml - allow_failure: true - rules: - - if: $CI_PIPELINE_SOURCE != "merge_request_event" && $CI_COMMIT_BRANCH == $CI_DEFAULT_BRANCH diff --git a/.gitlab/ci/deploy.yml b/.gitlab/ci/deploy.yml index 9426685d345b2abbfe0686d7f173ddcdc240cc0c..aefa0c9df43fe36b0dc1431d93bd29f1f8bbd971 100644 --- a/.gitlab/ci/deploy.yml +++ b/.gitlab/ci/deploy.yml @@ -2,7 +2,7 @@ variables: REGISTRY: registry.sc07.dev IMAGE_NAME: sc07/canvas:edge -publish: +build: stage: build tags: - red diff --git a/.gitlab/ci/sentry.yml b/.gitlab/ci/sentry.yml new file mode 100644 index 0000000000000000000000000000000000000000..2a6b42740786a67da3d519883ae092862540b372 --- /dev/null +++ b/.gitlab/ci/sentry.yml @@ -0,0 +1,9 @@ +sentry server deploy: + stage: deploy + interruptible: true + before_script: + - docker run --name temp -d registry.sc07.dev/sc07/canvas + - docker exec temp rm -rf /home/node/app/node_modules + - docker cp temp:/home/node/app ./app_built + script: + - npm run sentry diff --git a/.vscode/settings.json b/.vscode/settings.json index 053ea0483c28ee491aaf0b20b7adf6581322febb..ffc3410a94f25871903901de0a4d8169d26bd9b2 100644 --- a/.vscode/settings.json +++ b/.vscode/settings.json @@ -10,5 +10,8 @@ "type": "on-demand", "coverage": true, "runAllTestsOnStartup": false + }, + "yaml.schemas": { + "https://gitlab.com/gitlab-org/gitlab/-/raw/master/app/assets/javascripts/editor/schema/ci.json": "/.gitlab/ci/*.yml" } }