Merge branch 'main' into chore/simpler-deployment

TUM-Dev · Nov 11, 2023 · 98a8624 · 98a8624
2 parents 0e8f426 + 0e1dc41
commit 98a8624
Show file tree

Hide file tree

Showing 13 changed files with 67 additions and 455 deletions.
diff --git a/.github/workflows/_restart-argocd.yml b/.github/workflows/_restart-argocd.yml
@@ -21,11 +21,5 @@ jobs:
         run: curl -sSL -o /usr/local/bin/argocd https://github.com/argoproj/argo-cd/releases/latest/download/argocd-linux-amd64 && chmod +x /usr/local/bin/argocd
       -  name: Restart ${{ inputs.deployment }} via the ArgoCD CLI
          run: |
-          echo ${{ github.ref }}
-          if [[ ${{ github.ref }} == 'refs/heads/main' ]]; then
-            echo restarting the production deployment ${{ inputs.deployment }}
-            argocd app actions run navigatum-prod restart --kind Deployment --resource-name ${{ inputs.deployment }} --auth-token ${{ secrets.ARGOCD_TOKEN }} --server argocd.nav.tum.sexy
-          else
-            echo restarting the staging deployment ${{ inputs.deployment }}
-            argocd app actions run pr-${{github.event.number}} restart --kind Deployment --resource-name ${{ inputs.deployment }} --auth-token ${{ secrets.ARGOCD_TOKEN }} --server argocd.nav.tum.sexy
-          fi
+          echo restarting the deployment ${{ inputs.deployment }}
+          argocd app actions run navigatum-prod restart --kind Deployment --resource-name ${{ inputs.deployment }} --auth-token ${{ secrets.ARGOCD_TOKEN }} --server argocd.nav.tum.sexy
diff --git a/.github/workflows/add-deployment.yaml b/.github/workflows/add-deployment.yaml
diff --git a/.github/workflows/comment-staging-url.yaml b/.github/workflows/comment-staging-url.yaml
diff --git a/.github/workflows/data-cicd.yml b/.github/workflows/data-cicd.yml
@@ -55,6 +55,7 @@ jobs:
       packages: write
   data-deployment-1:
     uses: ./.github/workflows/_restart-argocd.yml
+    if: ${{ github.ref }} == 'refs/heads/main'
     needs:
       - data-build
     with:
@@ -63,6 +64,7 @@ jobs:
       ARGOCD_TOKEN: ${{ secrets.ARGOCD_TOKEN }}
   data-deployment-2: # we need to restart the server, as otherwise it will not serve the new data
     uses: ./.github/workflows/_restart-argocd.yml
+    if: ${{ github.ref }} == 'refs/heads/main'
     needs:
       - data-deployment-1
     with:

diff --git a/.github/workflows/remove-deployment.yml b/.github/workflows/remove-deployment.yml
diff --git a/.github/workflows/server-cicd.yml b/.github/workflows/server-cicd.yml
@@ -62,6 +62,7 @@ jobs:
       packages: write
   feedback-deployment:
     uses: ./.github/workflows/_restart-argocd.yml
+    if: ${{ github.ref }} == 'refs/heads/main'
     needs:
       - server-build
     with:
@@ -70,6 +71,7 @@ jobs:
       ARGOCD_TOKEN: ${{ secrets.ARGOCD_TOKEN }}
   calendar-deployment:
     uses: ./.github/workflows/_restart-argocd.yml
+    if: ${{ github.ref }} == 'refs/heads/main'
     needs:
       - server-build
     with:
@@ -78,6 +80,7 @@ jobs:
       ARGOCD_TOKEN: ${{ secrets.ARGOCD_TOKEN }}
   server-deployment:
     uses: ./.github/workflows/_restart-argocd.yml
+    if: ${{ github.ref }} == 'refs/heads/main'
     needs:
       - server-build
     with:

diff --git a/.github/workflows/webclient-cicd.yml b/.github/workflows/webclient-cicd.yml
@@ -58,6 +58,7 @@ jobs:
       packages: write
   webclient-deployment:
     uses: ./.github/workflows/_restart-argocd.yml
+    if: ${{ github.ref }} == 'refs/heads/main'
     needs:
       - webclient-build
     with:

diff --git a/data/sources/coordinates/rest.yaml b/data/sources/coordinates/rest.yaml
@@ -5,6 +5,7 @@
 "0205.03.302": { lat: 48.147494785237, lon: 11.567622229204972 }
 "0305.04.508": { lat: 48.14609440391391, lon: 11.569374210372473 }
 "0503.02.345A": { lat: 48.1483384891566, lon: 11.565865189789264 }
+"0509.Z1.921": { lat: 48.1487386952626, lon: 11.566923686212574 }
 "0509.Z1.995": { lat: 48.14972497055329, lon: 11.567161041097489 }
 "0509.02.953A": { lat: 48.14930262787317, lon: 11.566896808473047 }
 

diff --git a/requirements-dev.txt b/requirements-dev.txt
@@ -1,7 +1,7 @@
 mypy~=1.6.0
 pre-commit~=3.5.0
 pylint~=3.0.0
-sourcery~=1.12.0
+sourcery~=1.13.0
 types-Pillow~=10.1.0.0
 types-PyYAML~=6.0.12.10
 types-requests~=2.31.0.1

diff --git a/webclient/package.json b/webclient/package.json
@@ -15,7 +15,6 @@
     "format": "prettier --write ."
   },
   "dependencies": {
-    "@sentry/vue": "7.74.1",
     "@vueuse/core": "10.5.0",
     "maplibre-gl": "3.5.1",
     "pinia": "2.1.7",
@@ -28,15 +27,14 @@
   "devDependencies": {
     "@intlify/unplugin-vue-i18n": "1.4.0",
     "@rushstack/eslint-patch": "1.5.1",
-    "@sentry/vite-plugin": "2.8.0",
-    "@types/swagger-ui-dist": "3.30.3",
+    "@types/swagger-ui-dist": "3.30.4",
     "@vitejs/plugin-vue": "4.4.0",
     "@vue/eslint-config-prettier": "8.0.0",
     "@vue/eslint-config-typescript": "12.0.0",
     "@vue/tsconfig": "0.4.0",
     "@yankeeinlondon/link-builder": "1.2.1",
     "cypress": "13.3.0",
-    "eslint": "8.52.0",
+    "eslint": "8.53.0",
     "eslint-plugin-vue": "9.18.1",
     "isomorphic-fetch": "3.0.0",
     "npm-run-all": "4.1.5",