Commit ea0588f8 authored by Eric Timmons's avatar Eric Timmons
Browse files

Tweak which Docker images are used

For CL, use images from clfoundation/ instead of mitmers/. The source code for
these images is found at https://gitlab.common-lisp.net/cl-docker-images/

For other tasks, use buildpack-deps. This image has git and make already
installed, additionally the CL images are based on buildpack-deps. This should
speed up jobs somewhat since fewer packages need to be installed.
parent 26b24b37
Pipeline #2128 failed with stages
in 21 minutes and 40 seconds
...@@ -30,10 +30,8 @@ stages: ...@@ -30,10 +30,8 @@ stages:
Build ASDF: Build ASDF:
stage: build stage: build
image: debian:latest image: buildpack-deps:latest
script: script:
- apt-get update
- apt-get install -y --no-install-recommends git make
- make - make
artifacts: artifacts:
paths: paths:
...@@ -41,10 +39,10 @@ Build ASDF: ...@@ -41,10 +39,10 @@ Build ASDF:
Build docs: Build docs:
stage: build stage: build
image: debian:latest image: buildpack-deps:buster
script: script:
- apt-get update - apt-get update
- apt-get install -y --no-install-recommends git make texinfo texlive - apt-get install -y --no-install-recommends texinfo texlive
- make -C doc - make -C doc
artifacts: artifacts:
paths: paths:
...@@ -54,10 +52,8 @@ Build docs: ...@@ -54,10 +52,8 @@ Build docs:
Build asdf-tools: Build asdf-tools:
stage: build stage: build
image: mitmers/sbcl:latest image: clfoundation/sbcl:latest
script: script:
- apt-get update
- apt-get install -y --no-install-recommends git make
- make -f Makefile-lisp-scripting build-asdf-tools - make -f Makefile-lisp-scripting build-asdf-tools
artifacts: artifacts:
paths: paths:
...@@ -71,12 +67,10 @@ Build asdf-tools: ...@@ -71,12 +67,10 @@ Build asdf-tools:
.Regression tests: .Regression tests:
stage: regression stage: regression
image: mitmers/$l:$TAG image: clfoundation/$l:$TAG
variables: variables:
TAG: latest TAG: latest
script: script:
- apt-get update
- apt-get install -y --no-install-recommends git make
- make - make
- make test - make test
artifacts: artifacts:
...@@ -86,12 +80,10 @@ Build asdf-tools: ...@@ -86,12 +80,10 @@ Build asdf-tools:
.Upgrade tests: .Upgrade tests:
stage: upgrade stage: upgrade
image: mitmers/$l:$TAG image: clfoundation/$l:$TAG
variables: variables:
TAG: latest TAG: latest
script: script:
- apt-get update
- apt-get install -y --no-install-recommends git make
- make - make
- make test-upgrade - make test-upgrade
artifacts: artifacts:
......
Supports Markdown
0% or .
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment