ci: use newer, slimmer cv-builder image

- Using the newest cv-builder image.
- Update pipeline jobs to use the pre-built binary.
- Remove aspell installation during testing stage.
This commit is contained in:
Dan Anglin 2020-09-13 23:30:08 +01:00
parent 84b29f0467
commit bf8ede4bde
Signed by: dananglin
GPG key ID: 0C1D44CFBEE68638

View file

@ -3,7 +3,7 @@
# Hidden job templates for CV build pipeline # # Hidden job templates for CV build pipeline #
#--------------------------------------------# #--------------------------------------------#
.use-cv-builder: .use-cv-builder:
image: ${IMAGE_NAME}:master-cb8a29c7 image: ${IMAGE_NAME}:master-84b29f04
.cv-default-job-rules: .cv-default-job-rules:
rules: rules:
@ -26,15 +26,12 @@
# Visible jobs for CV build pipeline # # Visible jobs for CV build pipeline #
#------------------------------------# #------------------------------------#
test:spellcheck: test:spellcheck:
before_script:
- apt-get update
- apt-get -y install aspell aspell-en
extends: extends:
- .cv-default-job-rules - .cv-default-job-rules
- .default-tags - .default-tags
- .use-cv-builder - .use-cv-builder
script: script:
- go run mage.go spellcheck - cv-make spellcheck
stage: test stage: test
test:pdf: test:pdf:
@ -43,7 +40,7 @@ test:pdf:
- .default-tags - .default-tags
- .use-cv-builder - .use-cv-builder
script: script:
- go run mage.go pdf - cv-make pdf
stage: test stage: test
build:pdf: build:pdf:
@ -63,7 +60,7 @@ build:pdf:
- if: '$CI_MERGE_REQUEST_IID' - if: '$CI_MERGE_REQUEST_IID'
when: always when: always
script: script:
- go run mage.go pdf - cv-make pdf
stage: build stage: build
build:pdf-for-publish: build:pdf-for-publish:
@ -83,7 +80,7 @@ build:pdf-for-publish:
- job: "test:pdf" - job: "test:pdf"
artifacts: false artifacts: false
script: script:
- go run mage.go pdf - cv-make pdf
- mv __output/cv.pdf ${RELEASE_CV_FILENAME} - mv __output/cv.pdf ${RELEASE_CV_FILENAME}
- echo "${CI_JOB_ID}" > build_job_id - echo "${CI_JOB_ID}" > build_job_id
stage: build stage: build
@ -123,7 +120,7 @@ publish:pdf:private:
- job: "test:pdf" - job: "test:pdf"
artifacts: false artifacts: false
script: script:
- go run mage.go pdf - cv-make pdf
- mv __output/cv.pdf ${CV_DEPLOY_DIR}/${RELEASE_CV_FILENAME} - mv __output/cv.pdf ${CV_DEPLOY_DIR}/${RELEASE_CV_FILENAME}
stage: publish stage: publish
variables: variables: