.gitignore

@@ -9,6 +9,7 @@ yarn-error.log*
 .output
 cockroach-data
 *.session.sql
+.history
 
 # Runtime data
 pids

.gitlab-ci.yml

@@ -96,26 +96,6 @@ build:node-20:
   <<: *build
   allow_failure: true
 
-build:staging:
-  <<: *build_template
-  variables:
-    SENTRY_RELEASE: $CI_COMMIT_TAG
-    SENTRY_AUTH_TOKEN: $RELEASE_SENTRY_AUTH_TOKEN
-    SENTRY_PUBLISH_RELEASE: $RELEASE_SENTRY_PUBLISH_RELEASE
-    SENTRY_DIST: staging
-    SENTRY_ORG: penta
-    SENTRY_PROJECT: alboneon
-    SENTRY_URL: https://sentry.pentacore.se/
-  script: *build_script
-  needs: []
-  rules:
-    - if: $CI_COMMIT_TAG =~ /^[vV](\d+)\.(\d+)\.(\d+)-?([a-zA-Z-\d\.]*)\+?([a-zA-Z-\d\.]*)$/
-      when: always
-  artifacts:
-    paths:
-      - .output
-  stage: build
-
 build:release:
   before_script:
     - yarn install
@@ -123,10 +103,11 @@ build:release:
     SENTRY_RELEASE: $CI_COMMIT_TAG
     SENTRY_AUTH_TOKEN: $RELEASE_SENTRY_AUTH_TOKEN
     SENTRY_PUBLISH_RELEASE: $RELEASE_SENTRY_PUBLISH_RELEASE
-    SENTRY_DIST: staging
+    SENTRY_DIST: production
     SENTRY_ORG: penta
     SENTRY_PROJECT: alboneon
     SENTRY_URL: https://sentry.pentacore.se/
+    NODE_ENV: production
   script: *build_script
   needs: []
   rules:
@@ -137,37 +118,6 @@ build:release:
       - .output
   stage: build
 
-docker:staging:
-  image: docker:git
-  stage: docker
-  services:
-    - docker:dind
-  variables:
-    CA_CERT_URL: $CA_CERT_URL
-  dependencies:
-    - build:staging
-  needs:
-    - build:staging
-  rules:
-    - if: $CI_COMMIT_TAG =~ /^[vV](\d+)\.(\d+)\.(\d+)-?([a-zA-Z-\d\.]*)\+?([a-zA-Z-\d\.]*)$/
-  script:
-    - sed 's/# DEPLOY //g' Dockerfile > Dockerfile.deploy
-    - >
-      docker build
-      --pull
-      --cache-from $CI_REGISTRY_IMAGE:latest
-      --label "org.opencontainers.image.title=$CI_PROJECT_TITLE"
-      --label "org.opencontainers.image.url=$CI_PROJECT_URL"
-      --label "org.opencontainers.image.created=$CI_JOB_STARTED_AT"
-      --label "org.opencontainers.image.revision=$CI_COMMIT_SHA"
-      --label "org.opencontainers.image.version=$CI_COMMIT_REF_NAME"
-      --tag $CI_REGISTRY_IMAGE/staging:$CI_COMMIT_TAG
-      --build-arg CA_CERT_URL=$CA_CERT_URL
-      .
-    - docker push "$CI_REGISTRY_IMAGE/staging:$CI_COMMIT_TAG"
-  before_script:
-    - docker login -u "$CI_REGISTRY_USER" -p "$CI_REGISTRY_PASSWORD" $CI_REGISTRY
-
 docker:release:
   image: docker:git
   stage: docker
@@ -212,8 +162,7 @@ deploy:production:
     - if: $CI_COMMIT_TAG =~ /^[vV](\d+)\.(\d+)\.(\d+)-?([a-zA-Z-\d\.]*)\+?([a-zA-Z-\d\.]*)$/
   script:
     - curl -X POST "${DEPLOY_URL}?tag=${CI_COMMIT_TAG}"
