diff --git a/.github/workflows/runpipe.yml b/.github/workflows/runpipe.yml new file mode 100644 index 0000000000..551b821757 --- /dev/null +++ b/.github/workflows/runpipe.yml @@ -0,0 +1,30 @@ +name: Run runpipe tests +on: + push: + branches-ignore: + - main + - '[0-9]+.[0-9]+' + - gh-readonly-queue/main/* + - gh-readonly-queue/main/[0-9]+.[0-9]+ + pull_request: + branches: + - main + - '[0-9]+.[0-9]+' + +jobs: + runpipe: + runs-on: ubuntu-latest + container: + image: domjudge/gitlabci:2.1 + steps: + - uses: actions/checkout@v3 + - name: Create the configure file + run: make configure + - name: Do the default configure + run: ./configure --with-baseurl='http://localhost/domjudge/' --with-domjudge-user=domjudge --with-judgehost_chrootdir=${DIR}/chroot/domjudge + - name: Prepare judgehost files + run: make judgehost + - name: Run the actual runpipe tests + working-directory: judge/runpipe_test + run: make test + diff --git a/gitlab/ci/unit.yml b/gitlab/ci/unit.yml index 1daf98ebf5..1d0eea3d70 100644 --- a/gitlab/ci/unit.yml +++ b/gitlab/ci/unit.yml @@ -28,16 +28,6 @@ junit: - unit-tests.xml -run runpipe tests: - extends: [.normal_job] - stage: unit - script: - - ./gitlab/runpipe-tests.sh - artifacts: - when: always - paths: - - gitlabartifacts - run unit tests: only: - main diff --git a/gitlab/runpipe-tests.sh b/gitlab/runpipe-tests.sh deleted file mode 100755 index 0e997bd08b..0000000000 --- a/gitlab/runpipe-tests.sh +++ /dev/null @@ -1,13 +0,0 @@ -#!/bin/bash - -. gitlab/ci_settings.sh - -section_start compile "Compile runpipe" -# Configure and make the runpipe binaries. -make configure -./configure --with-baseurl='http://localhost/domjudge/' --with-domjudge-user=domjudge --with-judgehost_chrootdir=${DIR}/chroot/domjudge |& tee "$GITLABARTIFACTS/configure.log" -make judgehost |& tee "$GITLABARTIFACTS/make.log" -section_end compile - -cd judge/runpipe_test || exit 1 -make test |& tee "$GITLABARTIFACTS/test.log"