| Message ID | 20220826172128.353798-11-alex.bennee@linaro.org |
|---|---|
| State | Superseded |
| Headers | show |
| Series | testing updates and mips deprecation | expand |
On 26/08/2022 19.21, Alex Bennée wrote: > We missed removing this dependency when we flattened the build. > > Fixes: 39ce923732 (gitlab: enable a very minimal build with the tricore container) > Signed-off-by: Alex Bennée <alex.bennee@linaro.org> > --- > .gitlab-ci.d/container-cross.yml | 1 - > tests/docker/Makefile.include | 1 - > 2 files changed, 2 deletions(-) > > diff --git a/.gitlab-ci.d/container-cross.yml b/.gitlab-ci.d/container-cross.yml > index 67bbf19a27..611c6c0b39 100644 > --- a/.gitlab-ci.d/container-cross.yml > +++ b/.gitlab-ci.d/container-cross.yml > @@ -148,7 +148,6 @@ sparc64-debian-cross-container: > tricore-debian-cross-container: > extends: .container_job_template > stage: containers > - needs: ['amd64-debian10-container'] > variables: > NAME: debian-tricore-cross > > diff --git a/tests/docker/Makefile.include b/tests/docker/Makefile.include > index e034eca3af..5c9398bbc9 100644 > --- a/tests/docker/Makefile.include > +++ b/tests/docker/Makefile.include > @@ -132,7 +132,6 @@ docker-image-debian-nios2-cross: $(DOCKER_FILES_DIR)/debian-toolchain.docker \ > $(call debian-toolchain, $@) > > # Specialist build images, sometimes very limited tools > -docker-image-debian-tricore-cross: docker-image-debian10 > docker-image-debian-all-test-cross: docker-image-debian10 > docker-image-debian-loongarch-cross: docker-image-debian11 > docker-image-debian-microblaze-cross: docker-image-debian10 Fixes: 39ce923732 ("gitlab: enable a very minimal build with the tricore container") Could this be updated to Bullseye, too? Thomas
diff --git a/.gitlab-ci.d/container-cross.yml b/.gitlab-ci.d/container-cross.yml index 67bbf19a27..611c6c0b39 100644 --- a/.gitlab-ci.d/container-cross.yml +++ b/.gitlab-ci.d/container-cross.yml @@ -148,7 +148,6 @@ sparc64-debian-cross-container: tricore-debian-cross-container: extends: .container_job_template stage: containers - needs: ['amd64-debian10-container'] variables: NAME: debian-tricore-cross diff --git a/tests/docker/Makefile.include b/tests/docker/Makefile.include index e034eca3af..5c9398bbc9 100644 --- a/tests/docker/Makefile.include +++ b/tests/docker/Makefile.include @@ -132,7 +132,6 @@ docker-image-debian-nios2-cross: $(DOCKER_FILES_DIR)/debian-toolchain.docker \ $(call debian-toolchain, $@) # Specialist build images, sometimes very limited tools -docker-image-debian-tricore-cross: docker-image-debian10 docker-image-debian-all-test-cross: docker-image-debian10 docker-image-debian-loongarch-cross: docker-image-debian11 docker-image-debian-microblaze-cross: docker-image-debian10
We missed removing this dependency when we flattened the build. Fixes: 39ce923732 (gitlab: enable a very minimal build with the tricore container) Signed-off-by: Alex Bennée <alex.bennee@linaro.org> --- .gitlab-ci.d/container-cross.yml | 1 - tests/docker/Makefile.include | 1 - 2 files changed, 2 deletions(-)