From 48a6e2428696ed2e0c15dd7702518db50fe37a84 Mon Sep 17 00:00:00 2001 From: Grant Date: Thu, 5 Jun 2025 19:41:27 -0600 Subject: [PATCH 1/8] sentry deploy --- .gitlab-ci.yml | 1 + .gitlab/ci/deploy.yml | 2 +- .gitlab/ci/sentry.yml | 8 ++++++++ 3 files changed, 10 insertions(+), 1 deletion(-) create mode 100644 .gitlab/ci/sentry.yml diff --git a/.gitlab-ci.yml b/.gitlab-ci.yml index a533daa..084a6ba 100644 --- a/.gitlab-ci.yml +++ b/.gitlab-ci.yml @@ -5,6 +5,7 @@ stages: - deploy include: + - .gitlab/ci/sentry.yml - component: sc07.dev/sc07/ci/wiki@main inputs: wiki_token: $CI_TOKEN diff --git a/.gitlab/ci/deploy.yml b/.gitlab/ci/deploy.yml index 9426685..aefa0c9 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 0000000..8d1611b --- /dev/null +++ b/.gitlab/ci/sentry.yml @@ -0,0 +1,8 @@ +sentry server deploy: + stage: deploy + interruptible: true + before_script: + - cd packages/server + - npm run build + script: + - npm -w packages/server run sentry -- GitLab From 578b7ef15838aca4f6ea2ff0b47ec44275e43f39 Mon Sep 17 00:00:00 2001 From: Grant Date: Thu, 5 Jun 2025 19:43:28 -0600 Subject: [PATCH 2/8] set build image --- .gitlab/ci/sentry.yml | 4 ++++ 1 file changed, 4 insertions(+) diff --git a/.gitlab/ci/sentry.yml b/.gitlab/ci/sentry.yml index 8d1611b..6264ccb 100644 --- a/.gitlab/ci/sentry.yml +++ b/.gitlab/ci/sentry.yml @@ -1,6 +1,10 @@ +variables: + BUILD_IMAGE: node:23-alpine + sentry server deploy: stage: deploy interruptible: true + image: $BUILD_IMAGE before_script: - cd packages/server - npm run build -- GitLab From f55dca8540ba6e48b23fdd13555ac1144f51100b Mon Sep 17 00:00:00 2001 From: Grant Date: Thu, 5 Jun 2025 19:44:09 -0600 Subject: [PATCH 3/8] npm i --- .gitlab/ci/sentry.yml | 1 + 1 file changed, 1 insertion(+) diff --git a/.gitlab/ci/sentry.yml b/.gitlab/ci/sentry.yml index 6264ccb..20b9450 100644 --- a/.gitlab/ci/sentry.yml +++ b/.gitlab/ci/sentry.yml @@ -7,6 +7,7 @@ sentry server deploy: image: $BUILD_IMAGE before_script: - cd packages/server + - npm i --include=dev - npm run build script: - npm -w packages/server run sentry -- GitLab From 248295990a3460883c5d4cc96cb175d3cef4d9ac Mon Sep 17 00:00:00 2001 From: Grant Date: Thu, 5 Jun 2025 19:45:36 -0600 Subject: [PATCH 4/8] prisma generate --- .gitlab/ci/sentry.yml | 1 + 1 file changed, 1 insertion(+) diff --git a/.gitlab/ci/sentry.yml b/.gitlab/ci/sentry.yml index 20b9450..f82c24f 100644 --- a/.gitlab/ci/sentry.yml +++ b/.gitlab/ci/sentry.yml @@ -8,6 +8,7 @@ sentry server deploy: before_script: - cd packages/server - npm i --include=dev + - npx -w packages/server prisma generate - npm run build script: - npm -w packages/server run sentry -- GitLab From 6bce9beccd0266bc39759e4010a12fa56cbfab7a Mon Sep 17 00:00:00 2001 From: Grant Date: Thu, 5 Jun 2025 20:00:52 -0600 Subject: [PATCH 5/8] remove -w --- .gitlab/ci/sentry.yml | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/.gitlab/ci/sentry.yml b/.gitlab/ci/sentry.yml index f82c24f..4a66b17 100644 --- a/.gitlab/ci/sentry.yml +++ b/.gitlab/ci/sentry.yml @@ -8,7 +8,7 @@ sentry server deploy: before_script: - cd packages/server - npm i --include=dev - - npx -w packages/server prisma generate + - npx prisma generate - npm run build script: - npm -w packages/server run sentry -- GitLab From c4c33a5c92dbd9597ab3ea80b69cb6acef9bd518 Mon Sep 17 00:00:00 2001 From: Grant Date: Thu, 5 Jun 2025 20:02:22 -0600 Subject: [PATCH 6/8] remove -w --- .gitlab/ci/sentry.yml | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/.gitlab/ci/sentry.yml b/.gitlab/ci/sentry.yml index 4a66b17..1514729 100644 --- a/.gitlab/ci/sentry.yml +++ b/.gitlab/ci/sentry.yml @@ -11,4 +11,4 @@ sentry server deploy: - npx prisma generate - npm run build script: - - npm -w packages/server run sentry + - npm run sentry -- GitLab From 7f8ac15e8f9e309c6ff1b614ec0a5ffb1674a1e4 Mon Sep 17 00:00:00 2001 From: Grant Date: Thu, 5 Jun 2025 20:05:30 -0600 Subject: [PATCH 7/8] install sentry cli --- .gitlab/ci/sentry.yml | 1 + 1 file changed, 1 insertion(+) diff --git a/.gitlab/ci/sentry.yml b/.gitlab/ci/sentry.yml index 1514729..7e8cdf5 100644 --- a/.gitlab/ci/sentry.yml +++ b/.gitlab/ci/sentry.yml @@ -8,6 +8,7 @@ sentry server deploy: before_script: - cd packages/server - npm i --include=dev + - npm i @sentry/cli - npx prisma generate - npm run build script: -- GitLab From e9ef31b397e4360191f26cb130c00c1b73423453 Mon Sep 17 00:00:00 2001 From: Grant Date: Mon, 7 Jul 2025 21:01:19 -0600 Subject: [PATCH 8/8] wip --- .gitlab-ci.yml | 11 +++-------- .gitlab/ci/sentry.yml | 12 +++--------- .vscode/settings.json | 3 +++ 3 files changed, 9 insertions(+), 17 deletions(-) diff --git a/.gitlab-ci.yml b/.gitlab-ci.yml index 084a6ba..e1aeda2 100644 --- a/.gitlab-ci.yml +++ b/.gitlab-ci.yml @@ -6,6 +6,9 @@ stages: 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 @@ -66,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/sentry.yml b/.gitlab/ci/sentry.yml index 7e8cdf5..2a6b427 100644 --- a/.gitlab/ci/sentry.yml +++ b/.gitlab/ci/sentry.yml @@ -1,15 +1,9 @@ -variables: - BUILD_IMAGE: node:23-alpine - sentry server deploy: stage: deploy interruptible: true - image: $BUILD_IMAGE before_script: - - cd packages/server - - npm i --include=dev - - npm i @sentry/cli - - npx prisma generate - - npm run build + - 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 053ea04..ffc3410 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" } } -- GitLab