diff --git a/.gitlab-ci.yml b/.gitlab-ci.yml index 7215367ef5..c3ae12f7e1 100644 --- a/.gitlab-ci.yml +++ b/.gitlab-ci.yml @@ -284,74 +284,102 @@ mingw64-fedora-rawhide-container: x64-debian-10: <<: *native_build_job_definition + needs: + - x64-debian-10-container variables: NAME: debian-10 x64-debian-10-clang: <<: *native_build_job_definition + needs: + - x64-debian-10-container variables: NAME: debian-10 CC: clang x64-debian-sid: <<: *native_build_job_definition + needs: + - x64-debian-sid-container variables: NAME: debian-sid x64-centos-7: <<: *native_build_centos_7_job_definition + needs: + - x64-centos-7-container variables: NAME: centos-7 x64-centos-8: <<: *native_build_job_definition + needs: + - x64-centos-8-container variables: NAME: centos-8 x64-centos-8-clang: <<: *native_build_job_definition + needs: + - x64-centos-8-container variables: NAME: centos-8 CC: clang x64-centos-stream: <<: *native_build_job_definition + needs: + - x64-centos-stream-container variables: NAME: centos-stream x64-fedora-31: <<: *native_build_job_definition + needs: + - x64-fedora-31-container variables: NAME: fedora-31 x64-fedora-32: <<: *native_build_job_definition + needs: + - x64-fedora-32-container variables: NAME: fedora-32 x64-fedora-rawhide: <<: *native_build_job_definition + needs: + - x64-fedora-rawhide-container variables: NAME: fedora-rawhide x64-fedora-rawhide-clang: <<: *native_build_job_definition + needs: + - x64-fedora-rawhide-container variables: NAME: fedora-rawhide CC: clang x64-opensuse-151: <<: *native_build_job_definition + needs: + - x64-opensuse-151-container variables: NAME: opensuse-151 x64-ubuntu-1804: <<: *native_build_job_definition + needs: + - x64-ubuntu-1804-container variables: NAME: ubuntu-1804 x64-ubuntu-2004: <<: *native_build_job_definition + needs: + - x64-ubuntu-2004-container variables: NAME: ubuntu-2004 @@ -380,66 +408,88 @@ x64-macos-1015-build: armv6l-debian-10: <<: *cross_build_job_definition + needs: + - armv6l-debian-10-container variables: NAME: debian-10 CROSS: armv6l armv7l-debian-10: <<: *cross_build_job_definition + needs: + - armv7l-debian-10-container variables: NAME: debian-10 CROSS: armv7l mips64el-debian-10: <<: *cross_build_job_definition + needs: + - mips64el-debian-10-container variables: NAME: debian-10 CROSS: mips64el mips-debian-10: <<: *cross_build_job_definition + needs: + - mips-debian-10-container variables: NAME: debian-10 CROSS: mips aarch64-debian-10: <<: *cross_build_job_definition + needs: + - aarch64-debian-10-container variables: NAME: debian-10 CROSS: aarch64 mipsel-debian-10: <<: *cross_build_job_definition + needs: + - mipsel-debian-10-container variables: NAME: debian-10 CROSS: mipsel s390x-debian-sid: <<: *cross_build_job_definition + needs: + - s390x-debian-10-container variables: NAME: debian-sid CROSS: s390x i686-debian-sid: <<: *cross_build_job_definition + needs: + - i686-debian-sid-container variables: NAME: debian-sid CROSS: i686 ppc64le-debian-sid: <<: *cross_build_job_definition + needs: + - ppc64le-debian-10-container variables: NAME: debian-sid CROSS: ppc64le mingw32-fedora-rawhide: <<: *cross_build_job_definition + needs: + - mingw32-fedora-rawhide-container variables: NAME: fedora-rawhide CROSS: mingw32 mingw64-fedora-rawhide: <<: *cross_build_job_definition + needs: + - mingw64-fedora-rawhide-container variables: NAME: fedora-rawhide CROSS: mingw64 @@ -451,6 +501,8 @@ mingw64-fedora-rawhide: website: stage: builds image: $CI_REGISTRY_IMAGE/ci-centos-8:latest + needs: + - x64-centos-8-container before_script: - *script_variables script: @@ -469,6 +521,8 @@ website: codestyle: stage: builds image: $CI_REGISTRY_IMAGE/ci-opensuse-151:latest + needs: + - x64-opensuse-151-container before_script: - *script_variables script: @@ -483,6 +537,8 @@ codestyle: potfile: stage: builds image: $CI_REGISTRY_IMAGE/ci-centos-8:latest + needs: + - x64-centos-8-container only: - master before_script: