Compare commits

..

No commits in common. "f1a88fe4bee06278a7372c1aac3cd13ef290ab07" and "dedc5c6e94df156abb7f9e6bddb91aa4a3b5b609" have entirely different histories.

3 changed files with 41 additions and 14 deletions

View File

@ -1,16 +1,43 @@
name: Lint & Test
on:
- push
- pull_request
- push
- pull_request
jobs:
php-cs-fixer:
name: PHP-CS-Fixer
runs-on: ubuntu-latest
steps:
- uses: actions/checkout@v2
- name: PHP-CS-Fixer
uses: docker://oskarstark/php-cs-fixer-ga
with:
args: --config=./web/.php-cs-fixer.php --diff --dry-run
php-cs-fixer:
name: PHP-CS-Fixer
runs-on: ubuntu-latest
steps:
- uses: actions/checkout@v2
- name: PHP-CS-Fixer
uses: docker://oskarstark/php-cs-fixer-ga
with:
args: --config=./web/.php-cs-fixer.php --diff --dry-run
docker-db:
name: Build Docker Image (uoj-db)
needs: php-cs-fixer
runs-on: ubuntu-latest
steps:
- uses: actions/checkout@v2
- name: Build Docker Image (uoj-db)
run: docker-compose build uoj-db
docker-judger:
name: Build Docker Image (uoj-judger)
needs: php-cs-fixer
runs-on: ubuntu-latest
steps:
- uses: actions/checkout@v2
- name: Build Docker Image
run: docker-compose build uoj-judger
docker-web:
name: Build Docker Image (uoj-web)
needs: php-cs-fixer
runs-on: ubuntu-latest
steps:
- uses: actions/checkout@v2
- name: Build Docker Image (uoj-web)
run: docker-compose build uoj-web

View File

@ -74,9 +74,9 @@
echo '<td>' . getUserLink($username) . '</td>';
foreach ($problem_ids as $problem_id) {
if (!isset($finished[$username]) || !isset($finished[$username][$problem_id])) {
echo '<td class="failed"><span class="glyphicon glyphicon-remove"></span></td>';
echo '<td class="failed"><span class="glyphicon glyphicon-ok"></span></td>';
} else {
echo '<td class="success"><span class="glyphicon glyphicon-ok"></span></td>';
echo '<td class="success"><span class="glyphicon glyphicon-remove"></span></td>';
}
}
echo '</tr>';

View File

@ -584,7 +584,6 @@ EOD;
<a href="/contest/<?=$contest['id']?>/registrants" class="btn btn-info btn-block"><?= UOJLocale::get('contests::contest registrants') ?></a>
<?php if (isSuperUser($myUser)): ?>
<a href="/contest/<?=$contest['id']?>/manage" class="btn btn-primary btn-block">管理</a>
<?php endif ?>
<?php if (isset($start_test_form)): ?>
<div class="top-buffer-sm">
<?php $start_test_form->printHTML(); ?>
@ -595,6 +594,7 @@ EOD;
<?php $publish_result_form->printHTML(); ?>
</div>
<?php endif ?>
<?php endif ?>
<?php if (isset($self_reviews_update_form)) { ?>
</div>
<div class="col-sm-6">