diff options
author | Jaime Martinez <jmartinez@gitlab.com> | 2021-10-08 02:29:35 +0300 |
---|---|---|
committer | Jaime Martinez <jmartinez@gitlab.com> | 2021-10-08 02:29:35 +0300 |
commit | 247bd7ba2fd9139711218c6a42ed03c551f958d9 (patch) | |
tree | 5f34b0cf1bf51aed35fe35d5396916e89eef5485 /.gitlab | |
parent | c48bb316739e39ba1b225f12147fad45337aa711 (diff) | |
parent | bf039d89071e527e2e5c1bc2e64c7513d87cba1a (diff) |
Merge branch 'remove/root' into 'master'
Remove gitlab-pages daemon
Closes #114 and #133
See merge request gitlab-org/gitlab-pages!542
Diffstat (limited to '.gitlab')
-rw-r--r-- | .gitlab/ci/test.yml | 14 |
1 files changed, 0 insertions, 14 deletions
diff --git a/.gitlab/ci/test.yml b/.gitlab/ci/test.yml index a29acb7d..ea7b6932 100644 --- a/.gitlab/ci/test.yml +++ b/.gitlab/ci/test.yml @@ -20,12 +20,6 @@ - echo "Running just the acceptance tests...." - make acceptance -.tests-acceptance-daemonize: - extends: .tests-common - script: - - echo "Running just the acceptance tests as daemon...." - - make acceptance ARGS='-daemonize' - test:1.16: extends: .tests-unit image: golang:1.16 @@ -34,10 +28,6 @@ test-acceptance:1.16: extends: .tests-acceptance image: golang:1.16 -test-acceptance-daemonize:1.16: - extends: .tests-acceptance-daemonize - image: golang:1.16 - test:1.17: extends: .tests-unit image: golang:1.17 @@ -46,10 +36,6 @@ test-acceptance:1.17: extends: .tests-acceptance image: golang:1.17 -test-acceptance-daemonize:1.17: - extends: .tests-acceptance-daemonize - image: golang:1.17 - race: extends: .tests-common script: |