Skip to content

Commit 78bcf83

Browse files
committed
Webstandard job has been moved to GHA
The GitLab folder will be removed so this cleanup was needed. Also fixed displaying the sections for the GHA job output.
1 parent 5dd3704 commit 78bcf83

File tree

3 files changed

+4
-4
lines changed

3 files changed

+4
-4
lines changed

gitlab/jsontogitlab.py renamed to .github/jobs/jsontogha.py

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -10,10 +10,10 @@ def cleanHash(toHash):
1010
return hashlib.sha224(toHash).hexdigest()
1111

1212
def sec_start(job,header):
13-
print('section_start:{}:{}{}{}'.format(int(time.time()),cleanHash(job),'\r\033[0K',header))
13+
print('section_start\r\033[0K'+header)
1414

1515
def sec_end(job):
16-
print('section_end:{}:{}'.format(int(time.time()),cleanHash(job)+'\r\033[0K'))
16+
print('section_end\r\033[0K')
1717

1818
with open(sys.argv[1],'r') as f:
1919
data = json.load(f)

.github/jobs/webstandard.sh

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -123,7 +123,7 @@ if [ "$TEST" = "w3cval" ]; then
123123
NEWFOUNDERRORS=$("$DIR"/vnu-runtime-image/bin/vnu --errors-only --exit-zero-always --skip-non-$typ --format gnu $FLTR "$URL" 2>&1 | wc -l)
124124
FOUNDERR=$((NEWFOUNDERRORS+FOUNDERR))
125125
python3 -m "json.tool" < result.json > "$ARTIFACTS/w3c$typ$URL.json"
126-
trace_off; python3 gitlab/jsontogitlab.py "$ARTIFACTS/w3c$typ$URL.json"; trace_on
126+
trace_off; python3 .github/jobs/jsontogha.py "$ARTIFACTS/w3c$typ$URL.json"; trace_on
127127
section_end
128128
done
129129
else

.github/workflows/database-upgrade.yml

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -32,5 +32,5 @@ jobs:
3232
run: echo "pass" > /opt/domjudge/domserver/etc/initial_admin_password.secret
3333
- name: Check for Errors in the Upgrade
3434
run: mysql -hsqlserver -uroot -proot -e "SHOW TABLES FROM domjudge;"
35-
- name: Check for Errors in Domjudge Web
35+
- name: Check for Errors in DOMjudge Webinterface
3636
run: .github/jobs/webstandard.sh none admin

0 commit comments

Comments
 (0)