Skip to content
New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

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

Merged
merged 4 commits into from
Sep 23, 2024
Merged

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

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
4 commits
Select commit Hold shift + click to select a range
b5b6eee
Add missing shortnames, fixes #8. Also updates deprecated actions.
verwoerd Sep 23, 2024
5e85d19
Attempt to fix the test phase of the build
verwoerd Sep 23, 2024
67a06e5
Fix adminpass retrieval in build
verwoerd Sep 23, 2024
ed4a79c
Fix adminpass retrieval in build
verwoerd Sep 23, 2024
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
14 changes: 7 additions & 7 deletions .github/workflows/make_logos.yaml
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -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
Expand All @@ -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
Expand All @@ -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
Expand All @@ -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
Expand Down
6 changes: 3 additions & 3 deletions universities/organizations.json
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -217,7 +217,7 @@
},
{
"id": "U-3397",
"name": "",
"name": "Chalmers",
"formal_name": "Chalmers University of Technology",
"country": "SWE"
},
Expand Down Expand Up @@ -253,7 +253,7 @@
},
{
"id": "U-3758",
"name": "",
"name": "KCL",
"formal_name": "King's College London",
"country": "GBR"
},
Expand Down Expand Up @@ -403,7 +403,7 @@
},
{
"id": "U-8102",
"name": "",
"name": "Passau",
"formal_name": "University of Passau",
"country": "DEU"
},
Expand Down
Loading