Skip to content

Commit cdd8a2b

Browse files
committed
Merge branch 'feature/generate-schematic-pdfs-in-build' into 'master'
Feature/generate schematic pdfs in build /tag v0.0.5 "Added the ability to generate schematic PDFs in the gitlab and travis-ci builds." See merge request dowster/e28-cluster!2
2 parents 047f1ab + e756b56 commit cdd8a2b

File tree

2 files changed

+16
-6
lines changed

2 files changed

+16
-6
lines changed

.gitlab-ci.yml

+14-4
Original file line numberDiff line numberDiff line change
@@ -1,20 +1,30 @@
1-
# Currently using IDF v4.0 supplied from Espressif.
2-
image: espressif/idf:release-v4.0
1+
32

43
# Since I have at least one submodule in this project I want to make sure it's cloned.
54
variables:
65
GIT_SUBMODULE_STRATEGY: recursive
76

8-
build:
7+
build-code:
8+
# Currently using IDF v4.0 supplied from Espressif.
9+
image: espressif/idf:release-v4.0
910
stage: build
1011
script:
1112
- cd code
1213
- idf.py build
13-
- tar -zcf ../e28-cluster-${CI_COMMIT_REF_SLUG}-${CI_CONCURRENT_PROJECT_ID}.tar.gz build
14+
- tar -zcf ../e28-cluster-${CI_COMMIT_REF_SLUG}-${CI_PIPELINE_ID}.tar.gz build
1415
artifacts:
1516
paths:
1617
- e28-cluster-*.tar.gz
1718
- code/build/partition_table/partition-table.bin
1819
- code/build/bootloader/bootloader.bin
1920
- code/build/e28-cluster.bin
2021

22+
build-schematics:
23+
stage: build
24+
image: registry.gitlab.com/dowster/eeshow:latest
25+
script:
26+
- cd pcb-design
27+
- eeplot -o ../pcb-design-${CI_COMMIT_REF_SLUG}-${CI_PIPELINE_ID}.pdf schematic.pro
28+
artifacts:
29+
paths:
30+
- pcb-design-${CI_COMMIT_REF_SLUG}-${CI_PIPELINE_ID}.pdf

.travis.yml

+2-2
Original file line numberDiff line numberDiff line change
@@ -6,9 +6,9 @@ services:
66

77
script:
88
- docker run --rm -v $PWD/code:/project -w /project espressif/idf:release-v4.0 idf.py build
9-
9+
- docker run --rm -v $PWD/pcb-design:/project -w /project registry.gitlab.com/dowster/eeshow:latest eeplot -o pcb-design-${TRAVIS_TAG}-${TRAVIS_BUILD_NUMBER}.pdf schematic.pro
1010
before_deploy:
11-
- tar -zcf e28-cluster-${TRAVIS_TAG}-${TRAVIS_BUILD_NUMBER}.tar.gz code/build
11+
- tar -zcf e28-cluster-${TRAVIS_TAG}-${TRAVIS_BUILD_NUMBER}.tar.gz code/build pcb-design/pcb-design-${TRAVIS_TAG}-${TRAVIS_BUILD_NUMBER}.pdf
1212

1313
deploy:
1414
provider: releases

0 commit comments

Comments
 (0)