Browse Source

dont build docker image if we already have a cached copy of it.

sisyphus
Dustin Falgout 8 years ago
parent
commit
059f2db64d
  1. 1
      .gitignore
  2. 28
      build/utils.sh
  3. 6
      circle.yml

1
.gitignore vendored

@ -1,6 +1,7 @@
build/** build/**
!build/.gitignore !build/.gitignore
!build/ci/Dockerfile !build/ci/Dockerfile
!build/utils.sh
src/greeter-resources.h src/greeter-resources.h
src/config.h src/config.h
cmake-build-debug cmake-build-debug

28
build/utils.sh

@ -0,0 +1,28 @@
#!/bin/bash
combine_javascript_sources() {
cd "${MESON_SOURCE_ROOT}/src/gresource/js" && {
cat _vendor/moment-with-locales.min.js \
LightDMObjects.js \
Greeter.js \
GreeterConfig.js \
ThemeUtils.js \
ThemeHeartbeat.js > bundle.js
}
}
list_javascript_sources() {
cd "${MESON_SOURCE_ROOT}/src" && find gresource/js -type f -name '*.js' -print
}
case "$1" in
combine-js)
combine_javascript_sources
;;
get-js-files)
list_javascript_sources
;;
esac

6
circle.yml

@ -7,9 +7,9 @@ dependencies:
cache_directories: cache_directories:
- ~/docker - ~/docker
override: override:
- if [[ -e ~/docker/image.tar ]]; then docker load -i ~/docker/image.tar; fi - '[[ -e ~/docker/image.tar ]] && docker load -i ~/docker/image.tar'
- docker build --rm=false -t antergos/ci-ubuntu build/ci - '[[ -e ~/docker/image.tar ]] || docker build --rm=false -t antergos/ci-ubuntu build/ci'
- mkdir -p ~/docker; docker save antergos/ci-ubuntu > ~/docker/image.tar - '[[ -e ~/docker/image.tar ]] || mkdir -p ~/docker; docker save antergos/ci-ubuntu > ~/docker/image.tar'
test: test:
override: override:

Loading…
Cancel
Save