Skip to content

Commit

Permalink
Only build xz images on tag build, fixes #801 (#802)
Browse files Browse the repository at this point in the history
  • Loading branch information
rfay committed Apr 30, 2018
1 parent 8a644dd commit 1b407e5
Show file tree
Hide file tree
Showing 2 changed files with 6 additions and 4 deletions.
7 changes: 5 additions & 2 deletions .circleci/config.yml
Original file line number Diff line number Diff line change
Expand Up @@ -113,9 +113,12 @@ jobs:
command: bin/linux/ddev version
name: ddev version information

# We only build the xz version of the docker images on tag build.
- run:
command: ./.circleci/generate_artifacts.sh $ARTIFACTS
name: tar/zip up artifacts and make hashes
command: |
./.circleci/generate_artifacts.sh $ARTIFACTS
xz $ARTIFACTS/ddev_docker_images.*.tar
name: tar/zip/xz up artifacts and make hashes
no_output_timeout: "20m"

- store_artifacts:
Expand Down
3 changes: 1 addition & 2 deletions .circleci/generate_artifacts.sh
Original file line number Diff line number Diff line change
Expand Up @@ -15,7 +15,6 @@ for item in $(cat /tmp/images.txt); do
done
docker save -o $ARTIFACTS/ddev_docker_images.$VERSION.tar $(cat /tmp/images.txt)
gzip --keep $ARTIFACTS/ddev_docker_images.$VERSION.tar
xz $ARTIFACTS/ddev_docker_images.$VERSION.tar

# Generate and place extra items like autocomplete
bin/linux/ddev_gen_autocomplete
Expand All @@ -40,6 +39,6 @@ zip $ARTIFACTS/ddev_windows.$VERSION.zip ddev.exe ddev_bash_completion.sh

# Create the sha256 files
cd $ARTIFACTS
for item in *.tar.gz *.zip ddev_docker_images.$VERSION.tar.gz ddev_docker_images.$VERSION.tar.xz; do
for item in *.*; do
sha256sum $item > $item.sha256.txt
done

0 comments on commit 1b407e5

Please sign in to comment.