From 9ae3f74b44beeb4f919a35e71e1d7d63c3210a97 Mon Sep 17 00:00:00 2001
From: Tobias Werth
Date: Sat, 20 Jun 2020 19:03:26 +0200
Subject: [PATCH 01/31] Update instructions for versioned docs.
---
new_release_howto.txt | 8 ++++----
1 file changed, 4 insertions(+), 4 deletions(-)
diff --git a/new_release_howto.txt b/new_release_howto.txt
index 817e7d2f..3954ad12 100644
--- a/new_release_howto.txt
+++ b/new_release_howto.txt
@@ -27,10 +27,10 @@ on the account `domjudge@vm-domjudge`):
Copy these files to `/srv/http/domjudge/releases/`
1. Update the DOMjudge homepage: commit changes in the `domjudge-scripts`
repository under `website/` and run `make install` as domjudge@domjudge
- 1. Update the release documentation under `/srv/http/domjudge/docs/`
- by running `make install-docs` from `~/domjudge-scripts/website/`.
- (if releasing the latest stable branch; note that the release tarball
- must already be present under `/srv/http/domjudge/releases/`).
+ 1. If this is a new major or minor version, update the release documentation
+ under `/srv/http/domjudge/docs/manual` by adding a new version to the
+ file `versions.json` and updating the redirect destination in `index.html`.
+ The documentation is regenerated once every hour.
1. If necessary, add a source package of included dash static shell in
`/srv/http/domjudge/sources/`.
1. Bump the docker containers and build Debian packages (or make someone
From 16e6ef96f782fc5fa99025d61c89ea8216f0364b Mon Sep 17 00:00:00 2001
From: Thijs Kinkhorst
Date: Fri, 26 Jun 2020 22:08:37 +0200
Subject: [PATCH 02/31] Unbreak snapshot creation
---
make_snapshot.sh | 6 +++---
1 file changed, 3 insertions(+), 3 deletions(-)
diff --git a/make_snapshot.sh b/make_snapshot.sh
index d7f244ed..ba11ab62 100755
--- a/make_snapshot.sh
+++ b/make_snapshot.sh
@@ -45,9 +45,9 @@ gzip -9 $DJDIR.tar
if [ -n "$PUBDIR" ]; then
rm -rf $PUBDIR/*
mkdir -p $PUBDIR/manual
- cp -r $DJDIR/doc/manual/build/html/* $PUBDIR/manual/
- cp $DJDIR/doc/team/team-manual.pdf $PUBDIR/
- cp $DJDIR.tar.gz $DJDIR/ChangeLog $PUBDIR/
+ cp -r $DJDIR/doc/manual/build/html/* $PUBDIR/manual/
+ cp $DJDIR/doc/manual/build/team/domjudge-team-manual.pdf $PUBDIR/
+ cp $DJDIR.tar.gz $DJDIR/ChangeLog $PUBDIR/
cd /
fi
From a6c126e91d453681fb1922efc3631b7d4cebfd1d Mon Sep 17 00:00:00 2001
From: Thijs Kinkhorst
Date: Fri, 26 Jun 2020 22:39:08 +0200
Subject: [PATCH 03/31] release 7.3.0
---
website/header.shtml | 6 +++---
1 file changed, 3 insertions(+), 3 deletions(-)
diff --git a/website/header.shtml b/website/header.shtml
index 0d16cbc1..c25719dd 100644
--- a/website/header.shtml
+++ b/website/header.shtml
@@ -1,6 +1,6 @@
-
From 944421cf799f52ec6ca238336ba47143d0b9c023 Mon Sep 17 00:00:00 2001
From: Thijs Kinkhorst
Date: Fri, 26 Jun 2020 22:52:42 +0200
Subject: [PATCH 04/31] Update release instructions
---
make_release.sh | 3 +++
new_release_howto.txt | 11 +++++------
2 files changed, 8 insertions(+), 6 deletions(-)
diff --git a/make_release.sh b/make_release.sh
index a4678d4e..cd79646e 100755
--- a/make_release.sh
+++ b/make_release.sh
@@ -58,6 +58,9 @@ cd "$OWD"
mv $TEMPDIR/domjudge-$VERSION.tar.gz .
rm -rf "$TEMPDIR"
+sha256sum domjudge-$VERSION.tar.gz > domjudge-$VERSION.tar.gz.sha256sum
+gpg -a --detach-sign --digest-algo SHA256 domjudge-$VERSION.tar.gz
+
echo "Release file: 'domjudge-$VERSION.tar.gz'"
echo "ChangeLog version: '$CHLOG'"
diff --git a/new_release_howto.txt b/new_release_howto.txt
index 3954ad12..1cd696c5 100644
--- a/new_release_howto.txt
+++ b/new_release_howto.txt
@@ -20,19 +20,18 @@ on the account `domjudge@vm-domjudge`):
The tarball is placed in the current dir; check that it looks correct,
test e.g. by unpacking it and running
./configure && make build
+ 1. If releasing from the master branch, create a new version branch:
+ git checkout -b x.y
+ git push --set-upstream origin x.y
+ git checkout master
1. Update files above to `{version+1}DEV`, `DEBUG=1`, and commit.
- 1. Generate sha256sum and GPG signature:
- sha256sum domjudge-$TAG.tar.gz > domjudge-$TAG.tar.gz.sha256sum
- gpg -a --detach-sign --digest-algo SHA256 domjudge-$TAG.tar.gz
- Copy these files to `/srv/http/domjudge/releases/`
+ 1. Copy domjudge-$TAG.tar.gz* to `/srv/http/domjudge/releases/`
1. Update the DOMjudge homepage: commit changes in the `domjudge-scripts`
repository under `website/` and run `make install` as domjudge@domjudge
1. If this is a new major or minor version, update the release documentation
under `/srv/http/domjudge/docs/manual` by adding a new version to the
file `versions.json` and updating the redirect destination in `index.html`.
The documentation is regenerated once every hour.
- 1. If necessary, add a source package of included dash static shell in
- `/srv/http/domjudge/sources/`.
1. Bump the docker containers and build Debian packages (or make someone
do this).
1. Send an email to domjudge-announce@domjudge.org.
From 48d7d38ee48b0c606dd4843ce84b53e9fc7af1a5 Mon Sep 17 00:00:00 2001
From: Thijs Kinkhorst
Date: Mon, 29 Jun 2020 22:13:59 +0200
Subject: [PATCH 05/31] For millennials, move Docker more to the top.
---
website/download.shtml | 19 +++++++++----------
1 file changed, 9 insertions(+), 10 deletions(-)
diff --git a/website/download.shtml b/website/download.shtml
index af3aa67a..85613bda 100644
--- a/website/download.shtml
+++ b/website/download.shtml
@@ -35,13 +35,19 @@ dated .
There are Debian packages
available for the amd64 architecture; other architectures might be buildable
from the source packages.
-The packages work on Stretch and newer, and also on the various versions
-of Ubuntu.
+The packages are built and tested on Debian stable, but also on newer versions and the various versions of Ubuntu.
To install these packages, add our
repository GPG key directly to APT with
Also available are the
From 83f1fa318fd07be1b1954ab153005bef2c2553a8 Mon Sep 17 00:00:00 2001
From: Thijs Kinkhorst
Date: Tue, 1 Sep 2020 20:28:59 +0200
Subject: [PATCH 06/31] Advertise wiki a bit
---
website/documentation.shtml | 7 +++++++
1 file changed, 7 insertions(+)
diff --git a/website/documentation.shtml b/website/documentation.shtml
index d68e5973..a4e4f66f 100644
--- a/website/documentation.shtml
+++ b/website/documentation.shtml
@@ -23,4 +23,11 @@ and control contest state (with admin role).
We also have the
+DOMjudge wiki
+which collects other pieces of information about specific configurations
+or integrations.
+
From 4d2c6d5cce9cb0afe4d92da5fd270ea32b027cb8 Mon Sep 17 00:00:00 2001
From: Thijs Kinkhorst
Date: Wed, 28 Oct 2020 19:38:35 +0000
Subject: [PATCH 07/31] Update ICPC Contest API urls
---
README.md | 2 +-
contest-api/check-api.sh | 4 ++--
website/documentation.shtml | 2 +-
3 files changed, 4 insertions(+), 4 deletions(-)
diff --git a/README.md b/README.md
index d45c5a62..bc6ac73a 100644
--- a/README.md
+++ b/README.md
@@ -9,4 +9,4 @@ The following subdirectories contain:
* `website` the HTML code for www.domjudge.org
* `icpc-wf` scripts used at the ICPC World Finals
* `contest-api` a script to validate an implementation of the
- [ICPC contest API](https://clics.ecs.baylor.edu/index.php/Contest_API)
+ [ICPC contest API](https://ccs-specs.icpc.io/contest_api)
diff --git a/contest-api/check-api.sh b/contest-api/check-api.sh
index 12321229..9ec85b97 100755
--- a/contest-api/check-api.sh
+++ b/contest-api/check-api.sh
@@ -1,6 +1,6 @@
#!/bin/bash
# Checks whether a Contest API conforms to the specification
-# https://clics.ecs.baylor.edu/index.php/Contest_API
+# https://ccs-specs.icpc.io/contest_api
# Set path to json-validate binary if it's not in PATH:
#VALIDATE_JSON=/path/to/validate-json
@@ -71,7 +71,7 @@ $(basename $0) - Validate a Contest API implementation with JSON schema.
Usage: $(basename $0) [option]... URL
This program validates a Contest API implementation against the
-specification: https://clics.ecs.baylor.edu/index.php/Contest_API
+specification: https://ccs-specs.icpc.io/contest_api
The URL must point to the base of the API, for example:
diff --git a/website/documentation.shtml b/website/documentation.shtml
index a4e4f66f..4cc75ec5 100644
--- a/website/documentation.shtml
+++ b/website/documentation.shtml
@@ -18,7 +18,7 @@ state as well as perform certain actions, such as submit solutions
and control contest state (with admin role).
The DOMjudge API is an implementation of the ICPC
-Contest API
+Contest API
(except that it does not (yet) implement the optional team-members
endpoint). It also has some extensions, see the
internal API documentation.