-    # - sentry-cli deploys new -r "${CI_COMMIT_TAG}" --env production --auth-token $SENTRY_AUTH_TOKEN -p alboneon-backend
-    # - sentry-cli deploys new -r "${CI_COMMIT_TAG}" --env production --auth-token $SENTRY_AUTH_TOKEN -p alboneon-frontend
+    - sentry-cli deploys new -r "${CI_COMMIT_TAG}" --env production --auth-token $SENTRY_AUTH_TOKEN -p alboneon
     - curl -X POST "${DISCORD_WEBHOOK}" -H "Content-Type:application/json" -d "{\"content\":\"Alboneon ${CI_COMMIT_TAG} is now deployed\"}"
 
 deploy:staging:
@@ -225,13 +174,12 @@ deploy:staging:
     name: Staging
     url: https://staging.alboneon.xyz
   needs:
-    - docker:staging
+    - docker:release
   rules:
     - if: $CI_COMMIT_TAG =~ /^[vV](\d+)\.(\d+)\.(\d+)-?([a-zA-Z-\d\.]*)\+?([a-zA-Z-\d\.]*)$/
   script:
     - curl -X POST "${STAGING_DEPLOY_URL}?tag=${CI_COMMIT_TAG}"
-    # - sentry-cli deploys new -r "${CI_COMMIT_TAG}" --env staging --auth-token $SENTRY_AUTH_TOKEN -p alboneon-backend
-    # - sentry-cli deploys new -r "${CI_COMMIT_TAG}" --env staging --auth-token $SENTRY_AUTH_TOKEN -p alboneon-frontend
+    - sentry-cli deploys new -r "${CI_COMMIT_TAG}" --env staging --auth-token $SENTRY_AUTH_TOKEN -p alboneon
 
 release:
   image: registry.pentacore.se/toolbox/semantic-release-image:main

.vscode/settings.json

@@ -11,21 +11,22 @@
   "files.eol": "\n",
   "vetur.experimental.templateInterpolationService": false,
   "conventionalCommits.scopes": [
-    "PartyManager",
+    "Character",
+    "Dashboard",
+    "Database",
+    "DiceRoller",
+    "Frontend",
     "HotBar",
-    "Journal",
+    "HotBar",
+    "IconComboBox",
     "Inventory",
-    "Quests",
+    "Journal",
     "Npcs",
-    "Dashboard",
-    "Database",
+    "PartyManager",
+    "Quests",
     "Server",
-    "Character",
-    "HotBar",
     "Settings",
-    "Yarn",
-    "Frontend",
-    "DiceRoller"
+    "Yarn"
   ],
   "sqltools.connections": [
     {
@@ -35,31 +36,5 @@
       "name": "Local",
       "connectString": "postgresql://root@localhost:26257/defaultdb"
     },
-    {
-      "pgOptions": {
-        "ssl": {
-          "ca": "C:\\Users\\Martin Claesson\\AppData\\Roaming\\postgresql\\root.crt"
-        }
-      },
-      "previewLimit": 50,
-      "server": "localhost",
-      "driver": "CockroachDB",
-      "name": "Prod",
-      "group": "Alboneon Cockroachlabs",
-      "connectString": "postgresql://alboneon-prod:[email protected]:26257/alboneon?sslmode=verify-full"
-    },
-    {
-      "pgOptions": {
-        "ssl": {
-          "ca": "C:\\Users\\Martin Claesson\\AppData\\Roaming\\postgresql\\root.crt"
-        }
-      },
-      "previewLimit": 50,
-      "server": "localhost",
-      "driver": "CockroachDB",
-      "name": "Staging",
-      "group": "Alboneon Cockroachlabs",
-      "connectString": "postgresql://alboneon-staging:[email protected]:26257/staging?sslmode=verify-full"
-    }
   ]
 }