ci: Use fedora:latest instead of doc-builder and fedora:oragono

This commit is contained in:
louiz’
2020-05-21 22:45:04 +02:00
parent 0479bd0319
commit 17a5f1fae0
+13 -16
View File
@@ -50,20 +50,20 @@ variables:
.fedora_build: .fedora_build:
extends: .basic_build extends: .basic_build
image: docker.louiz.org/louiz/biboumi/test-fedora:oragono image: docker.louiz.org/louiz/biboumi/test-fedora:latest
build:fedora: build:fedora:
extends: .fedora_build extends: .fedora_build
build:debian: build:debian:
extends: .basic_build extends: .basic_build
image: docker.louiz.org/louiz/biboumi/test-debian:oragono image: docker.louiz.org/louiz/biboumi/test-debian:latest
build:alpine: build:alpine:
extends: .basic_build extends: .basic_build
variables: variables:
SYSTEMD: "-DWITHOUT_SYSTEMD=1" SYSTEMD: "-DWITHOUT_SYSTEMD=1"
image: docker.louiz.org/louiz/biboumi/test-alpine:oragono image: docker.louiz.org/louiz/biboumi/test-alpine:latest
build:archlinux: build:archlinux:
extends: .basic_build extends: .basic_build
@@ -144,14 +144,14 @@ build:no_db_botan:
test:debian: test:debian:
extends: .basic_test extends: .basic_test
image: docker.louiz.org/louiz/biboumi/test-debian:oragono image: docker.louiz.org/louiz/biboumi/test-debian:latest
dependencies: dependencies:
- build:debian - build:debian
needs: ["build:debian"] needs: ["build:debian"]
test:fedora: test:fedora:
extends: .basic_test extends: .basic_test
image: docker.louiz.org/louiz/biboumi/test-fedora:oragono image: docker.louiz.org/louiz/biboumi/test-fedora:latest
script: script:
- cd build/ - cd build/
- make coverage_check - make coverage_check
@@ -163,14 +163,14 @@ test:fedora:
test:no_udns: test:no_udns:
extends: .basic_test extends: .basic_test
image: docker.louiz.org/louiz/biboumi/test-fedora:oragono image: docker.louiz.org/louiz/biboumi/test-fedora:latest
dependencies: dependencies:
- build:no_udns - build:no_udns
needs: ["build:no_udns"] needs: ["build:no_udns"]
test:alpine: test:alpine:
extends: .basic_test extends: .basic_test
image: docker.louiz.org/louiz/biboumi/test-alpine:oragono image: docker.louiz.org/louiz/biboumi/test-alpine:latest
dependencies: dependencies:
- build:alpine - build:alpine
needs: ["build:alpine"] needs: ["build:alpine"]
@@ -196,7 +196,7 @@ packaging:rpm:
tags: tags:
- docker - docker
allow_failure: true allow_failure: true
image: docker.louiz.org/louiz/biboumi/test-fedora:oragono image: docker.louiz.org/louiz/biboumi/test-fedora:latest
script: script:
- cd build/ - cd build/
- make rpm -j$(nproc || echo 1) - make rpm -j$(nproc || echo 1)
@@ -239,13 +239,16 @@ packaging:archlinux:
- "doc/**/*" - "doc/**/*"
# The jobs with the secure tag need to access directories where important # The jobs with the secure tag need to access directories where important
# files are stored: the latest doc, etc.' # files are stored: the latest doc, etc.
# Other jobs can not access these, otherwise anybody doing a merge request # Other jobs can not access these, otherwise anybody doing a merge request
# could delete the official doc # could delete the official doc
.deploy:doc: .deploy:doc:
extends: .doc_changed extends: .doc_changed
stage: deploy stage: deploy
image: docker.louiz.org/louiz/biboumi/doc-builder image: docker.louiz.org/louiz/biboumi/test-fedora:latest
tags:
- www
- secure
script: script:
- cd doc/ - cd doc/
- make html - make html
@@ -257,9 +260,6 @@ deploy:doc:latest:
extends: .deploy:doc extends: .deploy:doc
only: only:
- master@louiz/biboumi - master@louiz/biboumi
tags:
- www
- secure
environment: environment:
name: doc.latest name: doc.latest
url: https://doc.biboumi.louiz.org url: https://doc.biboumi.louiz.org
@@ -270,9 +270,6 @@ deploy:doc:tag:
extends: .deploy:doc extends: .deploy:doc
only: only:
- tags - tags
tags:
- www
- secure
environment: environment:
name: doc.$CI_COMMIT_TAG name: doc.$CI_COMMIT_TAG
url: https://doc.biboumi.louiz.org/$CI_COMMIT_TAG/ url: https://doc.biboumi.louiz.org/$CI_COMMIT_TAG/