Merge pull request #9 from WISVCH/update-short-names

Add missing shortnames, fixes #8. Also updates deprecated actions.

.github/workflows/make_logos.yaml

@@ -20,7 +20,7 @@ jobs:
         uses: actions/checkout@v2
       - name: Run export
         run: ./export.sh --universities --companies --studies --background --transparent --output-directory out 64 256
-      - uses: actions/upload-artifact@v2
+      - uses: actions/upload-artifact@v4
         with:
           name: logos
           path: out
@@ -30,7 +30,7 @@ jobs:
     steps:
       - name: Checkout
         uses: actions/checkout@v2
-      - uses: actions/download-artifact@v2
+      - uses: actions/download-artifact@v4.1.7
         with:
           name: logos
           path: out
@@ -43,18 +43,18 @@ jobs:
           sudo apt update; sudo apt install cutycapt xvfb httpie -y
           mkdir $afftmp
           cp ${{ github.workspace }}/out/background_64/* $afftmp
-          docker-compose -f .github/workflows/domjudge/docker-compose.yml up -d mariadb
+          docker compose -f .github/workflows/domjudge/docker-compose.yml up -d mariadb
           sleep 30s
-          docker-compose -f .github/workflows/domjudge/docker-compose.yml up -d domjudge
+          docker compose -f .github/workflows/domjudge/docker-compose.yml up -d domjudge
           sleep 1m
-          ADMINPASS=$(docker exec -i domjudge_domjudge_1 cat /opt/domjudge/domserver/etc/initial_admin_password.secret)
+          ADMINPASS=$(docker exec -i domjudge-domjudge-1 cat /opt/domjudge/domserver/etc/initial_admin_password.secret)
           http -a admin:$ADMINPASS --check-status -b -f POST "http://localhost:12345/api/users/organizations" json@out/organizations.json
           jq "[.[] | {\"organization_id\": .id, \"name\": .formal_name, \"id\":1, \"group_ids\": [\"3\"]}] | to_entries | map( (.value.id = \"\(1+.key)\" ) | .value)" out/organizations.json > teams.json
           http -a admin:$ADMINPASS --check-status -b -f POST "http://localhost:12345/api/users/teams" [email protected]
           http -a admin:$ADMINPASS --check-status -b PUT "http://localhost:12345/api/config" show_affiliation_logos=true show_flags=true show_affiliations=true data_source=1 --ignore-stdin
           http -a admin:$ADMINPASS --verbose --check-status -b GET "http://localhost:12345/api/config"
           xvfb-run --server-args="-screen 0, 1024x768x24" cutycapt --url=http://localhost:12345 --out=scoreboard.png
-      - uses: actions/upload-artifact@v2
+      - uses: actions/upload-artifact@v4
         with:
           name: DJ_scoreboard
           path: scoreboard.png
@@ -65,7 +65,7 @@ jobs:
     steps:
       - name: Checkout
         uses: actions/checkout@v2
-      - uses: actions/download-artifact@v2
+      - uses: actions/download-artifact@v4.1.7
         with:
           name: logos
           path: out

universities/organizations.json

@@ -217,7 +217,7 @@
   },
   {
     "id": "U-3397",
-    "name": "",
+    "name": "Chalmers",
     "formal_name": "Chalmers University of Technology",
     "country": "SWE"
   },
@@ -253,7 +253,7 @@
   },
   {
     "id": "U-3758",
-    "name": "",
+    "name": "KCL",
     "formal_name": "King's College London",
     "country": "GBR"
   },
@@ -403,7 +403,7 @@
   },
   {
     "id": "U-8102",
-    "name": "",
+    "name": "Passau",
     "formal_name": "University of Passau",
     "country": "DEU"
   },