Merge branch 'main' into json-db

TUM-Dev · May 6, 2024 · 22e6a6b · 22e6a6b
2 parents f1c1247 + a8eb391
commit 22e6a6b
Show file tree

Hide file tree

Showing 15 changed files with 60 additions and 222 deletions.
diff --git a/.github/workflows/linting.yml b/.github/workflows/linting.yml
@@ -15,7 +15,7 @@ jobs:
       - uses: actions/checkout@v4
       - uses: pnpm/action-setup@v3
         with:
-          version: 9
+          version: 9.1.0
           package_json_file: webclient/package.json
           run_install: |
             - cwd: webclient

diff --git a/.github/workflows/update-data.yml b/.github/workflows/update-data.yml
@@ -12,7 +12,7 @@ jobs:
       - uses: actions/checkout@v4
       - uses: pnpm/action-setup@v3
         with:
-          version: 9
+          version: 9.1.0
           package_json_file: webclient/package.json
           run_install: |
             - cwd: webclient

diff --git a/.github/workflows/webclient-cicd.yml b/.github/workflows/webclient-cicd.yml
@@ -15,7 +15,7 @@ jobs:
       - uses: actions/checkout@v4
       - uses: pnpm/action-setup@v3
         with:
-          version: 9
+          version: 9.1.0
           package_json_file: webclient/package.json
           run_install: |
             - cwd: webclient

diff --git a/data/README.md b/data/README.md
@@ -141,8 +141,6 @@ Any rights in individual contents of the database are licensed under the Databas
 
 > [!WARNING]
 > The images in `sources/img/` are subject to their own licensing terms, which are stated in the file `sources/img/img-sources.yaml`.
-
-> [!WARNING]
 > The compiled database may contain contents from external sources (i.e. all files in `external/`) that do have different license terms.
 
 ---

diff --git a/deployment/k3s/values.yaml b/deployment/k3s/values.yaml
@@ -10,7 +10,7 @@ server:
 mielisearch:
   image:
     repository: 'getmeili/meilisearch'
-    tag: v1.7.6
+    tag: v1.8.0
 calendar:
   scrape_tasks:
     - name: refresh-calendar-slow # takes ~6m to complete

diff --git a/docker-compose.dev.yml b/docker-compose.dev.yml
@@ -94,7 +94,7 @@ services:
       db:
         condition: service_healthy
   meilisearch:
-    image: getmeili/meilisearch:v1.7.6
+    image: getmeili/meilisearch:v1.8.0
     restart: unless-stopped
     ports:
       - "7700:7700"

diff --git a/docker-compose.yml b/docker-compose.yml
@@ -146,7 +146,7 @@ services:
       db:
         condition: service_healthy
   meilisearch:
-    image: getmeili/meilisearch:v1.7.6
+    image: getmeili/meilisearch:v1.8.0
     restart: unless-stopped
     networks:
       - navigatum