From 327c910032d32335d9f008cbd453066f3e7cbefe Mon Sep 17 00:00:00 2001 From: icehess Date: Thu, 17 Oct 2019 12:34:02 -0700 Subject: [PATCH] [master] removing travis-ci (#6096) * upload coverage report in circleci and add description for circeleci steps * we don't need travis anymore * use the new 2600hz docker image * invalidate cache if erlang version is changed, also revert .kz_deps_hash * remove superfluous step * show which command is running for code checks * update erlang in apps circelci config files * show what your are doing code_checks --- .circleci/config.yml | 180 +++++++++++++----- .travis.yml | 37 ---- Makefile | 11 +- applications/acdc/.circleci/config.yml | 40 ++-- applications/ananke/.circleci/config.yml | 40 ++-- applications/blackhole/.circleci/config.yml | 40 ++-- applications/braintree/.circleci/config.yml | 40 ++-- .../call_inspector/.circleci/config.yml | 40 ++-- applications/callflow/.circleci/config.yml | 40 ++-- applications/camper/.circleci/config.yml | 40 ++-- applications/cccp/.circleci/config.yml | 40 ++-- applications/cdr/.circleci/config.yml | 40 ++-- applications/conference/.circleci/config.yml | 40 ++-- applications/crossbar/.circleci/config.yml | 40 ++-- applications/doodle/.circleci/config.yml | 40 ++-- applications/ecallmgr/.circleci/config.yml | 40 ++-- applications/edr/.circleci/config.yml | 40 ++-- applications/fax/.circleci/config.yml | 40 ++-- applications/frontier/.circleci/config.yml | 40 ++-- applications/hangups/.circleci/config.yml | 40 ++-- applications/hotornot/.circleci/config.yml | 40 ++-- applications/jonny5/.circleci/config.yml | 40 ++-- applications/konami/.circleci/config.yml | 40 ++-- applications/media_mgr/.circleci/config.yml | 40 ++-- applications/milliwatt/.circleci/config.yml | 40 ++-- applications/notify/.circleci/config.yml | 40 ++-- .../omnipresence/.circleci/config.yml | 40 ++-- applications/pivot/.circleci/config.yml | 40 ++-- applications/pusher/.circleci/config.yml | 40 ++-- applications/registrar/.circleci/config.yml | 40 ++-- applications/reorder/.circleci/config.yml | 40 ++-- applications/skel/.circleci/config.yml | 40 ++-- applications/spyvsspy/.circleci/config.yml | 40 ++-- applications/stats/.circleci/config.yml | 40 ++-- applications/stepswitch/.circleci/config.yml | 40 ++-- applications/sysconf/.circleci/config.yml | 40 ++-- applications/tasks/.circleci/config.yml | 40 ++-- applications/teletype/.circleci/config.yml | 40 ++-- applications/trunkstore/.circleci/config.yml | 40 ++-- applications/webhooks/.circleci/config.yml | 40 ++-- scripts/cover.escript | 15 +- 41 files changed, 894 insertions(+), 829 deletions(-) delete mode 100644 .travis.yml diff --git a/.circleci/config.yml b/.circleci/config.yml index b804758a289..aab6b721844 100644 --- a/.circleci/config.yml +++ b/.circleci/config.yml @@ -2,12 +2,18 @@ version: 2 workflows: version: 2 - build-analyze-run: + build_branch: jobs: - setup - - build: + - build_deps: requires: - setup + - build: + requires: + - build_deps + - eunit_tests: + requires: + - build_deps - checks: requires: - build @@ -23,7 +29,7 @@ workflows: defaults: &defaults docker: - - image: offical2600hz/circleci:21.3.8 + - image: offical2600hz/circleci:21.3.8.8 working_directory: ~/2600hz/kazoo shell: /bin/bash --login environment: @@ -34,28 +40,39 @@ jobs: <<: *defaults steps: - checkout - - run: make changed + - run: + name: Listing Changes + command: make changed - persist_to_workspace: root: . paths: - . - build: + build_deps: <<: *defaults steps: - attach_workspace: at: . - restore_cache: keys: - - deps-erl21-v1-{{ checksum "make/deps.mk" }} - - run: | - deps_hash=$(md5sum make/deps.mk | cut -d" " -f1) - if [ x"$(cat .git/.kz_deps_hash)" = x"$deps_hash" ]; then - touch "make/.deps.mk.$deps_hash" - fi - - run: JOBS="2" make - - run: echo -n $(md5sum make/deps.mk | cut -d" " -f1) > .git/.kz_deps_hash + - deps-v1-{{ checksum "make/deps.mk" }}-{{ checksum "/usr/local/lib/erlang/releases/RELEASES" }} + - run: + name: Calculating dependency hash for CircleCI cache + command: | + deps_hash=$(md5sum make/deps.mk | cut -d" " -f1) + if [ x"$(cat .git/.kz_deps_hash)" = x"$deps_hash" ]; then + touch "make/.deps.mk.$deps_hash" + fi + echo -n $(md5sum make/deps.mk | cut -d" " -f1) > ".git/.kz_deps_hash" + - run: + name: Show dependency hash + command: | + md5sum make/deps.mk || true + ls -al make || true + - run: + name: Making dependencies + command : make deps - save_cache: - key: deps-erl21-v1-{{ checksum "make/deps.mk" }} + key: deps-v1-{{ checksum "make/deps.mk" }}-{{ checksum "/usr/local/lib/erlang/releases/RELEASES" }} paths: - deps/ - .git/.kz_deps_hash @@ -63,32 +80,90 @@ jobs: root: . paths: - . + build: + <<: *defaults + steps: + - attach_workspace: + at: . + - restore_cache: + keys: + - deps-v1-{{ checksum "make/deps.mk" }}-{{ checksum "/usr/local/lib/erlang/releases/RELEASES" }} + - run: + name: Compiling the project + command: JOBS="2" make + - persist_to_workspace: + root: . + paths: + - . + eunit_tests: + <<: *defaults + steps: + - attach_workspace: + at: . + - restore_cache: + keys: + - deps-v1-{{ checksum "make/deps.mk" }}-{{ checksum "/usr/local/lib/erlang/releases/RELEASES" }} + - run: + name: Compiling for unit test enviornment + command: ERLC_OPTS='-DPROPER' make compile-test + - run: + name: Running Eunit/Proper tests + command: make eunit + - run: + name: Uploading Coverage Report + command: make coverage-report checks: <<: *defaults steps: - attach_workspace: at: . - - run: make fmt - - run: make code_checks - - run: make app_applications - - run: make xref - - run: make sup_completion - - run: make elvis - - run: ${PWD}/scripts/check-unstaged.bash - + - run: + name: Running code formatter + command: make fmt + - run: + name: Running code checks + command: make code_checks + - run: + name: Making app applications + command: make app_applications + - run: + name: Generating sup bash completion file + command: make sup_completion + - run: + name: Running xref check + command: make xref + - run: + name: Running Elvis code style check + command: make elvis + - run: + name: Checking for unstaged files + command: scripts/check-unstaged.bash docs: <<: *defaults steps: - attach_workspace: at: . - - run: make apis - - run: make validate-js - - run: make validate-schemas - - run: make docs - - run: ./scripts/state-of-docs.sh || true - - run: ./scripts/state-of-edoc.escript - - run: ${PWD}/scripts/check-unstaged.bash - + - run: + name: Generating APIs + command: make apis + - run: + name: Validating CouchDB view files + command: make validate-js + - run: + name: Validating schemas + command: make validate-schemas + - run: + name: Generating docs + command: make docs || true + - run: + name: Checking doc states + command: scripts/state-of-docs.sh || true + - run: + name: Checking EDoc states + command: scripts/state-of-edoc.escript + - run: + name: Checking for unstaged files + command: scripts/check-unstaged.bash analyze: <<: *defaults steps: @@ -96,18 +171,19 @@ jobs: at: . - restore_cache: keys: - - plt-erl21-v1-{{ checksum "make/deps.mk" }} - - run: make build-plt dialyze-changed + - plt-v1-{{ checksum "~/2600hz/kazoo/make/deps.mk" }}-{{ checksum "/usr/local/lib/erlang/releases/RELEASES" }} + - run: + name: Dailyzing changed Erlang files + command: make build-plt dialyze-changed - save_cache: - key: plt-erl21-v1-{{ checksum "make/deps.mk" }} + key: plt-v1-{{ checksum "make/deps.mk" }}-{{ checksum "/usr/local/lib/erlang/releases/RELEASES" }} paths: - .kazoo.plt - release: <<: *defaults docker: - - image: offical2600hz/circleci:21.3.8 - - image: couchdb:2.1.1 + - image: offical2600hz/circleci:21.3.8.8 + - image: couchdb:2.3.1 - image: 2600hz/rabbitmq environment: CIRCLE_ARTIFACTS: /tmp/circleci-artifacts @@ -115,15 +191,27 @@ jobs: steps: - attach_workspace: at: . - - run: mkdir -p $CIRCLE_ARTIFACTS - - run: make build-ci-release - - run: KAZOO_CONFIG=${PWD}/rel/ci.config.ini REL="kazoo_apps" ACT="console" NODE_NAME_TYPE="-sname" make release - - run: cp ${PWD}/rel/ci.relx.config $CIRCLE_ARTIFACTS/ - - run: find ${PWD}/_rel/kazoo/releases -name kazoo.rel -exec cp {} $CIRCLE_ARTIFACTS/ \; + - run: + name: Creating artifacts directory + command: mkdir -p $CIRCLE_ARTIFACTS + - run: + name: Making CI release + command: make build-ci-release + - run: + name: Running Kazoo release + command: KAZOO_CONFIG=${PWD}/rel/ci.config.ini REL="kazoo_apps" ACT="console" NODE_NAME_TYPE="-sname" make release + - run: + name: Copying Relx config artifacts + command: cp ${PWD}/rel/ci.relx.config $CIRCLE_ARTIFACTS/ + - run: + name: Copying release Artifacts + command: find ${PWD}/_rel/kazoo/releases -name kazoo.rel -exec cp {} $CIRCLE_ARTIFACTS/ \; - store_artifacts: path: /tmp/circleci-artifacts - - run: | - if [[ $(grep -c -v -F 'exit with reason shutdown' ${CIRCLE_ARTIFACTS}/log/error.log) -gt 0 ]]; then - cat ${CIRCLE_ARTIFACTS}/log/error.log - exit 1 - fi + - run: + name: Checking for errors + command: | + if [[ $(grep -c -v -F 'exit with reason shutdown' ${CIRCLE_ARTIFACTS}/log/error.log) -gt 0 ]]; then + cat ${CIRCLE_ARTIFACTS}/log/error.log + exit 1 + fi diff --git a/.travis.yml b/.travis.yml deleted file mode 100644 index e4f5f7ebd81..00000000000 --- a/.travis.yml +++ /dev/null @@ -1,37 +0,0 @@ -language: erlang -notifications: - email: - - engineering@2600hz.com - - operations@2600hz.com - -otp_release: - - 21.3.8 - -# Lots of issues with erlang:get_stacktrace/0-related deprecations - going to take a while to unravel all this jazz - -sudo: required - -addons: - apt: - packages: - - xsltproc - - libreoffice - - libtiff-tools - - ghostscript - -cache: - apt: true - -before_install: - - set -e - -before_script: - - kerl list installations - -script: - - ERLC_OPTS='-DPROPER' make compile-test - - make eunit -# To run tests yourself: make compile-test && make test - -after_success: - - if [[ "$TRAVIS_REPO_SLUG" == '2600hz/kazoo' ]]; then make coverage-report; fi diff --git a/Makefile b/Makefile index 796bcc68678..977dfc3b531 100644 --- a/Makefile +++ b/Makefile @@ -307,14 +307,23 @@ app_applications: ERL_LIBS=deps:core:applications $(ROOT)/scripts/apps_of_app.escript -a $(shell find applications -name *.app.src) code_checks: + @printf ":: Check for copyright year\n\n" @$(ROOT)/scripts/bump-copyright-year.sh $(CHANGED_ERL) - @$(ROOT)/scripts/code_checks.bash $(CHANGED) + @printf "\n:: Check code\n\n" + @$(ROOT)/scripts/code_checks.bash $(CHANGED_ERL) + @printf "\n:: Check for raw JSON usage\n\n" @ERL_LIBS=deps:core:applications $(ROOT)/scripts/no_raw_json.escript $(CHANGED_ERL) + @printf "\n:: Check for spelling\n\n" @$(ROOT)/scripts/check-spelling.bash + @printf "\n:: Check for Kazoo diaspora\n\n" @$(ROOT)/scripts/kz_diaspora.bash + @printf "\n:: Check for Edoc\n\n" @$(ROOT)/scripts/edocify.escript + @printf "\n:: Check for Kazoo document accessors\n\n" @$(ROOT)/scripts/kzd_module_check.bash + @printf "\n:: Check for proper log message usage\n\n" @$(ROOT)/scripts/check-loglines.bash + @printf "\n:: Check for Erlang 21 new stacktrace syntax\n\n" @$(ROOT)/scripts/check-stacktrace.py $(CHANGED_ERL) .PHONY: raw_json_check diff --git a/applications/acdc/.circleci/config.yml b/applications/acdc/.circleci/config.yml index e2bc33a029e..938c7c142ac 100644 --- a/applications/acdc/.circleci/config.yml +++ b/applications/acdc/.circleci/config.yml @@ -2,7 +2,7 @@ version: 2 workflows: version: 2 - build-branch: + build_branch: jobs: - setup - build_deps: @@ -117,7 +117,7 @@ workflows: defaults: &defaults docker: - - image: offical2600hz/circleci:21.3.8 + - image: offical2600hz/circleci:21.3.8.8 shell: /bin/bash --login working_directory: ~/2600hz/the_app environment: @@ -185,9 +185,9 @@ jobs: at: ~/ - restore_cache: keys: - - deps-21-v3.2-{{ checksum "~/2600hz/kazoo/make/deps.mk" }} + - deps-v1-{{ checksum "~/2600hz/kazoo/make/deps.mk" }}-{{ checksum "/usr/local/lib/erlang/releases/RELEASES" }} - run: - name: Calculating dependency hash + name: Calculating dependency hash for CircleCI cache command: | deps_hash=$(md5sum $KAZOO_ROOT/make/deps.mk | cut -d" " -f1) if [ x"$(cat $KAZOO_ROOT/.git/.kz_deps_hash)" = x"$deps_hash" ]; then @@ -196,11 +196,16 @@ jobs: echo -n $(md5sum $KAZOO_ROOT/make/deps.mk | cut -d" " -f1) > "$KAZOO_ROOT/.git/.kz_deps_hash" md5sum $KAZOO_ROOT/make/deps.mk || true ls -al $KAZOO_ROOT/make || true + - run: + name: Show dependency hash + command: | + md5sum make/deps.mk || true + ls -al make || true - run: name: Making deps command: make -C ${KAZOO_ROOT} deps - save_cache: - key: deps-21-v3.2-{{ checksum "~/2600hz/kazoo/make/deps.mk" }} + key: deps-v1-{{ checksum "~/2600hz/kazoo/make/deps.mk" }}-{{ checksum "/usr/local/lib/erlang/releases/RELEASES" }} paths: - ~/2600hz/kazoo/deps/ - ~/2600hz/kazoo/.git/.kz_deps_hash @@ -216,12 +221,10 @@ jobs: at: ~/ - restore_cache: keys: - - deps-21-v3.2-{{ checksum "~/2600hz/kazoo/make/deps.mk" }} - - run: | - md5sum $KAZOO_ROOT/make/deps.mk || true - ls -al $KAZOO_ROOT/make || true - - run: make -C ${KAZOO_ROOT} fmt - - run: JOBS="2" make -C ${KAZOO_ROOT} + - deps-v1-{{ checksum "~/2600hz/kazoo/make/deps.mk" }}-{{ checksum "/usr/local/lib/erlang/releases/RELEASES" }} + - run: + name: Compiling the project + command: JOBS="2" make -C ${KAZOO_ROOT} - persist_to_workspace: root: ~/ paths: @@ -234,7 +237,7 @@ jobs: at: ~/ - restore_cache: keys: - - deps-21-v3.2-{{ checksum "~/2600hz/kazoo/make/deps.mk" }} + - deps-v1-{{ checksum "~/2600hz/kazoo/make/deps.mk" }}-{{ checksum "/usr/local/lib/erlang/releases/RELEASES" }} - run: name: Displaying deps hash command: | @@ -258,9 +261,6 @@ jobs: - run: name: Running code checks command: make -C ${KAZOO_ROOT} code_checks - - run: - name: Running additional code style checks - command: ${KAZOO_ROOT}/scripts/code_checks.bash $CHANGED - run: name: Checking app source file command: make -C ${KAZOO_ROOT} app_applications @@ -311,19 +311,19 @@ jobs: at: ~/ - restore_cache: keys: - - plt-21-v3.1-{{ checksum "~/2600hz/kazoo/make/deps.mk" }} + - plt-v1-{{ checksum "~/2600hz/kazoo/make/deps.mk" }}-{{ checksum "/usr/local/lib/erlang/releases/RELEASES" }} - run: name: Dailyzing changed Erlang files command: TO_DIALYZE="$(echo $CHANGED)" make -C ${KAZOO_ROOT} build-plt dialyze - save_cache: - key: plt-21-v3.1-{{ checksum "~/2600hz/kazoo/make/deps.mk" }} + key: plt-v1-{{ checksum "~/2600hz/kazoo/make/deps.mk" }}-{{ checksum "/usr/local/lib/erlang/releases/RELEASES" }} paths: - ~/2600hz/kazoo/.kazoo.plt release: <<: *defaults docker: - - image: offical2600hz/circleci:21.3.8 + - image: offical2600hz/circleci:21.3.8.8 - image: couchdb:2.3.1 - image: 2600hz/rabbitmq steps: @@ -407,7 +407,7 @@ jobs: command: ${KAZOO_ROOT}/scripts/circleci.bash - restore_cache: keys: - - deps-centos-21-v3.2-{{ checksum "~/2600hz/kazoo/make/deps.mk" }} + - deps-centos-v1-{{ checksum "~/2600hz/kazoo/make/deps.mk" }}-{{ checksum "/usr/local/lib/erlang/releases/RELEASES" }} - run: name: Preparing dependencies for CentOS7 command: | @@ -423,7 +423,7 @@ jobs: ls -al $KAZOO_ROOT/make || true make -C ${KAZOO_ROOT} deps - save_cache: - key: deps-centos-21-v3.2-{{ checksum "~/2600hz/kazoo/make/deps.mk" }} + key: deps-centos-v1-{{ checksum "~/2600hz/kazoo/make/deps.mk" }}-{{ checksum "/usr/local/lib/erlang/releases/RELEASES" }} paths: - ~/2600hz/kazoo/deps/ - ~/2600hz/kazoo/.git/.kz_deps_hash diff --git a/applications/ananke/.circleci/config.yml b/applications/ananke/.circleci/config.yml index e2bc33a029e..938c7c142ac 100644 --- a/applications/ananke/.circleci/config.yml +++ b/applications/ananke/.circleci/config.yml @@ -2,7 +2,7 @@ version: 2 workflows: version: 2 - build-branch: + build_branch: jobs: - setup - build_deps: @@ -117,7 +117,7 @@ workflows: defaults: &defaults docker: - - image: offical2600hz/circleci:21.3.8 + - image: offical2600hz/circleci:21.3.8.8 shell: /bin/bash --login working_directory: ~/2600hz/the_app environment: @@ -185,9 +185,9 @@ jobs: at: ~/ - restore_cache: keys: - - deps-21-v3.2-{{ checksum "~/2600hz/kazoo/make/deps.mk" }} + - deps-v1-{{ checksum "~/2600hz/kazoo/make/deps.mk" }}-{{ checksum "/usr/local/lib/erlang/releases/RELEASES" }} - run: - name: Calculating dependency hash + name: Calculating dependency hash for CircleCI cache command: | deps_hash=$(md5sum $KAZOO_ROOT/make/deps.mk | cut -d" " -f1) if [ x"$(cat $KAZOO_ROOT/.git/.kz_deps_hash)" = x"$deps_hash" ]; then @@ -196,11 +196,16 @@ jobs: echo -n $(md5sum $KAZOO_ROOT/make/deps.mk | cut -d" " -f1) > "$KAZOO_ROOT/.git/.kz_deps_hash" md5sum $KAZOO_ROOT/make/deps.mk || true ls -al $KAZOO_ROOT/make || true + - run: + name: Show dependency hash + command: | + md5sum make/deps.mk || true + ls -al make || true - run: name: Making deps command: make -C ${KAZOO_ROOT} deps - save_cache: - key: deps-21-v3.2-{{ checksum "~/2600hz/kazoo/make/deps.mk" }} + key: deps-v1-{{ checksum "~/2600hz/kazoo/make/deps.mk" }}-{{ checksum "/usr/local/lib/erlang/releases/RELEASES" }} paths: - ~/2600hz/kazoo/deps/ - ~/2600hz/kazoo/.git/.kz_deps_hash @@ -216,12 +221,10 @@ jobs: at: ~/ - restore_cache: keys: - - deps-21-v3.2-{{ checksum "~/2600hz/kazoo/make/deps.mk" }} - - run: | - md5sum $KAZOO_ROOT/make/deps.mk || true - ls -al $KAZOO_ROOT/make || true - - run: make -C ${KAZOO_ROOT} fmt - - run: JOBS="2" make -C ${KAZOO_ROOT} + - deps-v1-{{ checksum "~/2600hz/kazoo/make/deps.mk" }}-{{ checksum "/usr/local/lib/erlang/releases/RELEASES" }} + - run: + name: Compiling the project + command: JOBS="2" make -C ${KAZOO_ROOT} - persist_to_workspace: root: ~/ paths: @@ -234,7 +237,7 @@ jobs: at: ~/ - restore_cache: keys: - - deps-21-v3.2-{{ checksum "~/2600hz/kazoo/make/deps.mk" }} + - deps-v1-{{ checksum "~/2600hz/kazoo/make/deps.mk" }}-{{ checksum "/usr/local/lib/erlang/releases/RELEASES" }} - run: name: Displaying deps hash command: | @@ -258,9 +261,6 @@ jobs: - run: name: Running code checks command: make -C ${KAZOO_ROOT} code_checks - - run: - name: Running additional code style checks - command: ${KAZOO_ROOT}/scripts/code_checks.bash $CHANGED - run: name: Checking app source file command: make -C ${KAZOO_ROOT} app_applications @@ -311,19 +311,19 @@ jobs: at: ~/ - restore_cache: keys: - - plt-21-v3.1-{{ checksum "~/2600hz/kazoo/make/deps.mk" }} + - plt-v1-{{ checksum "~/2600hz/kazoo/make/deps.mk" }}-{{ checksum "/usr/local/lib/erlang/releases/RELEASES" }} - run: name: Dailyzing changed Erlang files command: TO_DIALYZE="$(echo $CHANGED)" make -C ${KAZOO_ROOT} build-plt dialyze - save_cache: - key: plt-21-v3.1-{{ checksum "~/2600hz/kazoo/make/deps.mk" }} + key: plt-v1-{{ checksum "~/2600hz/kazoo/make/deps.mk" }}-{{ checksum "/usr/local/lib/erlang/releases/RELEASES" }} paths: - ~/2600hz/kazoo/.kazoo.plt release: <<: *defaults docker: - - image: offical2600hz/circleci:21.3.8 + - image: offical2600hz/circleci:21.3.8.8 - image: couchdb:2.3.1 - image: 2600hz/rabbitmq steps: @@ -407,7 +407,7 @@ jobs: command: ${KAZOO_ROOT}/scripts/circleci.bash - restore_cache: keys: - - deps-centos-21-v3.2-{{ checksum "~/2600hz/kazoo/make/deps.mk" }} + - deps-centos-v1-{{ checksum "~/2600hz/kazoo/make/deps.mk" }}-{{ checksum "/usr/local/lib/erlang/releases/RELEASES" }} - run: name: Preparing dependencies for CentOS7 command: | @@ -423,7 +423,7 @@ jobs: ls -al $KAZOO_ROOT/make || true make -C ${KAZOO_ROOT} deps - save_cache: - key: deps-centos-21-v3.2-{{ checksum "~/2600hz/kazoo/make/deps.mk" }} + key: deps-centos-v1-{{ checksum "~/2600hz/kazoo/make/deps.mk" }}-{{ checksum "/usr/local/lib/erlang/releases/RELEASES" }} paths: - ~/2600hz/kazoo/deps/ - ~/2600hz/kazoo/.git/.kz_deps_hash diff --git a/applications/blackhole/.circleci/config.yml b/applications/blackhole/.circleci/config.yml index e2bc33a029e..938c7c142ac 100644 --- a/applications/blackhole/.circleci/config.yml +++ b/applications/blackhole/.circleci/config.yml @@ -2,7 +2,7 @@ version: 2 workflows: version: 2 - build-branch: + build_branch: jobs: - setup - build_deps: @@ -117,7 +117,7 @@ workflows: defaults: &defaults docker: - - image: offical2600hz/circleci:21.3.8 + - image: offical2600hz/circleci:21.3.8.8 shell: /bin/bash --login working_directory: ~/2600hz/the_app environment: @@ -185,9 +185,9 @@ jobs: at: ~/ - restore_cache: keys: - - deps-21-v3.2-{{ checksum "~/2600hz/kazoo/make/deps.mk" }} + - deps-v1-{{ checksum "~/2600hz/kazoo/make/deps.mk" }}-{{ checksum "/usr/local/lib/erlang/releases/RELEASES" }} - run: - name: Calculating dependency hash + name: Calculating dependency hash for CircleCI cache command: | deps_hash=$(md5sum $KAZOO_ROOT/make/deps.mk | cut -d" " -f1) if [ x"$(cat $KAZOO_ROOT/.git/.kz_deps_hash)" = x"$deps_hash" ]; then @@ -196,11 +196,16 @@ jobs: echo -n $(md5sum $KAZOO_ROOT/make/deps.mk | cut -d" " -f1) > "$KAZOO_ROOT/.git/.kz_deps_hash" md5sum $KAZOO_ROOT/make/deps.mk || true ls -al $KAZOO_ROOT/make || true + - run: + name: Show dependency hash + command: | + md5sum make/deps.mk || true + ls -al make || true - run: name: Making deps command: make -C ${KAZOO_ROOT} deps - save_cache: - key: deps-21-v3.2-{{ checksum "~/2600hz/kazoo/make/deps.mk" }} + key: deps-v1-{{ checksum "~/2600hz/kazoo/make/deps.mk" }}-{{ checksum "/usr/local/lib/erlang/releases/RELEASES" }} paths: - ~/2600hz/kazoo/deps/ - ~/2600hz/kazoo/.git/.kz_deps_hash @@ -216,12 +221,10 @@ jobs: at: ~/ - restore_cache: keys: - - deps-21-v3.2-{{ checksum "~/2600hz/kazoo/make/deps.mk" }} - - run: | - md5sum $KAZOO_ROOT/make/deps.mk || true - ls -al $KAZOO_ROOT/make || true - - run: make -C ${KAZOO_ROOT} fmt - - run: JOBS="2" make -C ${KAZOO_ROOT} + - deps-v1-{{ checksum "~/2600hz/kazoo/make/deps.mk" }}-{{ checksum "/usr/local/lib/erlang/releases/RELEASES" }} + - run: + name: Compiling the project + command: JOBS="2" make -C ${KAZOO_ROOT} - persist_to_workspace: root: ~/ paths: @@ -234,7 +237,7 @@ jobs: at: ~/ - restore_cache: keys: - - deps-21-v3.2-{{ checksum "~/2600hz/kazoo/make/deps.mk" }} + - deps-v1-{{ checksum "~/2600hz/kazoo/make/deps.mk" }}-{{ checksum "/usr/local/lib/erlang/releases/RELEASES" }} - run: name: Displaying deps hash command: | @@ -258,9 +261,6 @@ jobs: - run: name: Running code checks command: make -C ${KAZOO_ROOT} code_checks - - run: - name: Running additional code style checks - command: ${KAZOO_ROOT}/scripts/code_checks.bash $CHANGED - run: name: Checking app source file command: make -C ${KAZOO_ROOT} app_applications @@ -311,19 +311,19 @@ jobs: at: ~/ - restore_cache: keys: - - plt-21-v3.1-{{ checksum "~/2600hz/kazoo/make/deps.mk" }} + - plt-v1-{{ checksum "~/2600hz/kazoo/make/deps.mk" }}-{{ checksum "/usr/local/lib/erlang/releases/RELEASES" }} - run: name: Dailyzing changed Erlang files command: TO_DIALYZE="$(echo $CHANGED)" make -C ${KAZOO_ROOT} build-plt dialyze - save_cache: - key: plt-21-v3.1-{{ checksum "~/2600hz/kazoo/make/deps.mk" }} + key: plt-v1-{{ checksum "~/2600hz/kazoo/make/deps.mk" }}-{{ checksum "/usr/local/lib/erlang/releases/RELEASES" }} paths: - ~/2600hz/kazoo/.kazoo.plt release: <<: *defaults docker: - - image: offical2600hz/circleci:21.3.8 + - image: offical2600hz/circleci:21.3.8.8 - image: couchdb:2.3.1 - image: 2600hz/rabbitmq steps: @@ -407,7 +407,7 @@ jobs: command: ${KAZOO_ROOT}/scripts/circleci.bash - restore_cache: keys: - - deps-centos-21-v3.2-{{ checksum "~/2600hz/kazoo/make/deps.mk" }} + - deps-centos-v1-{{ checksum "~/2600hz/kazoo/make/deps.mk" }}-{{ checksum "/usr/local/lib/erlang/releases/RELEASES" }} - run: name: Preparing dependencies for CentOS7 command: | @@ -423,7 +423,7 @@ jobs: ls -al $KAZOO_ROOT/make || true make -C ${KAZOO_ROOT} deps - save_cache: - key: deps-centos-21-v3.2-{{ checksum "~/2600hz/kazoo/make/deps.mk" }} + key: deps-centos-v1-{{ checksum "~/2600hz/kazoo/make/deps.mk" }}-{{ checksum "/usr/local/lib/erlang/releases/RELEASES" }} paths: - ~/2600hz/kazoo/deps/ - ~/2600hz/kazoo/.git/.kz_deps_hash diff --git a/applications/braintree/.circleci/config.yml b/applications/braintree/.circleci/config.yml index e2bc33a029e..938c7c142ac 100644 --- a/applications/braintree/.circleci/config.yml +++ b/applications/braintree/.circleci/config.yml @@ -2,7 +2,7 @@ version: 2 workflows: version: 2 - build-branch: + build_branch: jobs: - setup - build_deps: @@ -117,7 +117,7 @@ workflows: defaults: &defaults docker: - - image: offical2600hz/circleci:21.3.8 + - image: offical2600hz/circleci:21.3.8.8 shell: /bin/bash --login working_directory: ~/2600hz/the_app environment: @@ -185,9 +185,9 @@ jobs: at: ~/ - restore_cache: keys: - - deps-21-v3.2-{{ checksum "~/2600hz/kazoo/make/deps.mk" }} + - deps-v1-{{ checksum "~/2600hz/kazoo/make/deps.mk" }}-{{ checksum "/usr/local/lib/erlang/releases/RELEASES" }} - run: - name: Calculating dependency hash + name: Calculating dependency hash for CircleCI cache command: | deps_hash=$(md5sum $KAZOO_ROOT/make/deps.mk | cut -d" " -f1) if [ x"$(cat $KAZOO_ROOT/.git/.kz_deps_hash)" = x"$deps_hash" ]; then @@ -196,11 +196,16 @@ jobs: echo -n $(md5sum $KAZOO_ROOT/make/deps.mk | cut -d" " -f1) > "$KAZOO_ROOT/.git/.kz_deps_hash" md5sum $KAZOO_ROOT/make/deps.mk || true ls -al $KAZOO_ROOT/make || true + - run: + name: Show dependency hash + command: | + md5sum make/deps.mk || true + ls -al make || true - run: name: Making deps command: make -C ${KAZOO_ROOT} deps - save_cache: - key: deps-21-v3.2-{{ checksum "~/2600hz/kazoo/make/deps.mk" }} + key: deps-v1-{{ checksum "~/2600hz/kazoo/make/deps.mk" }}-{{ checksum "/usr/local/lib/erlang/releases/RELEASES" }} paths: - ~/2600hz/kazoo/deps/ - ~/2600hz/kazoo/.git/.kz_deps_hash @@ -216,12 +221,10 @@ jobs: at: ~/ - restore_cache: keys: - - deps-21-v3.2-{{ checksum "~/2600hz/kazoo/make/deps.mk" }} - - run: | - md5sum $KAZOO_ROOT/make/deps.mk || true - ls -al $KAZOO_ROOT/make || true - - run: make -C ${KAZOO_ROOT} fmt - - run: JOBS="2" make -C ${KAZOO_ROOT} + - deps-v1-{{ checksum "~/2600hz/kazoo/make/deps.mk" }}-{{ checksum "/usr/local/lib/erlang/releases/RELEASES" }} + - run: + name: Compiling the project + command: JOBS="2" make -C ${KAZOO_ROOT} - persist_to_workspace: root: ~/ paths: @@ -234,7 +237,7 @@ jobs: at: ~/ - restore_cache: keys: - - deps-21-v3.2-{{ checksum "~/2600hz/kazoo/make/deps.mk" }} + - deps-v1-{{ checksum "~/2600hz/kazoo/make/deps.mk" }}-{{ checksum "/usr/local/lib/erlang/releases/RELEASES" }} - run: name: Displaying deps hash command: | @@ -258,9 +261,6 @@ jobs: - run: name: Running code checks command: make -C ${KAZOO_ROOT} code_checks - - run: - name: Running additional code style checks - command: ${KAZOO_ROOT}/scripts/code_checks.bash $CHANGED - run: name: Checking app source file command: make -C ${KAZOO_ROOT} app_applications @@ -311,19 +311,19 @@ jobs: at: ~/ - restore_cache: keys: - - plt-21-v3.1-{{ checksum "~/2600hz/kazoo/make/deps.mk" }} + - plt-v1-{{ checksum "~/2600hz/kazoo/make/deps.mk" }}-{{ checksum "/usr/local/lib/erlang/releases/RELEASES" }} - run: name: Dailyzing changed Erlang files command: TO_DIALYZE="$(echo $CHANGED)" make -C ${KAZOO_ROOT} build-plt dialyze - save_cache: - key: plt-21-v3.1-{{ checksum "~/2600hz/kazoo/make/deps.mk" }} + key: plt-v1-{{ checksum "~/2600hz/kazoo/make/deps.mk" }}-{{ checksum "/usr/local/lib/erlang/releases/RELEASES" }} paths: - ~/2600hz/kazoo/.kazoo.plt release: <<: *defaults docker: - - image: offical2600hz/circleci:21.3.8 + - image: offical2600hz/circleci:21.3.8.8 - image: couchdb:2.3.1 - image: 2600hz/rabbitmq steps: @@ -407,7 +407,7 @@ jobs: command: ${KAZOO_ROOT}/scripts/circleci.bash - restore_cache: keys: - - deps-centos-21-v3.2-{{ checksum "~/2600hz/kazoo/make/deps.mk" }} + - deps-centos-v1-{{ checksum "~/2600hz/kazoo/make/deps.mk" }}-{{ checksum "/usr/local/lib/erlang/releases/RELEASES" }} - run: name: Preparing dependencies for CentOS7 command: | @@ -423,7 +423,7 @@ jobs: ls -al $KAZOO_ROOT/make || true make -C ${KAZOO_ROOT} deps - save_cache: - key: deps-centos-21-v3.2-{{ checksum "~/2600hz/kazoo/make/deps.mk" }} + key: deps-centos-v1-{{ checksum "~/2600hz/kazoo/make/deps.mk" }}-{{ checksum "/usr/local/lib/erlang/releases/RELEASES" }} paths: - ~/2600hz/kazoo/deps/ - ~/2600hz/kazoo/.git/.kz_deps_hash diff --git a/applications/call_inspector/.circleci/config.yml b/applications/call_inspector/.circleci/config.yml index e2bc33a029e..938c7c142ac 100644 --- a/applications/call_inspector/.circleci/config.yml +++ b/applications/call_inspector/.circleci/config.yml @@ -2,7 +2,7 @@ version: 2 workflows: version: 2 - build-branch: + build_branch: jobs: - setup - build_deps: @@ -117,7 +117,7 @@ workflows: defaults: &defaults docker: - - image: offical2600hz/circleci:21.3.8 + - image: offical2600hz/circleci:21.3.8.8 shell: /bin/bash --login working_directory: ~/2600hz/the_app environment: @@ -185,9 +185,9 @@ jobs: at: ~/ - restore_cache: keys: - - deps-21-v3.2-{{ checksum "~/2600hz/kazoo/make/deps.mk" }} + - deps-v1-{{ checksum "~/2600hz/kazoo/make/deps.mk" }}-{{ checksum "/usr/local/lib/erlang/releases/RELEASES" }} - run: - name: Calculating dependency hash + name: Calculating dependency hash for CircleCI cache command: | deps_hash=$(md5sum $KAZOO_ROOT/make/deps.mk | cut -d" " -f1) if [ x"$(cat $KAZOO_ROOT/.git/.kz_deps_hash)" = x"$deps_hash" ]; then @@ -196,11 +196,16 @@ jobs: echo -n $(md5sum $KAZOO_ROOT/make/deps.mk | cut -d" " -f1) > "$KAZOO_ROOT/.git/.kz_deps_hash" md5sum $KAZOO_ROOT/make/deps.mk || true ls -al $KAZOO_ROOT/make || true + - run: + name: Show dependency hash + command: | + md5sum make/deps.mk || true + ls -al make || true - run: name: Making deps command: make -C ${KAZOO_ROOT} deps - save_cache: - key: deps-21-v3.2-{{ checksum "~/2600hz/kazoo/make/deps.mk" }} + key: deps-v1-{{ checksum "~/2600hz/kazoo/make/deps.mk" }}-{{ checksum "/usr/local/lib/erlang/releases/RELEASES" }} paths: - ~/2600hz/kazoo/deps/ - ~/2600hz/kazoo/.git/.kz_deps_hash @@ -216,12 +221,10 @@ jobs: at: ~/ - restore_cache: keys: - - deps-21-v3.2-{{ checksum "~/2600hz/kazoo/make/deps.mk" }} - - run: | - md5sum $KAZOO_ROOT/make/deps.mk || true - ls -al $KAZOO_ROOT/make || true - - run: make -C ${KAZOO_ROOT} fmt - - run: JOBS="2" make -C ${KAZOO_ROOT} + - deps-v1-{{ checksum "~/2600hz/kazoo/make/deps.mk" }}-{{ checksum "/usr/local/lib/erlang/releases/RELEASES" }} + - run: + name: Compiling the project + command: JOBS="2" make -C ${KAZOO_ROOT} - persist_to_workspace: root: ~/ paths: @@ -234,7 +237,7 @@ jobs: at: ~/ - restore_cache: keys: - - deps-21-v3.2-{{ checksum "~/2600hz/kazoo/make/deps.mk" }} + - deps-v1-{{ checksum "~/2600hz/kazoo/make/deps.mk" }}-{{ checksum "/usr/local/lib/erlang/releases/RELEASES" }} - run: name: Displaying deps hash command: | @@ -258,9 +261,6 @@ jobs: - run: name: Running code checks command: make -C ${KAZOO_ROOT} code_checks - - run: - name: Running additional code style checks - command: ${KAZOO_ROOT}/scripts/code_checks.bash $CHANGED - run: name: Checking app source file command: make -C ${KAZOO_ROOT} app_applications @@ -311,19 +311,19 @@ jobs: at: ~/ - restore_cache: keys: - - plt-21-v3.1-{{ checksum "~/2600hz/kazoo/make/deps.mk" }} + - plt-v1-{{ checksum "~/2600hz/kazoo/make/deps.mk" }}-{{ checksum "/usr/local/lib/erlang/releases/RELEASES" }} - run: name: Dailyzing changed Erlang files command: TO_DIALYZE="$(echo $CHANGED)" make -C ${KAZOO_ROOT} build-plt dialyze - save_cache: - key: plt-21-v3.1-{{ checksum "~/2600hz/kazoo/make/deps.mk" }} + key: plt-v1-{{ checksum "~/2600hz/kazoo/make/deps.mk" }}-{{ checksum "/usr/local/lib/erlang/releases/RELEASES" }} paths: - ~/2600hz/kazoo/.kazoo.plt release: <<: *defaults docker: - - image: offical2600hz/circleci:21.3.8 + - image: offical2600hz/circleci:21.3.8.8 - image: couchdb:2.3.1 - image: 2600hz/rabbitmq steps: @@ -407,7 +407,7 @@ jobs: command: ${KAZOO_ROOT}/scripts/circleci.bash - restore_cache: keys: - - deps-centos-21-v3.2-{{ checksum "~/2600hz/kazoo/make/deps.mk" }} + - deps-centos-v1-{{ checksum "~/2600hz/kazoo/make/deps.mk" }}-{{ checksum "/usr/local/lib/erlang/releases/RELEASES" }} - run: name: Preparing dependencies for CentOS7 command: | @@ -423,7 +423,7 @@ jobs: ls -al $KAZOO_ROOT/make || true make -C ${KAZOO_ROOT} deps - save_cache: - key: deps-centos-21-v3.2-{{ checksum "~/2600hz/kazoo/make/deps.mk" }} + key: deps-centos-v1-{{ checksum "~/2600hz/kazoo/make/deps.mk" }}-{{ checksum "/usr/local/lib/erlang/releases/RELEASES" }} paths: - ~/2600hz/kazoo/deps/ - ~/2600hz/kazoo/.git/.kz_deps_hash diff --git a/applications/callflow/.circleci/config.yml b/applications/callflow/.circleci/config.yml index e2bc33a029e..938c7c142ac 100644 --- a/applications/callflow/.circleci/config.yml +++ b/applications/callflow/.circleci/config.yml @@ -2,7 +2,7 @@ version: 2 workflows: version: 2 - build-branch: + build_branch: jobs: - setup - build_deps: @@ -117,7 +117,7 @@ workflows: defaults: &defaults docker: - - image: offical2600hz/circleci:21.3.8 + - image: offical2600hz/circleci:21.3.8.8 shell: /bin/bash --login working_directory: ~/2600hz/the_app environment: @@ -185,9 +185,9 @@ jobs: at: ~/ - restore_cache: keys: - - deps-21-v3.2-{{ checksum "~/2600hz/kazoo/make/deps.mk" }} + - deps-v1-{{ checksum "~/2600hz/kazoo/make/deps.mk" }}-{{ checksum "/usr/local/lib/erlang/releases/RELEASES" }} - run: - name: Calculating dependency hash + name: Calculating dependency hash for CircleCI cache command: | deps_hash=$(md5sum $KAZOO_ROOT/make/deps.mk | cut -d" " -f1) if [ x"$(cat $KAZOO_ROOT/.git/.kz_deps_hash)" = x"$deps_hash" ]; then @@ -196,11 +196,16 @@ jobs: echo -n $(md5sum $KAZOO_ROOT/make/deps.mk | cut -d" " -f1) > "$KAZOO_ROOT/.git/.kz_deps_hash" md5sum $KAZOO_ROOT/make/deps.mk || true ls -al $KAZOO_ROOT/make || true + - run: + name: Show dependency hash + command: | + md5sum make/deps.mk || true + ls -al make || true - run: name: Making deps command: make -C ${KAZOO_ROOT} deps - save_cache: - key: deps-21-v3.2-{{ checksum "~/2600hz/kazoo/make/deps.mk" }} + key: deps-v1-{{ checksum "~/2600hz/kazoo/make/deps.mk" }}-{{ checksum "/usr/local/lib/erlang/releases/RELEASES" }} paths: - ~/2600hz/kazoo/deps/ - ~/2600hz/kazoo/.git/.kz_deps_hash @@ -216,12 +221,10 @@ jobs: at: ~/ - restore_cache: keys: - - deps-21-v3.2-{{ checksum "~/2600hz/kazoo/make/deps.mk" }} - - run: | - md5sum $KAZOO_ROOT/make/deps.mk || true - ls -al $KAZOO_ROOT/make || true - - run: make -C ${KAZOO_ROOT} fmt - - run: JOBS="2" make -C ${KAZOO_ROOT} + - deps-v1-{{ checksum "~/2600hz/kazoo/make/deps.mk" }}-{{ checksum "/usr/local/lib/erlang/releases/RELEASES" }} + - run: + name: Compiling the project + command: JOBS="2" make -C ${KAZOO_ROOT} - persist_to_workspace: root: ~/ paths: @@ -234,7 +237,7 @@ jobs: at: ~/ - restore_cache: keys: - - deps-21-v3.2-{{ checksum "~/2600hz/kazoo/make/deps.mk" }} + - deps-v1-{{ checksum "~/2600hz/kazoo/make/deps.mk" }}-{{ checksum "/usr/local/lib/erlang/releases/RELEASES" }} - run: name: Displaying deps hash command: | @@ -258,9 +261,6 @@ jobs: - run: name: Running code checks command: make -C ${KAZOO_ROOT} code_checks - - run: - name: Running additional code style checks - command: ${KAZOO_ROOT}/scripts/code_checks.bash $CHANGED - run: name: Checking app source file command: make -C ${KAZOO_ROOT} app_applications @@ -311,19 +311,19 @@ jobs: at: ~/ - restore_cache: keys: - - plt-21-v3.1-{{ checksum "~/2600hz/kazoo/make/deps.mk" }} + - plt-v1-{{ checksum "~/2600hz/kazoo/make/deps.mk" }}-{{ checksum "/usr/local/lib/erlang/releases/RELEASES" }} - run: name: Dailyzing changed Erlang files command: TO_DIALYZE="$(echo $CHANGED)" make -C ${KAZOO_ROOT} build-plt dialyze - save_cache: - key: plt-21-v3.1-{{ checksum "~/2600hz/kazoo/make/deps.mk" }} + key: plt-v1-{{ checksum "~/2600hz/kazoo/make/deps.mk" }}-{{ checksum "/usr/local/lib/erlang/releases/RELEASES" }} paths: - ~/2600hz/kazoo/.kazoo.plt release: <<: *defaults docker: - - image: offical2600hz/circleci:21.3.8 + - image: offical2600hz/circleci:21.3.8.8 - image: couchdb:2.3.1 - image: 2600hz/rabbitmq steps: @@ -407,7 +407,7 @@ jobs: command: ${KAZOO_ROOT}/scripts/circleci.bash - restore_cache: keys: - - deps-centos-21-v3.2-{{ checksum "~/2600hz/kazoo/make/deps.mk" }} + - deps-centos-v1-{{ checksum "~/2600hz/kazoo/make/deps.mk" }}-{{ checksum "/usr/local/lib/erlang/releases/RELEASES" }} - run: name: Preparing dependencies for CentOS7 command: | @@ -423,7 +423,7 @@ jobs: ls -al $KAZOO_ROOT/make || true make -C ${KAZOO_ROOT} deps - save_cache: - key: deps-centos-21-v3.2-{{ checksum "~/2600hz/kazoo/make/deps.mk" }} + key: deps-centos-v1-{{ checksum "~/2600hz/kazoo/make/deps.mk" }}-{{ checksum "/usr/local/lib/erlang/releases/RELEASES" }} paths: - ~/2600hz/kazoo/deps/ - ~/2600hz/kazoo/.git/.kz_deps_hash diff --git a/applications/camper/.circleci/config.yml b/applications/camper/.circleci/config.yml index e2bc33a029e..938c7c142ac 100644 --- a/applications/camper/.circleci/config.yml +++ b/applications/camper/.circleci/config.yml @@ -2,7 +2,7 @@ version: 2 workflows: version: 2 - build-branch: + build_branch: jobs: - setup - build_deps: @@ -117,7 +117,7 @@ workflows: defaults: &defaults docker: - - image: offical2600hz/circleci:21.3.8 + - image: offical2600hz/circleci:21.3.8.8 shell: /bin/bash --login working_directory: ~/2600hz/the_app environment: @@ -185,9 +185,9 @@ jobs: at: ~/ - restore_cache: keys: - - deps-21-v3.2-{{ checksum "~/2600hz/kazoo/make/deps.mk" }} + - deps-v1-{{ checksum "~/2600hz/kazoo/make/deps.mk" }}-{{ checksum "/usr/local/lib/erlang/releases/RELEASES" }} - run: - name: Calculating dependency hash + name: Calculating dependency hash for CircleCI cache command: | deps_hash=$(md5sum $KAZOO_ROOT/make/deps.mk | cut -d" " -f1) if [ x"$(cat $KAZOO_ROOT/.git/.kz_deps_hash)" = x"$deps_hash" ]; then @@ -196,11 +196,16 @@ jobs: echo -n $(md5sum $KAZOO_ROOT/make/deps.mk | cut -d" " -f1) > "$KAZOO_ROOT/.git/.kz_deps_hash" md5sum $KAZOO_ROOT/make/deps.mk || true ls -al $KAZOO_ROOT/make || true + - run: + name: Show dependency hash + command: | + md5sum make/deps.mk || true + ls -al make || true - run: name: Making deps command: make -C ${KAZOO_ROOT} deps - save_cache: - key: deps-21-v3.2-{{ checksum "~/2600hz/kazoo/make/deps.mk" }} + key: deps-v1-{{ checksum "~/2600hz/kazoo/make/deps.mk" }}-{{ checksum "/usr/local/lib/erlang/releases/RELEASES" }} paths: - ~/2600hz/kazoo/deps/ - ~/2600hz/kazoo/.git/.kz_deps_hash @@ -216,12 +221,10 @@ jobs: at: ~/ - restore_cache: keys: - - deps-21-v3.2-{{ checksum "~/2600hz/kazoo/make/deps.mk" }} - - run: | - md5sum $KAZOO_ROOT/make/deps.mk || true - ls -al $KAZOO_ROOT/make || true - - run: make -C ${KAZOO_ROOT} fmt - - run: JOBS="2" make -C ${KAZOO_ROOT} + - deps-v1-{{ checksum "~/2600hz/kazoo/make/deps.mk" }}-{{ checksum "/usr/local/lib/erlang/releases/RELEASES" }} + - run: + name: Compiling the project + command: JOBS="2" make -C ${KAZOO_ROOT} - persist_to_workspace: root: ~/ paths: @@ -234,7 +237,7 @@ jobs: at: ~/ - restore_cache: keys: - - deps-21-v3.2-{{ checksum "~/2600hz/kazoo/make/deps.mk" }} + - deps-v1-{{ checksum "~/2600hz/kazoo/make/deps.mk" }}-{{ checksum "/usr/local/lib/erlang/releases/RELEASES" }} - run: name: Displaying deps hash command: | @@ -258,9 +261,6 @@ jobs: - run: name: Running code checks command: make -C ${KAZOO_ROOT} code_checks - - run: - name: Running additional code style checks - command: ${KAZOO_ROOT}/scripts/code_checks.bash $CHANGED - run: name: Checking app source file command: make -C ${KAZOO_ROOT} app_applications @@ -311,19 +311,19 @@ jobs: at: ~/ - restore_cache: keys: - - plt-21-v3.1-{{ checksum "~/2600hz/kazoo/make/deps.mk" }} + - plt-v1-{{ checksum "~/2600hz/kazoo/make/deps.mk" }}-{{ checksum "/usr/local/lib/erlang/releases/RELEASES" }} - run: name: Dailyzing changed Erlang files command: TO_DIALYZE="$(echo $CHANGED)" make -C ${KAZOO_ROOT} build-plt dialyze - save_cache: - key: plt-21-v3.1-{{ checksum "~/2600hz/kazoo/make/deps.mk" }} + key: plt-v1-{{ checksum "~/2600hz/kazoo/make/deps.mk" }}-{{ checksum "/usr/local/lib/erlang/releases/RELEASES" }} paths: - ~/2600hz/kazoo/.kazoo.plt release: <<: *defaults docker: - - image: offical2600hz/circleci:21.3.8 + - image: offical2600hz/circleci:21.3.8.8 - image: couchdb:2.3.1 - image: 2600hz/rabbitmq steps: @@ -407,7 +407,7 @@ jobs: command: ${KAZOO_ROOT}/scripts/circleci.bash - restore_cache: keys: - - deps-centos-21-v3.2-{{ checksum "~/2600hz/kazoo/make/deps.mk" }} + - deps-centos-v1-{{ checksum "~/2600hz/kazoo/make/deps.mk" }}-{{ checksum "/usr/local/lib/erlang/releases/RELEASES" }} - run: name: Preparing dependencies for CentOS7 command: | @@ -423,7 +423,7 @@ jobs: ls -al $KAZOO_ROOT/make || true make -C ${KAZOO_ROOT} deps - save_cache: - key: deps-centos-21-v3.2-{{ checksum "~/2600hz/kazoo/make/deps.mk" }} + key: deps-centos-v1-{{ checksum "~/2600hz/kazoo/make/deps.mk" }}-{{ checksum "/usr/local/lib/erlang/releases/RELEASES" }} paths: - ~/2600hz/kazoo/deps/ - ~/2600hz/kazoo/.git/.kz_deps_hash diff --git a/applications/cccp/.circleci/config.yml b/applications/cccp/.circleci/config.yml index e2bc33a029e..938c7c142ac 100644 --- a/applications/cccp/.circleci/config.yml +++ b/applications/cccp/.circleci/config.yml @@ -2,7 +2,7 @@ version: 2 workflows: version: 2 - build-branch: + build_branch: jobs: - setup - build_deps: @@ -117,7 +117,7 @@ workflows: defaults: &defaults docker: - - image: offical2600hz/circleci:21.3.8 + - image: offical2600hz/circleci:21.3.8.8 shell: /bin/bash --login working_directory: ~/2600hz/the_app environment: @@ -185,9 +185,9 @@ jobs: at: ~/ - restore_cache: keys: - - deps-21-v3.2-{{ checksum "~/2600hz/kazoo/make/deps.mk" }} + - deps-v1-{{ checksum "~/2600hz/kazoo/make/deps.mk" }}-{{ checksum "/usr/local/lib/erlang/releases/RELEASES" }} - run: - name: Calculating dependency hash + name: Calculating dependency hash for CircleCI cache command: | deps_hash=$(md5sum $KAZOO_ROOT/make/deps.mk | cut -d" " -f1) if [ x"$(cat $KAZOO_ROOT/.git/.kz_deps_hash)" = x"$deps_hash" ]; then @@ -196,11 +196,16 @@ jobs: echo -n $(md5sum $KAZOO_ROOT/make/deps.mk | cut -d" " -f1) > "$KAZOO_ROOT/.git/.kz_deps_hash" md5sum $KAZOO_ROOT/make/deps.mk || true ls -al $KAZOO_ROOT/make || true + - run: + name: Show dependency hash + command: | + md5sum make/deps.mk || true + ls -al make || true - run: name: Making deps command: make -C ${KAZOO_ROOT} deps - save_cache: - key: deps-21-v3.2-{{ checksum "~/2600hz/kazoo/make/deps.mk" }} + key: deps-v1-{{ checksum "~/2600hz/kazoo/make/deps.mk" }}-{{ checksum "/usr/local/lib/erlang/releases/RELEASES" }} paths: - ~/2600hz/kazoo/deps/ - ~/2600hz/kazoo/.git/.kz_deps_hash @@ -216,12 +221,10 @@ jobs: at: ~/ - restore_cache: keys: - - deps-21-v3.2-{{ checksum "~/2600hz/kazoo/make/deps.mk" }} - - run: | - md5sum $KAZOO_ROOT/make/deps.mk || true - ls -al $KAZOO_ROOT/make || true - - run: make -C ${KAZOO_ROOT} fmt - - run: JOBS="2" make -C ${KAZOO_ROOT} + - deps-v1-{{ checksum "~/2600hz/kazoo/make/deps.mk" }}-{{ checksum "/usr/local/lib/erlang/releases/RELEASES" }} + - run: + name: Compiling the project + command: JOBS="2" make -C ${KAZOO_ROOT} - persist_to_workspace: root: ~/ paths: @@ -234,7 +237,7 @@ jobs: at: ~/ - restore_cache: keys: - - deps-21-v3.2-{{ checksum "~/2600hz/kazoo/make/deps.mk" }} + - deps-v1-{{ checksum "~/2600hz/kazoo/make/deps.mk" }}-{{ checksum "/usr/local/lib/erlang/releases/RELEASES" }} - run: name: Displaying deps hash command: | @@ -258,9 +261,6 @@ jobs: - run: name: Running code checks command: make -C ${KAZOO_ROOT} code_checks - - run: - name: Running additional code style checks - command: ${KAZOO_ROOT}/scripts/code_checks.bash $CHANGED - run: name: Checking app source file command: make -C ${KAZOO_ROOT} app_applications @@ -311,19 +311,19 @@ jobs: at: ~/ - restore_cache: keys: - - plt-21-v3.1-{{ checksum "~/2600hz/kazoo/make/deps.mk" }} + - plt-v1-{{ checksum "~/2600hz/kazoo/make/deps.mk" }}-{{ checksum "/usr/local/lib/erlang/releases/RELEASES" }} - run: name: Dailyzing changed Erlang files command: TO_DIALYZE="$(echo $CHANGED)" make -C ${KAZOO_ROOT} build-plt dialyze - save_cache: - key: plt-21-v3.1-{{ checksum "~/2600hz/kazoo/make/deps.mk" }} + key: plt-v1-{{ checksum "~/2600hz/kazoo/make/deps.mk" }}-{{ checksum "/usr/local/lib/erlang/releases/RELEASES" }} paths: - ~/2600hz/kazoo/.kazoo.plt release: <<: *defaults docker: - - image: offical2600hz/circleci:21.3.8 + - image: offical2600hz/circleci:21.3.8.8 - image: couchdb:2.3.1 - image: 2600hz/rabbitmq steps: @@ -407,7 +407,7 @@ jobs: command: ${KAZOO_ROOT}/scripts/circleci.bash - restore_cache: keys: - - deps-centos-21-v3.2-{{ checksum "~/2600hz/kazoo/make/deps.mk" }} + - deps-centos-v1-{{ checksum "~/2600hz/kazoo/make/deps.mk" }}-{{ checksum "/usr/local/lib/erlang/releases/RELEASES" }} - run: name: Preparing dependencies for CentOS7 command: | @@ -423,7 +423,7 @@ jobs: ls -al $KAZOO_ROOT/make || true make -C ${KAZOO_ROOT} deps - save_cache: - key: deps-centos-21-v3.2-{{ checksum "~/2600hz/kazoo/make/deps.mk" }} + key: deps-centos-v1-{{ checksum "~/2600hz/kazoo/make/deps.mk" }}-{{ checksum "/usr/local/lib/erlang/releases/RELEASES" }} paths: - ~/2600hz/kazoo/deps/ - ~/2600hz/kazoo/.git/.kz_deps_hash diff --git a/applications/cdr/.circleci/config.yml b/applications/cdr/.circleci/config.yml index e2bc33a029e..938c7c142ac 100644 --- a/applications/cdr/.circleci/config.yml +++ b/applications/cdr/.circleci/config.yml @@ -2,7 +2,7 @@ version: 2 workflows: version: 2 - build-branch: + build_branch: jobs: - setup - build_deps: @@ -117,7 +117,7 @@ workflows: defaults: &defaults docker: - - image: offical2600hz/circleci:21.3.8 + - image: offical2600hz/circleci:21.3.8.8 shell: /bin/bash --login working_directory: ~/2600hz/the_app environment: @@ -185,9 +185,9 @@ jobs: at: ~/ - restore_cache: keys: - - deps-21-v3.2-{{ checksum "~/2600hz/kazoo/make/deps.mk" }} + - deps-v1-{{ checksum "~/2600hz/kazoo/make/deps.mk" }}-{{ checksum "/usr/local/lib/erlang/releases/RELEASES" }} - run: - name: Calculating dependency hash + name: Calculating dependency hash for CircleCI cache command: | deps_hash=$(md5sum $KAZOO_ROOT/make/deps.mk | cut -d" " -f1) if [ x"$(cat $KAZOO_ROOT/.git/.kz_deps_hash)" = x"$deps_hash" ]; then @@ -196,11 +196,16 @@ jobs: echo -n $(md5sum $KAZOO_ROOT/make/deps.mk | cut -d" " -f1) > "$KAZOO_ROOT/.git/.kz_deps_hash" md5sum $KAZOO_ROOT/make/deps.mk || true ls -al $KAZOO_ROOT/make || true + - run: + name: Show dependency hash + command: | + md5sum make/deps.mk || true + ls -al make || true - run: name: Making deps command: make -C ${KAZOO_ROOT} deps - save_cache: - key: deps-21-v3.2-{{ checksum "~/2600hz/kazoo/make/deps.mk" }} + key: deps-v1-{{ checksum "~/2600hz/kazoo/make/deps.mk" }}-{{ checksum "/usr/local/lib/erlang/releases/RELEASES" }} paths: - ~/2600hz/kazoo/deps/ - ~/2600hz/kazoo/.git/.kz_deps_hash @@ -216,12 +221,10 @@ jobs: at: ~/ - restore_cache: keys: - - deps-21-v3.2-{{ checksum "~/2600hz/kazoo/make/deps.mk" }} - - run: | - md5sum $KAZOO_ROOT/make/deps.mk || true - ls -al $KAZOO_ROOT/make || true - - run: make -C ${KAZOO_ROOT} fmt - - run: JOBS="2" make -C ${KAZOO_ROOT} + - deps-v1-{{ checksum "~/2600hz/kazoo/make/deps.mk" }}-{{ checksum "/usr/local/lib/erlang/releases/RELEASES" }} + - run: + name: Compiling the project + command: JOBS="2" make -C ${KAZOO_ROOT} - persist_to_workspace: root: ~/ paths: @@ -234,7 +237,7 @@ jobs: at: ~/ - restore_cache: keys: - - deps-21-v3.2-{{ checksum "~/2600hz/kazoo/make/deps.mk" }} + - deps-v1-{{ checksum "~/2600hz/kazoo/make/deps.mk" }}-{{ checksum "/usr/local/lib/erlang/releases/RELEASES" }} - run: name: Displaying deps hash command: | @@ -258,9 +261,6 @@ jobs: - run: name: Running code checks command: make -C ${KAZOO_ROOT} code_checks - - run: - name: Running additional code style checks - command: ${KAZOO_ROOT}/scripts/code_checks.bash $CHANGED - run: name: Checking app source file command: make -C ${KAZOO_ROOT} app_applications @@ -311,19 +311,19 @@ jobs: at: ~/ - restore_cache: keys: - - plt-21-v3.1-{{ checksum "~/2600hz/kazoo/make/deps.mk" }} + - plt-v1-{{ checksum "~/2600hz/kazoo/make/deps.mk" }}-{{ checksum "/usr/local/lib/erlang/releases/RELEASES" }} - run: name: Dailyzing changed Erlang files command: TO_DIALYZE="$(echo $CHANGED)" make -C ${KAZOO_ROOT} build-plt dialyze - save_cache: - key: plt-21-v3.1-{{ checksum "~/2600hz/kazoo/make/deps.mk" }} + key: plt-v1-{{ checksum "~/2600hz/kazoo/make/deps.mk" }}-{{ checksum "/usr/local/lib/erlang/releases/RELEASES" }} paths: - ~/2600hz/kazoo/.kazoo.plt release: <<: *defaults docker: - - image: offical2600hz/circleci:21.3.8 + - image: offical2600hz/circleci:21.3.8.8 - image: couchdb:2.3.1 - image: 2600hz/rabbitmq steps: @@ -407,7 +407,7 @@ jobs: command: ${KAZOO_ROOT}/scripts/circleci.bash - restore_cache: keys: - - deps-centos-21-v3.2-{{ checksum "~/2600hz/kazoo/make/deps.mk" }} + - deps-centos-v1-{{ checksum "~/2600hz/kazoo/make/deps.mk" }}-{{ checksum "/usr/local/lib/erlang/releases/RELEASES" }} - run: name: Preparing dependencies for CentOS7 command: | @@ -423,7 +423,7 @@ jobs: ls -al $KAZOO_ROOT/make || true make -C ${KAZOO_ROOT} deps - save_cache: - key: deps-centos-21-v3.2-{{ checksum "~/2600hz/kazoo/make/deps.mk" }} + key: deps-centos-v1-{{ checksum "~/2600hz/kazoo/make/deps.mk" }}-{{ checksum "/usr/local/lib/erlang/releases/RELEASES" }} paths: - ~/2600hz/kazoo/deps/ - ~/2600hz/kazoo/.git/.kz_deps_hash diff --git a/applications/conference/.circleci/config.yml b/applications/conference/.circleci/config.yml index e2bc33a029e..938c7c142ac 100644 --- a/applications/conference/.circleci/config.yml +++ b/applications/conference/.circleci/config.yml @@ -2,7 +2,7 @@ version: 2 workflows: version: 2 - build-branch: + build_branch: jobs: - setup - build_deps: @@ -117,7 +117,7 @@ workflows: defaults: &defaults docker: - - image: offical2600hz/circleci:21.3.8 + - image: offical2600hz/circleci:21.3.8.8 shell: /bin/bash --login working_directory: ~/2600hz/the_app environment: @@ -185,9 +185,9 @@ jobs: at: ~/ - restore_cache: keys: - - deps-21-v3.2-{{ checksum "~/2600hz/kazoo/make/deps.mk" }} + - deps-v1-{{ checksum "~/2600hz/kazoo/make/deps.mk" }}-{{ checksum "/usr/local/lib/erlang/releases/RELEASES" }} - run: - name: Calculating dependency hash + name: Calculating dependency hash for CircleCI cache command: | deps_hash=$(md5sum $KAZOO_ROOT/make/deps.mk | cut -d" " -f1) if [ x"$(cat $KAZOO_ROOT/.git/.kz_deps_hash)" = x"$deps_hash" ]; then @@ -196,11 +196,16 @@ jobs: echo -n $(md5sum $KAZOO_ROOT/make/deps.mk | cut -d" " -f1) > "$KAZOO_ROOT/.git/.kz_deps_hash" md5sum $KAZOO_ROOT/make/deps.mk || true ls -al $KAZOO_ROOT/make || true + - run: + name: Show dependency hash + command: | + md5sum make/deps.mk || true + ls -al make || true - run: name: Making deps command: make -C ${KAZOO_ROOT} deps - save_cache: - key: deps-21-v3.2-{{ checksum "~/2600hz/kazoo/make/deps.mk" }} + key: deps-v1-{{ checksum "~/2600hz/kazoo/make/deps.mk" }}-{{ checksum "/usr/local/lib/erlang/releases/RELEASES" }} paths: - ~/2600hz/kazoo/deps/ - ~/2600hz/kazoo/.git/.kz_deps_hash @@ -216,12 +221,10 @@ jobs: at: ~/ - restore_cache: keys: - - deps-21-v3.2-{{ checksum "~/2600hz/kazoo/make/deps.mk" }} - - run: | - md5sum $KAZOO_ROOT/make/deps.mk || true - ls -al $KAZOO_ROOT/make || true - - run: make -C ${KAZOO_ROOT} fmt - - run: JOBS="2" make -C ${KAZOO_ROOT} + - deps-v1-{{ checksum "~/2600hz/kazoo/make/deps.mk" }}-{{ checksum "/usr/local/lib/erlang/releases/RELEASES" }} + - run: + name: Compiling the project + command: JOBS="2" make -C ${KAZOO_ROOT} - persist_to_workspace: root: ~/ paths: @@ -234,7 +237,7 @@ jobs: at: ~/ - restore_cache: keys: - - deps-21-v3.2-{{ checksum "~/2600hz/kazoo/make/deps.mk" }} + - deps-v1-{{ checksum "~/2600hz/kazoo/make/deps.mk" }}-{{ checksum "/usr/local/lib/erlang/releases/RELEASES" }} - run: name: Displaying deps hash command: | @@ -258,9 +261,6 @@ jobs: - run: name: Running code checks command: make -C ${KAZOO_ROOT} code_checks - - run: - name: Running additional code style checks - command: ${KAZOO_ROOT}/scripts/code_checks.bash $CHANGED - run: name: Checking app source file command: make -C ${KAZOO_ROOT} app_applications @@ -311,19 +311,19 @@ jobs: at: ~/ - restore_cache: keys: - - plt-21-v3.1-{{ checksum "~/2600hz/kazoo/make/deps.mk" }} + - plt-v1-{{ checksum "~/2600hz/kazoo/make/deps.mk" }}-{{ checksum "/usr/local/lib/erlang/releases/RELEASES" }} - run: name: Dailyzing changed Erlang files command: TO_DIALYZE="$(echo $CHANGED)" make -C ${KAZOO_ROOT} build-plt dialyze - save_cache: - key: plt-21-v3.1-{{ checksum "~/2600hz/kazoo/make/deps.mk" }} + key: plt-v1-{{ checksum "~/2600hz/kazoo/make/deps.mk" }}-{{ checksum "/usr/local/lib/erlang/releases/RELEASES" }} paths: - ~/2600hz/kazoo/.kazoo.plt release: <<: *defaults docker: - - image: offical2600hz/circleci:21.3.8 + - image: offical2600hz/circleci:21.3.8.8 - image: couchdb:2.3.1 - image: 2600hz/rabbitmq steps: @@ -407,7 +407,7 @@ jobs: command: ${KAZOO_ROOT}/scripts/circleci.bash - restore_cache: keys: - - deps-centos-21-v3.2-{{ checksum "~/2600hz/kazoo/make/deps.mk" }} + - deps-centos-v1-{{ checksum "~/2600hz/kazoo/make/deps.mk" }}-{{ checksum "/usr/local/lib/erlang/releases/RELEASES" }} - run: name: Preparing dependencies for CentOS7 command: | @@ -423,7 +423,7 @@ jobs: ls -al $KAZOO_ROOT/make || true make -C ${KAZOO_ROOT} deps - save_cache: - key: deps-centos-21-v3.2-{{ checksum "~/2600hz/kazoo/make/deps.mk" }} + key: deps-centos-v1-{{ checksum "~/2600hz/kazoo/make/deps.mk" }}-{{ checksum "/usr/local/lib/erlang/releases/RELEASES" }} paths: - ~/2600hz/kazoo/deps/ - ~/2600hz/kazoo/.git/.kz_deps_hash diff --git a/applications/crossbar/.circleci/config.yml b/applications/crossbar/.circleci/config.yml index e2bc33a029e..938c7c142ac 100644 --- a/applications/crossbar/.circleci/config.yml +++ b/applications/crossbar/.circleci/config.yml @@ -2,7 +2,7 @@ version: 2 workflows: version: 2 - build-branch: + build_branch: jobs: - setup - build_deps: @@ -117,7 +117,7 @@ workflows: defaults: &defaults docker: - - image: offical2600hz/circleci:21.3.8 + - image: offical2600hz/circleci:21.3.8.8 shell: /bin/bash --login working_directory: ~/2600hz/the_app environment: @@ -185,9 +185,9 @@ jobs: at: ~/ - restore_cache: keys: - - deps-21-v3.2-{{ checksum "~/2600hz/kazoo/make/deps.mk" }} + - deps-v1-{{ checksum "~/2600hz/kazoo/make/deps.mk" }}-{{ checksum "/usr/local/lib/erlang/releases/RELEASES" }} - run: - name: Calculating dependency hash + name: Calculating dependency hash for CircleCI cache command: | deps_hash=$(md5sum $KAZOO_ROOT/make/deps.mk | cut -d" " -f1) if [ x"$(cat $KAZOO_ROOT/.git/.kz_deps_hash)" = x"$deps_hash" ]; then @@ -196,11 +196,16 @@ jobs: echo -n $(md5sum $KAZOO_ROOT/make/deps.mk | cut -d" " -f1) > "$KAZOO_ROOT/.git/.kz_deps_hash" md5sum $KAZOO_ROOT/make/deps.mk || true ls -al $KAZOO_ROOT/make || true + - run: + name: Show dependency hash + command: | + md5sum make/deps.mk || true + ls -al make || true - run: name: Making deps command: make -C ${KAZOO_ROOT} deps - save_cache: - key: deps-21-v3.2-{{ checksum "~/2600hz/kazoo/make/deps.mk" }} + key: deps-v1-{{ checksum "~/2600hz/kazoo/make/deps.mk" }}-{{ checksum "/usr/local/lib/erlang/releases/RELEASES" }} paths: - ~/2600hz/kazoo/deps/ - ~/2600hz/kazoo/.git/.kz_deps_hash @@ -216,12 +221,10 @@ jobs: at: ~/ - restore_cache: keys: - - deps-21-v3.2-{{ checksum "~/2600hz/kazoo/make/deps.mk" }} - - run: | - md5sum $KAZOO_ROOT/make/deps.mk || true - ls -al $KAZOO_ROOT/make || true - - run: make -C ${KAZOO_ROOT} fmt - - run: JOBS="2" make -C ${KAZOO_ROOT} + - deps-v1-{{ checksum "~/2600hz/kazoo/make/deps.mk" }}-{{ checksum "/usr/local/lib/erlang/releases/RELEASES" }} + - run: + name: Compiling the project + command: JOBS="2" make -C ${KAZOO_ROOT} - persist_to_workspace: root: ~/ paths: @@ -234,7 +237,7 @@ jobs: at: ~/ - restore_cache: keys: - - deps-21-v3.2-{{ checksum "~/2600hz/kazoo/make/deps.mk" }} + - deps-v1-{{ checksum "~/2600hz/kazoo/make/deps.mk" }}-{{ checksum "/usr/local/lib/erlang/releases/RELEASES" }} - run: name: Displaying deps hash command: | @@ -258,9 +261,6 @@ jobs: - run: name: Running code checks command: make -C ${KAZOO_ROOT} code_checks - - run: - name: Running additional code style checks - command: ${KAZOO_ROOT}/scripts/code_checks.bash $CHANGED - run: name: Checking app source file command: make -C ${KAZOO_ROOT} app_applications @@ -311,19 +311,19 @@ jobs: at: ~/ - restore_cache: keys: - - plt-21-v3.1-{{ checksum "~/2600hz/kazoo/make/deps.mk" }} + - plt-v1-{{ checksum "~/2600hz/kazoo/make/deps.mk" }}-{{ checksum "/usr/local/lib/erlang/releases/RELEASES" }} - run: name: Dailyzing changed Erlang files command: TO_DIALYZE="$(echo $CHANGED)" make -C ${KAZOO_ROOT} build-plt dialyze - save_cache: - key: plt-21-v3.1-{{ checksum "~/2600hz/kazoo/make/deps.mk" }} + key: plt-v1-{{ checksum "~/2600hz/kazoo/make/deps.mk" }}-{{ checksum "/usr/local/lib/erlang/releases/RELEASES" }} paths: - ~/2600hz/kazoo/.kazoo.plt release: <<: *defaults docker: - - image: offical2600hz/circleci:21.3.8 + - image: offical2600hz/circleci:21.3.8.8 - image: couchdb:2.3.1 - image: 2600hz/rabbitmq steps: @@ -407,7 +407,7 @@ jobs: command: ${KAZOO_ROOT}/scripts/circleci.bash - restore_cache: keys: - - deps-centos-21-v3.2-{{ checksum "~/2600hz/kazoo/make/deps.mk" }} + - deps-centos-v1-{{ checksum "~/2600hz/kazoo/make/deps.mk" }}-{{ checksum "/usr/local/lib/erlang/releases/RELEASES" }} - run: name: Preparing dependencies for CentOS7 command: | @@ -423,7 +423,7 @@ jobs: ls -al $KAZOO_ROOT/make || true make -C ${KAZOO_ROOT} deps - save_cache: - key: deps-centos-21-v3.2-{{ checksum "~/2600hz/kazoo/make/deps.mk" }} + key: deps-centos-v1-{{ checksum "~/2600hz/kazoo/make/deps.mk" }}-{{ checksum "/usr/local/lib/erlang/releases/RELEASES" }} paths: - ~/2600hz/kazoo/deps/ - ~/2600hz/kazoo/.git/.kz_deps_hash diff --git a/applications/doodle/.circleci/config.yml b/applications/doodle/.circleci/config.yml index e2bc33a029e..938c7c142ac 100644 --- a/applications/doodle/.circleci/config.yml +++ b/applications/doodle/.circleci/config.yml @@ -2,7 +2,7 @@ version: 2 workflows: version: 2 - build-branch: + build_branch: jobs: - setup - build_deps: @@ -117,7 +117,7 @@ workflows: defaults: &defaults docker: - - image: offical2600hz/circleci:21.3.8 + - image: offical2600hz/circleci:21.3.8.8 shell: /bin/bash --login working_directory: ~/2600hz/the_app environment: @@ -185,9 +185,9 @@ jobs: at: ~/ - restore_cache: keys: - - deps-21-v3.2-{{ checksum "~/2600hz/kazoo/make/deps.mk" }} + - deps-v1-{{ checksum "~/2600hz/kazoo/make/deps.mk" }}-{{ checksum "/usr/local/lib/erlang/releases/RELEASES" }} - run: - name: Calculating dependency hash + name: Calculating dependency hash for CircleCI cache command: | deps_hash=$(md5sum $KAZOO_ROOT/make/deps.mk | cut -d" " -f1) if [ x"$(cat $KAZOO_ROOT/.git/.kz_deps_hash)" = x"$deps_hash" ]; then @@ -196,11 +196,16 @@ jobs: echo -n $(md5sum $KAZOO_ROOT/make/deps.mk | cut -d" " -f1) > "$KAZOO_ROOT/.git/.kz_deps_hash" md5sum $KAZOO_ROOT/make/deps.mk || true ls -al $KAZOO_ROOT/make || true + - run: + name: Show dependency hash + command: | + md5sum make/deps.mk || true + ls -al make || true - run: name: Making deps command: make -C ${KAZOO_ROOT} deps - save_cache: - key: deps-21-v3.2-{{ checksum "~/2600hz/kazoo/make/deps.mk" }} + key: deps-v1-{{ checksum "~/2600hz/kazoo/make/deps.mk" }}-{{ checksum "/usr/local/lib/erlang/releases/RELEASES" }} paths: - ~/2600hz/kazoo/deps/ - ~/2600hz/kazoo/.git/.kz_deps_hash @@ -216,12 +221,10 @@ jobs: at: ~/ - restore_cache: keys: - - deps-21-v3.2-{{ checksum "~/2600hz/kazoo/make/deps.mk" }} - - run: | - md5sum $KAZOO_ROOT/make/deps.mk || true - ls -al $KAZOO_ROOT/make || true - - run: make -C ${KAZOO_ROOT} fmt - - run: JOBS="2" make -C ${KAZOO_ROOT} + - deps-v1-{{ checksum "~/2600hz/kazoo/make/deps.mk" }}-{{ checksum "/usr/local/lib/erlang/releases/RELEASES" }} + - run: + name: Compiling the project + command: JOBS="2" make -C ${KAZOO_ROOT} - persist_to_workspace: root: ~/ paths: @@ -234,7 +237,7 @@ jobs: at: ~/ - restore_cache: keys: - - deps-21-v3.2-{{ checksum "~/2600hz/kazoo/make/deps.mk" }} + - deps-v1-{{ checksum "~/2600hz/kazoo/make/deps.mk" }}-{{ checksum "/usr/local/lib/erlang/releases/RELEASES" }} - run: name: Displaying deps hash command: | @@ -258,9 +261,6 @@ jobs: - run: name: Running code checks command: make -C ${KAZOO_ROOT} code_checks - - run: - name: Running additional code style checks - command: ${KAZOO_ROOT}/scripts/code_checks.bash $CHANGED - run: name: Checking app source file command: make -C ${KAZOO_ROOT} app_applications @@ -311,19 +311,19 @@ jobs: at: ~/ - restore_cache: keys: - - plt-21-v3.1-{{ checksum "~/2600hz/kazoo/make/deps.mk" }} + - plt-v1-{{ checksum "~/2600hz/kazoo/make/deps.mk" }}-{{ checksum "/usr/local/lib/erlang/releases/RELEASES" }} - run: name: Dailyzing changed Erlang files command: TO_DIALYZE="$(echo $CHANGED)" make -C ${KAZOO_ROOT} build-plt dialyze - save_cache: - key: plt-21-v3.1-{{ checksum "~/2600hz/kazoo/make/deps.mk" }} + key: plt-v1-{{ checksum "~/2600hz/kazoo/make/deps.mk" }}-{{ checksum "/usr/local/lib/erlang/releases/RELEASES" }} paths: - ~/2600hz/kazoo/.kazoo.plt release: <<: *defaults docker: - - image: offical2600hz/circleci:21.3.8 + - image: offical2600hz/circleci:21.3.8.8 - image: couchdb:2.3.1 - image: 2600hz/rabbitmq steps: @@ -407,7 +407,7 @@ jobs: command: ${KAZOO_ROOT}/scripts/circleci.bash - restore_cache: keys: - - deps-centos-21-v3.2-{{ checksum "~/2600hz/kazoo/make/deps.mk" }} + - deps-centos-v1-{{ checksum "~/2600hz/kazoo/make/deps.mk" }}-{{ checksum "/usr/local/lib/erlang/releases/RELEASES" }} - run: name: Preparing dependencies for CentOS7 command: | @@ -423,7 +423,7 @@ jobs: ls -al $KAZOO_ROOT/make || true make -C ${KAZOO_ROOT} deps - save_cache: - key: deps-centos-21-v3.2-{{ checksum "~/2600hz/kazoo/make/deps.mk" }} + key: deps-centos-v1-{{ checksum "~/2600hz/kazoo/make/deps.mk" }}-{{ checksum "/usr/local/lib/erlang/releases/RELEASES" }} paths: - ~/2600hz/kazoo/deps/ - ~/2600hz/kazoo/.git/.kz_deps_hash diff --git a/applications/ecallmgr/.circleci/config.yml b/applications/ecallmgr/.circleci/config.yml index e2bc33a029e..938c7c142ac 100644 --- a/applications/ecallmgr/.circleci/config.yml +++ b/applications/ecallmgr/.circleci/config.yml @@ -2,7 +2,7 @@ version: 2 workflows: version: 2 - build-branch: + build_branch: jobs: - setup - build_deps: @@ -117,7 +117,7 @@ workflows: defaults: &defaults docker: - - image: offical2600hz/circleci:21.3.8 + - image: offical2600hz/circleci:21.3.8.8 shell: /bin/bash --login working_directory: ~/2600hz/the_app environment: @@ -185,9 +185,9 @@ jobs: at: ~/ - restore_cache: keys: - - deps-21-v3.2-{{ checksum "~/2600hz/kazoo/make/deps.mk" }} + - deps-v1-{{ checksum "~/2600hz/kazoo/make/deps.mk" }}-{{ checksum "/usr/local/lib/erlang/releases/RELEASES" }} - run: - name: Calculating dependency hash + name: Calculating dependency hash for CircleCI cache command: | deps_hash=$(md5sum $KAZOO_ROOT/make/deps.mk | cut -d" " -f1) if [ x"$(cat $KAZOO_ROOT/.git/.kz_deps_hash)" = x"$deps_hash" ]; then @@ -196,11 +196,16 @@ jobs: echo -n $(md5sum $KAZOO_ROOT/make/deps.mk | cut -d" " -f1) > "$KAZOO_ROOT/.git/.kz_deps_hash" md5sum $KAZOO_ROOT/make/deps.mk || true ls -al $KAZOO_ROOT/make || true + - run: + name: Show dependency hash + command: | + md5sum make/deps.mk || true + ls -al make || true - run: name: Making deps command: make -C ${KAZOO_ROOT} deps - save_cache: - key: deps-21-v3.2-{{ checksum "~/2600hz/kazoo/make/deps.mk" }} + key: deps-v1-{{ checksum "~/2600hz/kazoo/make/deps.mk" }}-{{ checksum "/usr/local/lib/erlang/releases/RELEASES" }} paths: - ~/2600hz/kazoo/deps/ - ~/2600hz/kazoo/.git/.kz_deps_hash @@ -216,12 +221,10 @@ jobs: at: ~/ - restore_cache: keys: - - deps-21-v3.2-{{ checksum "~/2600hz/kazoo/make/deps.mk" }} - - run: | - md5sum $KAZOO_ROOT/make/deps.mk || true - ls -al $KAZOO_ROOT/make || true - - run: make -C ${KAZOO_ROOT} fmt - - run: JOBS="2" make -C ${KAZOO_ROOT} + - deps-v1-{{ checksum "~/2600hz/kazoo/make/deps.mk" }}-{{ checksum "/usr/local/lib/erlang/releases/RELEASES" }} + - run: + name: Compiling the project + command: JOBS="2" make -C ${KAZOO_ROOT} - persist_to_workspace: root: ~/ paths: @@ -234,7 +237,7 @@ jobs: at: ~/ - restore_cache: keys: - - deps-21-v3.2-{{ checksum "~/2600hz/kazoo/make/deps.mk" }} + - deps-v1-{{ checksum "~/2600hz/kazoo/make/deps.mk" }}-{{ checksum "/usr/local/lib/erlang/releases/RELEASES" }} - run: name: Displaying deps hash command: | @@ -258,9 +261,6 @@ jobs: - run: name: Running code checks command: make -C ${KAZOO_ROOT} code_checks - - run: - name: Running additional code style checks - command: ${KAZOO_ROOT}/scripts/code_checks.bash $CHANGED - run: name: Checking app source file command: make -C ${KAZOO_ROOT} app_applications @@ -311,19 +311,19 @@ jobs: at: ~/ - restore_cache: keys: - - plt-21-v3.1-{{ checksum "~/2600hz/kazoo/make/deps.mk" }} + - plt-v1-{{ checksum "~/2600hz/kazoo/make/deps.mk" }}-{{ checksum "/usr/local/lib/erlang/releases/RELEASES" }} - run: name: Dailyzing changed Erlang files command: TO_DIALYZE="$(echo $CHANGED)" make -C ${KAZOO_ROOT} build-plt dialyze - save_cache: - key: plt-21-v3.1-{{ checksum "~/2600hz/kazoo/make/deps.mk" }} + key: plt-v1-{{ checksum "~/2600hz/kazoo/make/deps.mk" }}-{{ checksum "/usr/local/lib/erlang/releases/RELEASES" }} paths: - ~/2600hz/kazoo/.kazoo.plt release: <<: *defaults docker: - - image: offical2600hz/circleci:21.3.8 + - image: offical2600hz/circleci:21.3.8.8 - image: couchdb:2.3.1 - image: 2600hz/rabbitmq steps: @@ -407,7 +407,7 @@ jobs: command: ${KAZOO_ROOT}/scripts/circleci.bash - restore_cache: keys: - - deps-centos-21-v3.2-{{ checksum "~/2600hz/kazoo/make/deps.mk" }} + - deps-centos-v1-{{ checksum "~/2600hz/kazoo/make/deps.mk" }}-{{ checksum "/usr/local/lib/erlang/releases/RELEASES" }} - run: name: Preparing dependencies for CentOS7 command: | @@ -423,7 +423,7 @@ jobs: ls -al $KAZOO_ROOT/make || true make -C ${KAZOO_ROOT} deps - save_cache: - key: deps-centos-21-v3.2-{{ checksum "~/2600hz/kazoo/make/deps.mk" }} + key: deps-centos-v1-{{ checksum "~/2600hz/kazoo/make/deps.mk" }}-{{ checksum "/usr/local/lib/erlang/releases/RELEASES" }} paths: - ~/2600hz/kazoo/deps/ - ~/2600hz/kazoo/.git/.kz_deps_hash diff --git a/applications/edr/.circleci/config.yml b/applications/edr/.circleci/config.yml index e2bc33a029e..938c7c142ac 100644 --- a/applications/edr/.circleci/config.yml +++ b/applications/edr/.circleci/config.yml @@ -2,7 +2,7 @@ version: 2 workflows: version: 2 - build-branch: + build_branch: jobs: - setup - build_deps: @@ -117,7 +117,7 @@ workflows: defaults: &defaults docker: - - image: offical2600hz/circleci:21.3.8 + - image: offical2600hz/circleci:21.3.8.8 shell: /bin/bash --login working_directory: ~/2600hz/the_app environment: @@ -185,9 +185,9 @@ jobs: at: ~/ - restore_cache: keys: - - deps-21-v3.2-{{ checksum "~/2600hz/kazoo/make/deps.mk" }} + - deps-v1-{{ checksum "~/2600hz/kazoo/make/deps.mk" }}-{{ checksum "/usr/local/lib/erlang/releases/RELEASES" }} - run: - name: Calculating dependency hash + name: Calculating dependency hash for CircleCI cache command: | deps_hash=$(md5sum $KAZOO_ROOT/make/deps.mk | cut -d" " -f1) if [ x"$(cat $KAZOO_ROOT/.git/.kz_deps_hash)" = x"$deps_hash" ]; then @@ -196,11 +196,16 @@ jobs: echo -n $(md5sum $KAZOO_ROOT/make/deps.mk | cut -d" " -f1) > "$KAZOO_ROOT/.git/.kz_deps_hash" md5sum $KAZOO_ROOT/make/deps.mk || true ls -al $KAZOO_ROOT/make || true + - run: + name: Show dependency hash + command: | + md5sum make/deps.mk || true + ls -al make || true - run: name: Making deps command: make -C ${KAZOO_ROOT} deps - save_cache: - key: deps-21-v3.2-{{ checksum "~/2600hz/kazoo/make/deps.mk" }} + key: deps-v1-{{ checksum "~/2600hz/kazoo/make/deps.mk" }}-{{ checksum "/usr/local/lib/erlang/releases/RELEASES" }} paths: - ~/2600hz/kazoo/deps/ - ~/2600hz/kazoo/.git/.kz_deps_hash @@ -216,12 +221,10 @@ jobs: at: ~/ - restore_cache: keys: - - deps-21-v3.2-{{ checksum "~/2600hz/kazoo/make/deps.mk" }} - - run: | - md5sum $KAZOO_ROOT/make/deps.mk || true - ls -al $KAZOO_ROOT/make || true - - run: make -C ${KAZOO_ROOT} fmt - - run: JOBS="2" make -C ${KAZOO_ROOT} + - deps-v1-{{ checksum "~/2600hz/kazoo/make/deps.mk" }}-{{ checksum "/usr/local/lib/erlang/releases/RELEASES" }} + - run: + name: Compiling the project + command: JOBS="2" make -C ${KAZOO_ROOT} - persist_to_workspace: root: ~/ paths: @@ -234,7 +237,7 @@ jobs: at: ~/ - restore_cache: keys: - - deps-21-v3.2-{{ checksum "~/2600hz/kazoo/make/deps.mk" }} + - deps-v1-{{ checksum "~/2600hz/kazoo/make/deps.mk" }}-{{ checksum "/usr/local/lib/erlang/releases/RELEASES" }} - run: name: Displaying deps hash command: | @@ -258,9 +261,6 @@ jobs: - run: name: Running code checks command: make -C ${KAZOO_ROOT} code_checks - - run: - name: Running additional code style checks - command: ${KAZOO_ROOT}/scripts/code_checks.bash $CHANGED - run: name: Checking app source file command: make -C ${KAZOO_ROOT} app_applications @@ -311,19 +311,19 @@ jobs: at: ~/ - restore_cache: keys: - - plt-21-v3.1-{{ checksum "~/2600hz/kazoo/make/deps.mk" }} + - plt-v1-{{ checksum "~/2600hz/kazoo/make/deps.mk" }}-{{ checksum "/usr/local/lib/erlang/releases/RELEASES" }} - run: name: Dailyzing changed Erlang files command: TO_DIALYZE="$(echo $CHANGED)" make -C ${KAZOO_ROOT} build-plt dialyze - save_cache: - key: plt-21-v3.1-{{ checksum "~/2600hz/kazoo/make/deps.mk" }} + key: plt-v1-{{ checksum "~/2600hz/kazoo/make/deps.mk" }}-{{ checksum "/usr/local/lib/erlang/releases/RELEASES" }} paths: - ~/2600hz/kazoo/.kazoo.plt release: <<: *defaults docker: - - image: offical2600hz/circleci:21.3.8 + - image: offical2600hz/circleci:21.3.8.8 - image: couchdb:2.3.1 - image: 2600hz/rabbitmq steps: @@ -407,7 +407,7 @@ jobs: command: ${KAZOO_ROOT}/scripts/circleci.bash - restore_cache: keys: - - deps-centos-21-v3.2-{{ checksum "~/2600hz/kazoo/make/deps.mk" }} + - deps-centos-v1-{{ checksum "~/2600hz/kazoo/make/deps.mk" }}-{{ checksum "/usr/local/lib/erlang/releases/RELEASES" }} - run: name: Preparing dependencies for CentOS7 command: | @@ -423,7 +423,7 @@ jobs: ls -al $KAZOO_ROOT/make || true make -C ${KAZOO_ROOT} deps - save_cache: - key: deps-centos-21-v3.2-{{ checksum "~/2600hz/kazoo/make/deps.mk" }} + key: deps-centos-v1-{{ checksum "~/2600hz/kazoo/make/deps.mk" }}-{{ checksum "/usr/local/lib/erlang/releases/RELEASES" }} paths: - ~/2600hz/kazoo/deps/ - ~/2600hz/kazoo/.git/.kz_deps_hash diff --git a/applications/fax/.circleci/config.yml b/applications/fax/.circleci/config.yml index e2bc33a029e..938c7c142ac 100644 --- a/applications/fax/.circleci/config.yml +++ b/applications/fax/.circleci/config.yml @@ -2,7 +2,7 @@ version: 2 workflows: version: 2 - build-branch: + build_branch: jobs: - setup - build_deps: @@ -117,7 +117,7 @@ workflows: defaults: &defaults docker: - - image: offical2600hz/circleci:21.3.8 + - image: offical2600hz/circleci:21.3.8.8 shell: /bin/bash --login working_directory: ~/2600hz/the_app environment: @@ -185,9 +185,9 @@ jobs: at: ~/ - restore_cache: keys: - - deps-21-v3.2-{{ checksum "~/2600hz/kazoo/make/deps.mk" }} + - deps-v1-{{ checksum "~/2600hz/kazoo/make/deps.mk" }}-{{ checksum "/usr/local/lib/erlang/releases/RELEASES" }} - run: - name: Calculating dependency hash + name: Calculating dependency hash for CircleCI cache command: | deps_hash=$(md5sum $KAZOO_ROOT/make/deps.mk | cut -d" " -f1) if [ x"$(cat $KAZOO_ROOT/.git/.kz_deps_hash)" = x"$deps_hash" ]; then @@ -196,11 +196,16 @@ jobs: echo -n $(md5sum $KAZOO_ROOT/make/deps.mk | cut -d" " -f1) > "$KAZOO_ROOT/.git/.kz_deps_hash" md5sum $KAZOO_ROOT/make/deps.mk || true ls -al $KAZOO_ROOT/make || true + - run: + name: Show dependency hash + command: | + md5sum make/deps.mk || true + ls -al make || true - run: name: Making deps command: make -C ${KAZOO_ROOT} deps - save_cache: - key: deps-21-v3.2-{{ checksum "~/2600hz/kazoo/make/deps.mk" }} + key: deps-v1-{{ checksum "~/2600hz/kazoo/make/deps.mk" }}-{{ checksum "/usr/local/lib/erlang/releases/RELEASES" }} paths: - ~/2600hz/kazoo/deps/ - ~/2600hz/kazoo/.git/.kz_deps_hash @@ -216,12 +221,10 @@ jobs: at: ~/ - restore_cache: keys: - - deps-21-v3.2-{{ checksum "~/2600hz/kazoo/make/deps.mk" }} - - run: | - md5sum $KAZOO_ROOT/make/deps.mk || true - ls -al $KAZOO_ROOT/make || true - - run: make -C ${KAZOO_ROOT} fmt - - run: JOBS="2" make -C ${KAZOO_ROOT} + - deps-v1-{{ checksum "~/2600hz/kazoo/make/deps.mk" }}-{{ checksum "/usr/local/lib/erlang/releases/RELEASES" }} + - run: + name: Compiling the project + command: JOBS="2" make -C ${KAZOO_ROOT} - persist_to_workspace: root: ~/ paths: @@ -234,7 +237,7 @@ jobs: at: ~/ - restore_cache: keys: - - deps-21-v3.2-{{ checksum "~/2600hz/kazoo/make/deps.mk" }} + - deps-v1-{{ checksum "~/2600hz/kazoo/make/deps.mk" }}-{{ checksum "/usr/local/lib/erlang/releases/RELEASES" }} - run: name: Displaying deps hash command: | @@ -258,9 +261,6 @@ jobs: - run: name: Running code checks command: make -C ${KAZOO_ROOT} code_checks - - run: - name: Running additional code style checks - command: ${KAZOO_ROOT}/scripts/code_checks.bash $CHANGED - run: name: Checking app source file command: make -C ${KAZOO_ROOT} app_applications @@ -311,19 +311,19 @@ jobs: at: ~/ - restore_cache: keys: - - plt-21-v3.1-{{ checksum "~/2600hz/kazoo/make/deps.mk" }} + - plt-v1-{{ checksum "~/2600hz/kazoo/make/deps.mk" }}-{{ checksum "/usr/local/lib/erlang/releases/RELEASES" }} - run: name: Dailyzing changed Erlang files command: TO_DIALYZE="$(echo $CHANGED)" make -C ${KAZOO_ROOT} build-plt dialyze - save_cache: - key: plt-21-v3.1-{{ checksum "~/2600hz/kazoo/make/deps.mk" }} + key: plt-v1-{{ checksum "~/2600hz/kazoo/make/deps.mk" }}-{{ checksum "/usr/local/lib/erlang/releases/RELEASES" }} paths: - ~/2600hz/kazoo/.kazoo.plt release: <<: *defaults docker: - - image: offical2600hz/circleci:21.3.8 + - image: offical2600hz/circleci:21.3.8.8 - image: couchdb:2.3.1 - image: 2600hz/rabbitmq steps: @@ -407,7 +407,7 @@ jobs: command: ${KAZOO_ROOT}/scripts/circleci.bash - restore_cache: keys: - - deps-centos-21-v3.2-{{ checksum "~/2600hz/kazoo/make/deps.mk" }} + - deps-centos-v1-{{ checksum "~/2600hz/kazoo/make/deps.mk" }}-{{ checksum "/usr/local/lib/erlang/releases/RELEASES" }} - run: name: Preparing dependencies for CentOS7 command: | @@ -423,7 +423,7 @@ jobs: ls -al $KAZOO_ROOT/make || true make -C ${KAZOO_ROOT} deps - save_cache: - key: deps-centos-21-v3.2-{{ checksum "~/2600hz/kazoo/make/deps.mk" }} + key: deps-centos-v1-{{ checksum "~/2600hz/kazoo/make/deps.mk" }}-{{ checksum "/usr/local/lib/erlang/releases/RELEASES" }} paths: - ~/2600hz/kazoo/deps/ - ~/2600hz/kazoo/.git/.kz_deps_hash diff --git a/applications/frontier/.circleci/config.yml b/applications/frontier/.circleci/config.yml index e2bc33a029e..938c7c142ac 100644 --- a/applications/frontier/.circleci/config.yml +++ b/applications/frontier/.circleci/config.yml @@ -2,7 +2,7 @@ version: 2 workflows: version: 2 - build-branch: + build_branch: jobs: - setup - build_deps: @@ -117,7 +117,7 @@ workflows: defaults: &defaults docker: - - image: offical2600hz/circleci:21.3.8 + - image: offical2600hz/circleci:21.3.8.8 shell: /bin/bash --login working_directory: ~/2600hz/the_app environment: @@ -185,9 +185,9 @@ jobs: at: ~/ - restore_cache: keys: - - deps-21-v3.2-{{ checksum "~/2600hz/kazoo/make/deps.mk" }} + - deps-v1-{{ checksum "~/2600hz/kazoo/make/deps.mk" }}-{{ checksum "/usr/local/lib/erlang/releases/RELEASES" }} - run: - name: Calculating dependency hash + name: Calculating dependency hash for CircleCI cache command: | deps_hash=$(md5sum $KAZOO_ROOT/make/deps.mk | cut -d" " -f1) if [ x"$(cat $KAZOO_ROOT/.git/.kz_deps_hash)" = x"$deps_hash" ]; then @@ -196,11 +196,16 @@ jobs: echo -n $(md5sum $KAZOO_ROOT/make/deps.mk | cut -d" " -f1) > "$KAZOO_ROOT/.git/.kz_deps_hash" md5sum $KAZOO_ROOT/make/deps.mk || true ls -al $KAZOO_ROOT/make || true + - run: + name: Show dependency hash + command: | + md5sum make/deps.mk || true + ls -al make || true - run: name: Making deps command: make -C ${KAZOO_ROOT} deps - save_cache: - key: deps-21-v3.2-{{ checksum "~/2600hz/kazoo/make/deps.mk" }} + key: deps-v1-{{ checksum "~/2600hz/kazoo/make/deps.mk" }}-{{ checksum "/usr/local/lib/erlang/releases/RELEASES" }} paths: - ~/2600hz/kazoo/deps/ - ~/2600hz/kazoo/.git/.kz_deps_hash @@ -216,12 +221,10 @@ jobs: at: ~/ - restore_cache: keys: - - deps-21-v3.2-{{ checksum "~/2600hz/kazoo/make/deps.mk" }} - - run: | - md5sum $KAZOO_ROOT/make/deps.mk || true - ls -al $KAZOO_ROOT/make || true - - run: make -C ${KAZOO_ROOT} fmt - - run: JOBS="2" make -C ${KAZOO_ROOT} + - deps-v1-{{ checksum "~/2600hz/kazoo/make/deps.mk" }}-{{ checksum "/usr/local/lib/erlang/releases/RELEASES" }} + - run: + name: Compiling the project + command: JOBS="2" make -C ${KAZOO_ROOT} - persist_to_workspace: root: ~/ paths: @@ -234,7 +237,7 @@ jobs: at: ~/ - restore_cache: keys: - - deps-21-v3.2-{{ checksum "~/2600hz/kazoo/make/deps.mk" }} + - deps-v1-{{ checksum "~/2600hz/kazoo/make/deps.mk" }}-{{ checksum "/usr/local/lib/erlang/releases/RELEASES" }} - run: name: Displaying deps hash command: | @@ -258,9 +261,6 @@ jobs: - run: name: Running code checks command: make -C ${KAZOO_ROOT} code_checks - - run: - name: Running additional code style checks - command: ${KAZOO_ROOT}/scripts/code_checks.bash $CHANGED - run: name: Checking app source file command: make -C ${KAZOO_ROOT} app_applications @@ -311,19 +311,19 @@ jobs: at: ~/ - restore_cache: keys: - - plt-21-v3.1-{{ checksum "~/2600hz/kazoo/make/deps.mk" }} + - plt-v1-{{ checksum "~/2600hz/kazoo/make/deps.mk" }}-{{ checksum "/usr/local/lib/erlang/releases/RELEASES" }} - run: name: Dailyzing changed Erlang files command: TO_DIALYZE="$(echo $CHANGED)" make -C ${KAZOO_ROOT} build-plt dialyze - save_cache: - key: plt-21-v3.1-{{ checksum "~/2600hz/kazoo/make/deps.mk" }} + key: plt-v1-{{ checksum "~/2600hz/kazoo/make/deps.mk" }}-{{ checksum "/usr/local/lib/erlang/releases/RELEASES" }} paths: - ~/2600hz/kazoo/.kazoo.plt release: <<: *defaults docker: - - image: offical2600hz/circleci:21.3.8 + - image: offical2600hz/circleci:21.3.8.8 - image: couchdb:2.3.1 - image: 2600hz/rabbitmq steps: @@ -407,7 +407,7 @@ jobs: command: ${KAZOO_ROOT}/scripts/circleci.bash - restore_cache: keys: - - deps-centos-21-v3.2-{{ checksum "~/2600hz/kazoo/make/deps.mk" }} + - deps-centos-v1-{{ checksum "~/2600hz/kazoo/make/deps.mk" }}-{{ checksum "/usr/local/lib/erlang/releases/RELEASES" }} - run: name: Preparing dependencies for CentOS7 command: | @@ -423,7 +423,7 @@ jobs: ls -al $KAZOO_ROOT/make || true make -C ${KAZOO_ROOT} deps - save_cache: - key: deps-centos-21-v3.2-{{ checksum "~/2600hz/kazoo/make/deps.mk" }} + key: deps-centos-v1-{{ checksum "~/2600hz/kazoo/make/deps.mk" }}-{{ checksum "/usr/local/lib/erlang/releases/RELEASES" }} paths: - ~/2600hz/kazoo/deps/ - ~/2600hz/kazoo/.git/.kz_deps_hash diff --git a/applications/hangups/.circleci/config.yml b/applications/hangups/.circleci/config.yml index e2bc33a029e..938c7c142ac 100644 --- a/applications/hangups/.circleci/config.yml +++ b/applications/hangups/.circleci/config.yml @@ -2,7 +2,7 @@ version: 2 workflows: version: 2 - build-branch: + build_branch: jobs: - setup - build_deps: @@ -117,7 +117,7 @@ workflows: defaults: &defaults docker: - - image: offical2600hz/circleci:21.3.8 + - image: offical2600hz/circleci:21.3.8.8 shell: /bin/bash --login working_directory: ~/2600hz/the_app environment: @@ -185,9 +185,9 @@ jobs: at: ~/ - restore_cache: keys: - - deps-21-v3.2-{{ checksum "~/2600hz/kazoo/make/deps.mk" }} + - deps-v1-{{ checksum "~/2600hz/kazoo/make/deps.mk" }}-{{ checksum "/usr/local/lib/erlang/releases/RELEASES" }} - run: - name: Calculating dependency hash + name: Calculating dependency hash for CircleCI cache command: | deps_hash=$(md5sum $KAZOO_ROOT/make/deps.mk | cut -d" " -f1) if [ x"$(cat $KAZOO_ROOT/.git/.kz_deps_hash)" = x"$deps_hash" ]; then @@ -196,11 +196,16 @@ jobs: echo -n $(md5sum $KAZOO_ROOT/make/deps.mk | cut -d" " -f1) > "$KAZOO_ROOT/.git/.kz_deps_hash" md5sum $KAZOO_ROOT/make/deps.mk || true ls -al $KAZOO_ROOT/make || true + - run: + name: Show dependency hash + command: | + md5sum make/deps.mk || true + ls -al make || true - run: name: Making deps command: make -C ${KAZOO_ROOT} deps - save_cache: - key: deps-21-v3.2-{{ checksum "~/2600hz/kazoo/make/deps.mk" }} + key: deps-v1-{{ checksum "~/2600hz/kazoo/make/deps.mk" }}-{{ checksum "/usr/local/lib/erlang/releases/RELEASES" }} paths: - ~/2600hz/kazoo/deps/ - ~/2600hz/kazoo/.git/.kz_deps_hash @@ -216,12 +221,10 @@ jobs: at: ~/ - restore_cache: keys: - - deps-21-v3.2-{{ checksum "~/2600hz/kazoo/make/deps.mk" }} - - run: | - md5sum $KAZOO_ROOT/make/deps.mk || true - ls -al $KAZOO_ROOT/make || true - - run: make -C ${KAZOO_ROOT} fmt - - run: JOBS="2" make -C ${KAZOO_ROOT} + - deps-v1-{{ checksum "~/2600hz/kazoo/make/deps.mk" }}-{{ checksum "/usr/local/lib/erlang/releases/RELEASES" }} + - run: + name: Compiling the project + command: JOBS="2" make -C ${KAZOO_ROOT} - persist_to_workspace: root: ~/ paths: @@ -234,7 +237,7 @@ jobs: at: ~/ - restore_cache: keys: - - deps-21-v3.2-{{ checksum "~/2600hz/kazoo/make/deps.mk" }} + - deps-v1-{{ checksum "~/2600hz/kazoo/make/deps.mk" }}-{{ checksum "/usr/local/lib/erlang/releases/RELEASES" }} - run: name: Displaying deps hash command: | @@ -258,9 +261,6 @@ jobs: - run: name: Running code checks command: make -C ${KAZOO_ROOT} code_checks - - run: - name: Running additional code style checks - command: ${KAZOO_ROOT}/scripts/code_checks.bash $CHANGED - run: name: Checking app source file command: make -C ${KAZOO_ROOT} app_applications @@ -311,19 +311,19 @@ jobs: at: ~/ - restore_cache: keys: - - plt-21-v3.1-{{ checksum "~/2600hz/kazoo/make/deps.mk" }} + - plt-v1-{{ checksum "~/2600hz/kazoo/make/deps.mk" }}-{{ checksum "/usr/local/lib/erlang/releases/RELEASES" }} - run: name: Dailyzing changed Erlang files command: TO_DIALYZE="$(echo $CHANGED)" make -C ${KAZOO_ROOT} build-plt dialyze - save_cache: - key: plt-21-v3.1-{{ checksum "~/2600hz/kazoo/make/deps.mk" }} + key: plt-v1-{{ checksum "~/2600hz/kazoo/make/deps.mk" }}-{{ checksum "/usr/local/lib/erlang/releases/RELEASES" }} paths: - ~/2600hz/kazoo/.kazoo.plt release: <<: *defaults docker: - - image: offical2600hz/circleci:21.3.8 + - image: offical2600hz/circleci:21.3.8.8 - image: couchdb:2.3.1 - image: 2600hz/rabbitmq steps: @@ -407,7 +407,7 @@ jobs: command: ${KAZOO_ROOT}/scripts/circleci.bash - restore_cache: keys: - - deps-centos-21-v3.2-{{ checksum "~/2600hz/kazoo/make/deps.mk" }} + - deps-centos-v1-{{ checksum "~/2600hz/kazoo/make/deps.mk" }}-{{ checksum "/usr/local/lib/erlang/releases/RELEASES" }} - run: name: Preparing dependencies for CentOS7 command: | @@ -423,7 +423,7 @@ jobs: ls -al $KAZOO_ROOT/make || true make -C ${KAZOO_ROOT} deps - save_cache: - key: deps-centos-21-v3.2-{{ checksum "~/2600hz/kazoo/make/deps.mk" }} + key: deps-centos-v1-{{ checksum "~/2600hz/kazoo/make/deps.mk" }}-{{ checksum "/usr/local/lib/erlang/releases/RELEASES" }} paths: - ~/2600hz/kazoo/deps/ - ~/2600hz/kazoo/.git/.kz_deps_hash diff --git a/applications/hotornot/.circleci/config.yml b/applications/hotornot/.circleci/config.yml index e2bc33a029e..938c7c142ac 100644 --- a/applications/hotornot/.circleci/config.yml +++ b/applications/hotornot/.circleci/config.yml @@ -2,7 +2,7 @@ version: 2 workflows: version: 2 - build-branch: + build_branch: jobs: - setup - build_deps: @@ -117,7 +117,7 @@ workflows: defaults: &defaults docker: - - image: offical2600hz/circleci:21.3.8 + - image: offical2600hz/circleci:21.3.8.8 shell: /bin/bash --login working_directory: ~/2600hz/the_app environment: @@ -185,9 +185,9 @@ jobs: at: ~/ - restore_cache: keys: - - deps-21-v3.2-{{ checksum "~/2600hz/kazoo/make/deps.mk" }} + - deps-v1-{{ checksum "~/2600hz/kazoo/make/deps.mk" }}-{{ checksum "/usr/local/lib/erlang/releases/RELEASES" }} - run: - name: Calculating dependency hash + name: Calculating dependency hash for CircleCI cache command: | deps_hash=$(md5sum $KAZOO_ROOT/make/deps.mk | cut -d" " -f1) if [ x"$(cat $KAZOO_ROOT/.git/.kz_deps_hash)" = x"$deps_hash" ]; then @@ -196,11 +196,16 @@ jobs: echo -n $(md5sum $KAZOO_ROOT/make/deps.mk | cut -d" " -f1) > "$KAZOO_ROOT/.git/.kz_deps_hash" md5sum $KAZOO_ROOT/make/deps.mk || true ls -al $KAZOO_ROOT/make || true + - run: + name: Show dependency hash + command: | + md5sum make/deps.mk || true + ls -al make || true - run: name: Making deps command: make -C ${KAZOO_ROOT} deps - save_cache: - key: deps-21-v3.2-{{ checksum "~/2600hz/kazoo/make/deps.mk" }} + key: deps-v1-{{ checksum "~/2600hz/kazoo/make/deps.mk" }}-{{ checksum "/usr/local/lib/erlang/releases/RELEASES" }} paths: - ~/2600hz/kazoo/deps/ - ~/2600hz/kazoo/.git/.kz_deps_hash @@ -216,12 +221,10 @@ jobs: at: ~/ - restore_cache: keys: - - deps-21-v3.2-{{ checksum "~/2600hz/kazoo/make/deps.mk" }} - - run: | - md5sum $KAZOO_ROOT/make/deps.mk || true - ls -al $KAZOO_ROOT/make || true - - run: make -C ${KAZOO_ROOT} fmt - - run: JOBS="2" make -C ${KAZOO_ROOT} + - deps-v1-{{ checksum "~/2600hz/kazoo/make/deps.mk" }}-{{ checksum "/usr/local/lib/erlang/releases/RELEASES" }} + - run: + name: Compiling the project + command: JOBS="2" make -C ${KAZOO_ROOT} - persist_to_workspace: root: ~/ paths: @@ -234,7 +237,7 @@ jobs: at: ~/ - restore_cache: keys: - - deps-21-v3.2-{{ checksum "~/2600hz/kazoo/make/deps.mk" }} + - deps-v1-{{ checksum "~/2600hz/kazoo/make/deps.mk" }}-{{ checksum "/usr/local/lib/erlang/releases/RELEASES" }} - run: name: Displaying deps hash command: | @@ -258,9 +261,6 @@ jobs: - run: name: Running code checks command: make -C ${KAZOO_ROOT} code_checks - - run: - name: Running additional code style checks - command: ${KAZOO_ROOT}/scripts/code_checks.bash $CHANGED - run: name: Checking app source file command: make -C ${KAZOO_ROOT} app_applications @@ -311,19 +311,19 @@ jobs: at: ~/ - restore_cache: keys: - - plt-21-v3.1-{{ checksum "~/2600hz/kazoo/make/deps.mk" }} + - plt-v1-{{ checksum "~/2600hz/kazoo/make/deps.mk" }}-{{ checksum "/usr/local/lib/erlang/releases/RELEASES" }} - run: name: Dailyzing changed Erlang files command: TO_DIALYZE="$(echo $CHANGED)" make -C ${KAZOO_ROOT} build-plt dialyze - save_cache: - key: plt-21-v3.1-{{ checksum "~/2600hz/kazoo/make/deps.mk" }} + key: plt-v1-{{ checksum "~/2600hz/kazoo/make/deps.mk" }}-{{ checksum "/usr/local/lib/erlang/releases/RELEASES" }} paths: - ~/2600hz/kazoo/.kazoo.plt release: <<: *defaults docker: - - image: offical2600hz/circleci:21.3.8 + - image: offical2600hz/circleci:21.3.8.8 - image: couchdb:2.3.1 - image: 2600hz/rabbitmq steps: @@ -407,7 +407,7 @@ jobs: command: ${KAZOO_ROOT}/scripts/circleci.bash - restore_cache: keys: - - deps-centos-21-v3.2-{{ checksum "~/2600hz/kazoo/make/deps.mk" }} + - deps-centos-v1-{{ checksum "~/2600hz/kazoo/make/deps.mk" }}-{{ checksum "/usr/local/lib/erlang/releases/RELEASES" }} - run: name: Preparing dependencies for CentOS7 command: | @@ -423,7 +423,7 @@ jobs: ls -al $KAZOO_ROOT/make || true make -C ${KAZOO_ROOT} deps - save_cache: - key: deps-centos-21-v3.2-{{ checksum "~/2600hz/kazoo/make/deps.mk" }} + key: deps-centos-v1-{{ checksum "~/2600hz/kazoo/make/deps.mk" }}-{{ checksum "/usr/local/lib/erlang/releases/RELEASES" }} paths: - ~/2600hz/kazoo/deps/ - ~/2600hz/kazoo/.git/.kz_deps_hash diff --git a/applications/jonny5/.circleci/config.yml b/applications/jonny5/.circleci/config.yml index e2bc33a029e..938c7c142ac 100644 --- a/applications/jonny5/.circleci/config.yml +++ b/applications/jonny5/.circleci/config.yml @@ -2,7 +2,7 @@ version: 2 workflows: version: 2 - build-branch: + build_branch: jobs: - setup - build_deps: @@ -117,7 +117,7 @@ workflows: defaults: &defaults docker: - - image: offical2600hz/circleci:21.3.8 + - image: offical2600hz/circleci:21.3.8.8 shell: /bin/bash --login working_directory: ~/2600hz/the_app environment: @@ -185,9 +185,9 @@ jobs: at: ~/ - restore_cache: keys: - - deps-21-v3.2-{{ checksum "~/2600hz/kazoo/make/deps.mk" }} + - deps-v1-{{ checksum "~/2600hz/kazoo/make/deps.mk" }}-{{ checksum "/usr/local/lib/erlang/releases/RELEASES" }} - run: - name: Calculating dependency hash + name: Calculating dependency hash for CircleCI cache command: | deps_hash=$(md5sum $KAZOO_ROOT/make/deps.mk | cut -d" " -f1) if [ x"$(cat $KAZOO_ROOT/.git/.kz_deps_hash)" = x"$deps_hash" ]; then @@ -196,11 +196,16 @@ jobs: echo -n $(md5sum $KAZOO_ROOT/make/deps.mk | cut -d" " -f1) > "$KAZOO_ROOT/.git/.kz_deps_hash" md5sum $KAZOO_ROOT/make/deps.mk || true ls -al $KAZOO_ROOT/make || true + - run: + name: Show dependency hash + command: | + md5sum make/deps.mk || true + ls -al make || true - run: name: Making deps command: make -C ${KAZOO_ROOT} deps - save_cache: - key: deps-21-v3.2-{{ checksum "~/2600hz/kazoo/make/deps.mk" }} + key: deps-v1-{{ checksum "~/2600hz/kazoo/make/deps.mk" }}-{{ checksum "/usr/local/lib/erlang/releases/RELEASES" }} paths: - ~/2600hz/kazoo/deps/ - ~/2600hz/kazoo/.git/.kz_deps_hash @@ -216,12 +221,10 @@ jobs: at: ~/ - restore_cache: keys: - - deps-21-v3.2-{{ checksum "~/2600hz/kazoo/make/deps.mk" }} - - run: | - md5sum $KAZOO_ROOT/make/deps.mk || true - ls -al $KAZOO_ROOT/make || true - - run: make -C ${KAZOO_ROOT} fmt - - run: JOBS="2" make -C ${KAZOO_ROOT} + - deps-v1-{{ checksum "~/2600hz/kazoo/make/deps.mk" }}-{{ checksum "/usr/local/lib/erlang/releases/RELEASES" }} + - run: + name: Compiling the project + command: JOBS="2" make -C ${KAZOO_ROOT} - persist_to_workspace: root: ~/ paths: @@ -234,7 +237,7 @@ jobs: at: ~/ - restore_cache: keys: - - deps-21-v3.2-{{ checksum "~/2600hz/kazoo/make/deps.mk" }} + - deps-v1-{{ checksum "~/2600hz/kazoo/make/deps.mk" }}-{{ checksum "/usr/local/lib/erlang/releases/RELEASES" }} - run: name: Displaying deps hash command: | @@ -258,9 +261,6 @@ jobs: - run: name: Running code checks command: make -C ${KAZOO_ROOT} code_checks - - run: - name: Running additional code style checks - command: ${KAZOO_ROOT}/scripts/code_checks.bash $CHANGED - run: name: Checking app source file command: make -C ${KAZOO_ROOT} app_applications @@ -311,19 +311,19 @@ jobs: at: ~/ - restore_cache: keys: - - plt-21-v3.1-{{ checksum "~/2600hz/kazoo/make/deps.mk" }} + - plt-v1-{{ checksum "~/2600hz/kazoo/make/deps.mk" }}-{{ checksum "/usr/local/lib/erlang/releases/RELEASES" }} - run: name: Dailyzing changed Erlang files command: TO_DIALYZE="$(echo $CHANGED)" make -C ${KAZOO_ROOT} build-plt dialyze - save_cache: - key: plt-21-v3.1-{{ checksum "~/2600hz/kazoo/make/deps.mk" }} + key: plt-v1-{{ checksum "~/2600hz/kazoo/make/deps.mk" }}-{{ checksum "/usr/local/lib/erlang/releases/RELEASES" }} paths: - ~/2600hz/kazoo/.kazoo.plt release: <<: *defaults docker: - - image: offical2600hz/circleci:21.3.8 + - image: offical2600hz/circleci:21.3.8.8 - image: couchdb:2.3.1 - image: 2600hz/rabbitmq steps: @@ -407,7 +407,7 @@ jobs: command: ${KAZOO_ROOT}/scripts/circleci.bash - restore_cache: keys: - - deps-centos-21-v3.2-{{ checksum "~/2600hz/kazoo/make/deps.mk" }} + - deps-centos-v1-{{ checksum "~/2600hz/kazoo/make/deps.mk" }}-{{ checksum "/usr/local/lib/erlang/releases/RELEASES" }} - run: name: Preparing dependencies for CentOS7 command: | @@ -423,7 +423,7 @@ jobs: ls -al $KAZOO_ROOT/make || true make -C ${KAZOO_ROOT} deps - save_cache: - key: deps-centos-21-v3.2-{{ checksum "~/2600hz/kazoo/make/deps.mk" }} + key: deps-centos-v1-{{ checksum "~/2600hz/kazoo/make/deps.mk" }}-{{ checksum "/usr/local/lib/erlang/releases/RELEASES" }} paths: - ~/2600hz/kazoo/deps/ - ~/2600hz/kazoo/.git/.kz_deps_hash diff --git a/applications/konami/.circleci/config.yml b/applications/konami/.circleci/config.yml index e2bc33a029e..938c7c142ac 100644 --- a/applications/konami/.circleci/config.yml +++ b/applications/konami/.circleci/config.yml @@ -2,7 +2,7 @@ version: 2 workflows: version: 2 - build-branch: + build_branch: jobs: - setup - build_deps: @@ -117,7 +117,7 @@ workflows: defaults: &defaults docker: - - image: offical2600hz/circleci:21.3.8 + - image: offical2600hz/circleci:21.3.8.8 shell: /bin/bash --login working_directory: ~/2600hz/the_app environment: @@ -185,9 +185,9 @@ jobs: at: ~/ - restore_cache: keys: - - deps-21-v3.2-{{ checksum "~/2600hz/kazoo/make/deps.mk" }} + - deps-v1-{{ checksum "~/2600hz/kazoo/make/deps.mk" }}-{{ checksum "/usr/local/lib/erlang/releases/RELEASES" }} - run: - name: Calculating dependency hash + name: Calculating dependency hash for CircleCI cache command: | deps_hash=$(md5sum $KAZOO_ROOT/make/deps.mk | cut -d" " -f1) if [ x"$(cat $KAZOO_ROOT/.git/.kz_deps_hash)" = x"$deps_hash" ]; then @@ -196,11 +196,16 @@ jobs: echo -n $(md5sum $KAZOO_ROOT/make/deps.mk | cut -d" " -f1) > "$KAZOO_ROOT/.git/.kz_deps_hash" md5sum $KAZOO_ROOT/make/deps.mk || true ls -al $KAZOO_ROOT/make || true + - run: + name: Show dependency hash + command: | + md5sum make/deps.mk || true + ls -al make || true - run: name: Making deps command: make -C ${KAZOO_ROOT} deps - save_cache: - key: deps-21-v3.2-{{ checksum "~/2600hz/kazoo/make/deps.mk" }} + key: deps-v1-{{ checksum "~/2600hz/kazoo/make/deps.mk" }}-{{ checksum "/usr/local/lib/erlang/releases/RELEASES" }} paths: - ~/2600hz/kazoo/deps/ - ~/2600hz/kazoo/.git/.kz_deps_hash @@ -216,12 +221,10 @@ jobs: at: ~/ - restore_cache: keys: - - deps-21-v3.2-{{ checksum "~/2600hz/kazoo/make/deps.mk" }} - - run: | - md5sum $KAZOO_ROOT/make/deps.mk || true - ls -al $KAZOO_ROOT/make || true - - run: make -C ${KAZOO_ROOT} fmt - - run: JOBS="2" make -C ${KAZOO_ROOT} + - deps-v1-{{ checksum "~/2600hz/kazoo/make/deps.mk" }}-{{ checksum "/usr/local/lib/erlang/releases/RELEASES" }} + - run: + name: Compiling the project + command: JOBS="2" make -C ${KAZOO_ROOT} - persist_to_workspace: root: ~/ paths: @@ -234,7 +237,7 @@ jobs: at: ~/ - restore_cache: keys: - - deps-21-v3.2-{{ checksum "~/2600hz/kazoo/make/deps.mk" }} + - deps-v1-{{ checksum "~/2600hz/kazoo/make/deps.mk" }}-{{ checksum "/usr/local/lib/erlang/releases/RELEASES" }} - run: name: Displaying deps hash command: | @@ -258,9 +261,6 @@ jobs: - run: name: Running code checks command: make -C ${KAZOO_ROOT} code_checks - - run: - name: Running additional code style checks - command: ${KAZOO_ROOT}/scripts/code_checks.bash $CHANGED - run: name: Checking app source file command: make -C ${KAZOO_ROOT} app_applications @@ -311,19 +311,19 @@ jobs: at: ~/ - restore_cache: keys: - - plt-21-v3.1-{{ checksum "~/2600hz/kazoo/make/deps.mk" }} + - plt-v1-{{ checksum "~/2600hz/kazoo/make/deps.mk" }}-{{ checksum "/usr/local/lib/erlang/releases/RELEASES" }} - run: name: Dailyzing changed Erlang files command: TO_DIALYZE="$(echo $CHANGED)" make -C ${KAZOO_ROOT} build-plt dialyze - save_cache: - key: plt-21-v3.1-{{ checksum "~/2600hz/kazoo/make/deps.mk" }} + key: plt-v1-{{ checksum "~/2600hz/kazoo/make/deps.mk" }}-{{ checksum "/usr/local/lib/erlang/releases/RELEASES" }} paths: - ~/2600hz/kazoo/.kazoo.plt release: <<: *defaults docker: - - image: offical2600hz/circleci:21.3.8 + - image: offical2600hz/circleci:21.3.8.8 - image: couchdb:2.3.1 - image: 2600hz/rabbitmq steps: @@ -407,7 +407,7 @@ jobs: command: ${KAZOO_ROOT}/scripts/circleci.bash - restore_cache: keys: - - deps-centos-21-v3.2-{{ checksum "~/2600hz/kazoo/make/deps.mk" }} + - deps-centos-v1-{{ checksum "~/2600hz/kazoo/make/deps.mk" }}-{{ checksum "/usr/local/lib/erlang/releases/RELEASES" }} - run: name: Preparing dependencies for CentOS7 command: | @@ -423,7 +423,7 @@ jobs: ls -al $KAZOO_ROOT/make || true make -C ${KAZOO_ROOT} deps - save_cache: - key: deps-centos-21-v3.2-{{ checksum "~/2600hz/kazoo/make/deps.mk" }} + key: deps-centos-v1-{{ checksum "~/2600hz/kazoo/make/deps.mk" }}-{{ checksum "/usr/local/lib/erlang/releases/RELEASES" }} paths: - ~/2600hz/kazoo/deps/ - ~/2600hz/kazoo/.git/.kz_deps_hash diff --git a/applications/media_mgr/.circleci/config.yml b/applications/media_mgr/.circleci/config.yml index e2bc33a029e..938c7c142ac 100644 --- a/applications/media_mgr/.circleci/config.yml +++ b/applications/media_mgr/.circleci/config.yml @@ -2,7 +2,7 @@ version: 2 workflows: version: 2 - build-branch: + build_branch: jobs: - setup - build_deps: @@ -117,7 +117,7 @@ workflows: defaults: &defaults docker: - - image: offical2600hz/circleci:21.3.8 + - image: offical2600hz/circleci:21.3.8.8 shell: /bin/bash --login working_directory: ~/2600hz/the_app environment: @@ -185,9 +185,9 @@ jobs: at: ~/ - restore_cache: keys: - - deps-21-v3.2-{{ checksum "~/2600hz/kazoo/make/deps.mk" }} + - deps-v1-{{ checksum "~/2600hz/kazoo/make/deps.mk" }}-{{ checksum "/usr/local/lib/erlang/releases/RELEASES" }} - run: - name: Calculating dependency hash + name: Calculating dependency hash for CircleCI cache command: | deps_hash=$(md5sum $KAZOO_ROOT/make/deps.mk | cut -d" " -f1) if [ x"$(cat $KAZOO_ROOT/.git/.kz_deps_hash)" = x"$deps_hash" ]; then @@ -196,11 +196,16 @@ jobs: echo -n $(md5sum $KAZOO_ROOT/make/deps.mk | cut -d" " -f1) > "$KAZOO_ROOT/.git/.kz_deps_hash" md5sum $KAZOO_ROOT/make/deps.mk || true ls -al $KAZOO_ROOT/make || true + - run: + name: Show dependency hash + command: | + md5sum make/deps.mk || true + ls -al make || true - run: name: Making deps command: make -C ${KAZOO_ROOT} deps - save_cache: - key: deps-21-v3.2-{{ checksum "~/2600hz/kazoo/make/deps.mk" }} + key: deps-v1-{{ checksum "~/2600hz/kazoo/make/deps.mk" }}-{{ checksum "/usr/local/lib/erlang/releases/RELEASES" }} paths: - ~/2600hz/kazoo/deps/ - ~/2600hz/kazoo/.git/.kz_deps_hash @@ -216,12 +221,10 @@ jobs: at: ~/ - restore_cache: keys: - - deps-21-v3.2-{{ checksum "~/2600hz/kazoo/make/deps.mk" }} - - run: | - md5sum $KAZOO_ROOT/make/deps.mk || true - ls -al $KAZOO_ROOT/make || true - - run: make -C ${KAZOO_ROOT} fmt - - run: JOBS="2" make -C ${KAZOO_ROOT} + - deps-v1-{{ checksum "~/2600hz/kazoo/make/deps.mk" }}-{{ checksum "/usr/local/lib/erlang/releases/RELEASES" }} + - run: + name: Compiling the project + command: JOBS="2" make -C ${KAZOO_ROOT} - persist_to_workspace: root: ~/ paths: @@ -234,7 +237,7 @@ jobs: at: ~/ - restore_cache: keys: - - deps-21-v3.2-{{ checksum "~/2600hz/kazoo/make/deps.mk" }} + - deps-v1-{{ checksum "~/2600hz/kazoo/make/deps.mk" }}-{{ checksum "/usr/local/lib/erlang/releases/RELEASES" }} - run: name: Displaying deps hash command: | @@ -258,9 +261,6 @@ jobs: - run: name: Running code checks command: make -C ${KAZOO_ROOT} code_checks - - run: - name: Running additional code style checks - command: ${KAZOO_ROOT}/scripts/code_checks.bash $CHANGED - run: name: Checking app source file command: make -C ${KAZOO_ROOT} app_applications @@ -311,19 +311,19 @@ jobs: at: ~/ - restore_cache: keys: - - plt-21-v3.1-{{ checksum "~/2600hz/kazoo/make/deps.mk" }} + - plt-v1-{{ checksum "~/2600hz/kazoo/make/deps.mk" }}-{{ checksum "/usr/local/lib/erlang/releases/RELEASES" }} - run: name: Dailyzing changed Erlang files command: TO_DIALYZE="$(echo $CHANGED)" make -C ${KAZOO_ROOT} build-plt dialyze - save_cache: - key: plt-21-v3.1-{{ checksum "~/2600hz/kazoo/make/deps.mk" }} + key: plt-v1-{{ checksum "~/2600hz/kazoo/make/deps.mk" }}-{{ checksum "/usr/local/lib/erlang/releases/RELEASES" }} paths: - ~/2600hz/kazoo/.kazoo.plt release: <<: *defaults docker: - - image: offical2600hz/circleci:21.3.8 + - image: offical2600hz/circleci:21.3.8.8 - image: couchdb:2.3.1 - image: 2600hz/rabbitmq steps: @@ -407,7 +407,7 @@ jobs: command: ${KAZOO_ROOT}/scripts/circleci.bash - restore_cache: keys: - - deps-centos-21-v3.2-{{ checksum "~/2600hz/kazoo/make/deps.mk" }} + - deps-centos-v1-{{ checksum "~/2600hz/kazoo/make/deps.mk" }}-{{ checksum "/usr/local/lib/erlang/releases/RELEASES" }} - run: name: Preparing dependencies for CentOS7 command: | @@ -423,7 +423,7 @@ jobs: ls -al $KAZOO_ROOT/make || true make -C ${KAZOO_ROOT} deps - save_cache: - key: deps-centos-21-v3.2-{{ checksum "~/2600hz/kazoo/make/deps.mk" }} + key: deps-centos-v1-{{ checksum "~/2600hz/kazoo/make/deps.mk" }}-{{ checksum "/usr/local/lib/erlang/releases/RELEASES" }} paths: - ~/2600hz/kazoo/deps/ - ~/2600hz/kazoo/.git/.kz_deps_hash diff --git a/applications/milliwatt/.circleci/config.yml b/applications/milliwatt/.circleci/config.yml index e2bc33a029e..938c7c142ac 100644 --- a/applications/milliwatt/.circleci/config.yml +++ b/applications/milliwatt/.circleci/config.yml @@ -2,7 +2,7 @@ version: 2 workflows: version: 2 - build-branch: + build_branch: jobs: - setup - build_deps: @@ -117,7 +117,7 @@ workflows: defaults: &defaults docker: - - image: offical2600hz/circleci:21.3.8 + - image: offical2600hz/circleci:21.3.8.8 shell: /bin/bash --login working_directory: ~/2600hz/the_app environment: @@ -185,9 +185,9 @@ jobs: at: ~/ - restore_cache: keys: - - deps-21-v3.2-{{ checksum "~/2600hz/kazoo/make/deps.mk" }} + - deps-v1-{{ checksum "~/2600hz/kazoo/make/deps.mk" }}-{{ checksum "/usr/local/lib/erlang/releases/RELEASES" }} - run: - name: Calculating dependency hash + name: Calculating dependency hash for CircleCI cache command: | deps_hash=$(md5sum $KAZOO_ROOT/make/deps.mk | cut -d" " -f1) if [ x"$(cat $KAZOO_ROOT/.git/.kz_deps_hash)" = x"$deps_hash" ]; then @@ -196,11 +196,16 @@ jobs: echo -n $(md5sum $KAZOO_ROOT/make/deps.mk | cut -d" " -f1) > "$KAZOO_ROOT/.git/.kz_deps_hash" md5sum $KAZOO_ROOT/make/deps.mk || true ls -al $KAZOO_ROOT/make || true + - run: + name: Show dependency hash + command: | + md5sum make/deps.mk || true + ls -al make || true - run: name: Making deps command: make -C ${KAZOO_ROOT} deps - save_cache: - key: deps-21-v3.2-{{ checksum "~/2600hz/kazoo/make/deps.mk" }} + key: deps-v1-{{ checksum "~/2600hz/kazoo/make/deps.mk" }}-{{ checksum "/usr/local/lib/erlang/releases/RELEASES" }} paths: - ~/2600hz/kazoo/deps/ - ~/2600hz/kazoo/.git/.kz_deps_hash @@ -216,12 +221,10 @@ jobs: at: ~/ - restore_cache: keys: - - deps-21-v3.2-{{ checksum "~/2600hz/kazoo/make/deps.mk" }} - - run: | - md5sum $KAZOO_ROOT/make/deps.mk || true - ls -al $KAZOO_ROOT/make || true - - run: make -C ${KAZOO_ROOT} fmt - - run: JOBS="2" make -C ${KAZOO_ROOT} + - deps-v1-{{ checksum "~/2600hz/kazoo/make/deps.mk" }}-{{ checksum "/usr/local/lib/erlang/releases/RELEASES" }} + - run: + name: Compiling the project + command: JOBS="2" make -C ${KAZOO_ROOT} - persist_to_workspace: root: ~/ paths: @@ -234,7 +237,7 @@ jobs: at: ~/ - restore_cache: keys: - - deps-21-v3.2-{{ checksum "~/2600hz/kazoo/make/deps.mk" }} + - deps-v1-{{ checksum "~/2600hz/kazoo/make/deps.mk" }}-{{ checksum "/usr/local/lib/erlang/releases/RELEASES" }} - run: name: Displaying deps hash command: | @@ -258,9 +261,6 @@ jobs: - run: name: Running code checks command: make -C ${KAZOO_ROOT} code_checks - - run: - name: Running additional code style checks - command: ${KAZOO_ROOT}/scripts/code_checks.bash $CHANGED - run: name: Checking app source file command: make -C ${KAZOO_ROOT} app_applications @@ -311,19 +311,19 @@ jobs: at: ~/ - restore_cache: keys: - - plt-21-v3.1-{{ checksum "~/2600hz/kazoo/make/deps.mk" }} + - plt-v1-{{ checksum "~/2600hz/kazoo/make/deps.mk" }}-{{ checksum "/usr/local/lib/erlang/releases/RELEASES" }} - run: name: Dailyzing changed Erlang files command: TO_DIALYZE="$(echo $CHANGED)" make -C ${KAZOO_ROOT} build-plt dialyze - save_cache: - key: plt-21-v3.1-{{ checksum "~/2600hz/kazoo/make/deps.mk" }} + key: plt-v1-{{ checksum "~/2600hz/kazoo/make/deps.mk" }}-{{ checksum "/usr/local/lib/erlang/releases/RELEASES" }} paths: - ~/2600hz/kazoo/.kazoo.plt release: <<: *defaults docker: - - image: offical2600hz/circleci:21.3.8 + - image: offical2600hz/circleci:21.3.8.8 - image: couchdb:2.3.1 - image: 2600hz/rabbitmq steps: @@ -407,7 +407,7 @@ jobs: command: ${KAZOO_ROOT}/scripts/circleci.bash - restore_cache: keys: - - deps-centos-21-v3.2-{{ checksum "~/2600hz/kazoo/make/deps.mk" }} + - deps-centos-v1-{{ checksum "~/2600hz/kazoo/make/deps.mk" }}-{{ checksum "/usr/local/lib/erlang/releases/RELEASES" }} - run: name: Preparing dependencies for CentOS7 command: | @@ -423,7 +423,7 @@ jobs: ls -al $KAZOO_ROOT/make || true make -C ${KAZOO_ROOT} deps - save_cache: - key: deps-centos-21-v3.2-{{ checksum "~/2600hz/kazoo/make/deps.mk" }} + key: deps-centos-v1-{{ checksum "~/2600hz/kazoo/make/deps.mk" }}-{{ checksum "/usr/local/lib/erlang/releases/RELEASES" }} paths: - ~/2600hz/kazoo/deps/ - ~/2600hz/kazoo/.git/.kz_deps_hash diff --git a/applications/notify/.circleci/config.yml b/applications/notify/.circleci/config.yml index e2bc33a029e..938c7c142ac 100644 --- a/applications/notify/.circleci/config.yml +++ b/applications/notify/.circleci/config.yml @@ -2,7 +2,7 @@ version: 2 workflows: version: 2 - build-branch: + build_branch: jobs: - setup - build_deps: @@ -117,7 +117,7 @@ workflows: defaults: &defaults docker: - - image: offical2600hz/circleci:21.3.8 + - image: offical2600hz/circleci:21.3.8.8 shell: /bin/bash --login working_directory: ~/2600hz/the_app environment: @@ -185,9 +185,9 @@ jobs: at: ~/ - restore_cache: keys: - - deps-21-v3.2-{{ checksum "~/2600hz/kazoo/make/deps.mk" }} + - deps-v1-{{ checksum "~/2600hz/kazoo/make/deps.mk" }}-{{ checksum "/usr/local/lib/erlang/releases/RELEASES" }} - run: - name: Calculating dependency hash + name: Calculating dependency hash for CircleCI cache command: | deps_hash=$(md5sum $KAZOO_ROOT/make/deps.mk | cut -d" " -f1) if [ x"$(cat $KAZOO_ROOT/.git/.kz_deps_hash)" = x"$deps_hash" ]; then @@ -196,11 +196,16 @@ jobs: echo -n $(md5sum $KAZOO_ROOT/make/deps.mk | cut -d" " -f1) > "$KAZOO_ROOT/.git/.kz_deps_hash" md5sum $KAZOO_ROOT/make/deps.mk || true ls -al $KAZOO_ROOT/make || true + - run: + name: Show dependency hash + command: | + md5sum make/deps.mk || true + ls -al make || true - run: name: Making deps command: make -C ${KAZOO_ROOT} deps - save_cache: - key: deps-21-v3.2-{{ checksum "~/2600hz/kazoo/make/deps.mk" }} + key: deps-v1-{{ checksum "~/2600hz/kazoo/make/deps.mk" }}-{{ checksum "/usr/local/lib/erlang/releases/RELEASES" }} paths: - ~/2600hz/kazoo/deps/ - ~/2600hz/kazoo/.git/.kz_deps_hash @@ -216,12 +221,10 @@ jobs: at: ~/ - restore_cache: keys: - - deps-21-v3.2-{{ checksum "~/2600hz/kazoo/make/deps.mk" }} - - run: | - md5sum $KAZOO_ROOT/make/deps.mk || true - ls -al $KAZOO_ROOT/make || true - - run: make -C ${KAZOO_ROOT} fmt - - run: JOBS="2" make -C ${KAZOO_ROOT} + - deps-v1-{{ checksum "~/2600hz/kazoo/make/deps.mk" }}-{{ checksum "/usr/local/lib/erlang/releases/RELEASES" }} + - run: + name: Compiling the project + command: JOBS="2" make -C ${KAZOO_ROOT} - persist_to_workspace: root: ~/ paths: @@ -234,7 +237,7 @@ jobs: at: ~/ - restore_cache: keys: - - deps-21-v3.2-{{ checksum "~/2600hz/kazoo/make/deps.mk" }} + - deps-v1-{{ checksum "~/2600hz/kazoo/make/deps.mk" }}-{{ checksum "/usr/local/lib/erlang/releases/RELEASES" }} - run: name: Displaying deps hash command: | @@ -258,9 +261,6 @@ jobs: - run: name: Running code checks command: make -C ${KAZOO_ROOT} code_checks - - run: - name: Running additional code style checks - command: ${KAZOO_ROOT}/scripts/code_checks.bash $CHANGED - run: name: Checking app source file command: make -C ${KAZOO_ROOT} app_applications @@ -311,19 +311,19 @@ jobs: at: ~/ - restore_cache: keys: - - plt-21-v3.1-{{ checksum "~/2600hz/kazoo/make/deps.mk" }} + - plt-v1-{{ checksum "~/2600hz/kazoo/make/deps.mk" }}-{{ checksum "/usr/local/lib/erlang/releases/RELEASES" }} - run: name: Dailyzing changed Erlang files command: TO_DIALYZE="$(echo $CHANGED)" make -C ${KAZOO_ROOT} build-plt dialyze - save_cache: - key: plt-21-v3.1-{{ checksum "~/2600hz/kazoo/make/deps.mk" }} + key: plt-v1-{{ checksum "~/2600hz/kazoo/make/deps.mk" }}-{{ checksum "/usr/local/lib/erlang/releases/RELEASES" }} paths: - ~/2600hz/kazoo/.kazoo.plt release: <<: *defaults docker: - - image: offical2600hz/circleci:21.3.8 + - image: offical2600hz/circleci:21.3.8.8 - image: couchdb:2.3.1 - image: 2600hz/rabbitmq steps: @@ -407,7 +407,7 @@ jobs: command: ${KAZOO_ROOT}/scripts/circleci.bash - restore_cache: keys: - - deps-centos-21-v3.2-{{ checksum "~/2600hz/kazoo/make/deps.mk" }} + - deps-centos-v1-{{ checksum "~/2600hz/kazoo/make/deps.mk" }}-{{ checksum "/usr/local/lib/erlang/releases/RELEASES" }} - run: name: Preparing dependencies for CentOS7 command: | @@ -423,7 +423,7 @@ jobs: ls -al $KAZOO_ROOT/make || true make -C ${KAZOO_ROOT} deps - save_cache: - key: deps-centos-21-v3.2-{{ checksum "~/2600hz/kazoo/make/deps.mk" }} + key: deps-centos-v1-{{ checksum "~/2600hz/kazoo/make/deps.mk" }}-{{ checksum "/usr/local/lib/erlang/releases/RELEASES" }} paths: - ~/2600hz/kazoo/deps/ - ~/2600hz/kazoo/.git/.kz_deps_hash diff --git a/applications/omnipresence/.circleci/config.yml b/applications/omnipresence/.circleci/config.yml index e2bc33a029e..938c7c142ac 100644 --- a/applications/omnipresence/.circleci/config.yml +++ b/applications/omnipresence/.circleci/config.yml @@ -2,7 +2,7 @@ version: 2 workflows: version: 2 - build-branch: + build_branch: jobs: - setup - build_deps: @@ -117,7 +117,7 @@ workflows: defaults: &defaults docker: - - image: offical2600hz/circleci:21.3.8 + - image: offical2600hz/circleci:21.3.8.8 shell: /bin/bash --login working_directory: ~/2600hz/the_app environment: @@ -185,9 +185,9 @@ jobs: at: ~/ - restore_cache: keys: - - deps-21-v3.2-{{ checksum "~/2600hz/kazoo/make/deps.mk" }} + - deps-v1-{{ checksum "~/2600hz/kazoo/make/deps.mk" }}-{{ checksum "/usr/local/lib/erlang/releases/RELEASES" }} - run: - name: Calculating dependency hash + name: Calculating dependency hash for CircleCI cache command: | deps_hash=$(md5sum $KAZOO_ROOT/make/deps.mk | cut -d" " -f1) if [ x"$(cat $KAZOO_ROOT/.git/.kz_deps_hash)" = x"$deps_hash" ]; then @@ -196,11 +196,16 @@ jobs: echo -n $(md5sum $KAZOO_ROOT/make/deps.mk | cut -d" " -f1) > "$KAZOO_ROOT/.git/.kz_deps_hash" md5sum $KAZOO_ROOT/make/deps.mk || true ls -al $KAZOO_ROOT/make || true + - run: + name: Show dependency hash + command: | + md5sum make/deps.mk || true + ls -al make || true - run: name: Making deps command: make -C ${KAZOO_ROOT} deps - save_cache: - key: deps-21-v3.2-{{ checksum "~/2600hz/kazoo/make/deps.mk" }} + key: deps-v1-{{ checksum "~/2600hz/kazoo/make/deps.mk" }}-{{ checksum "/usr/local/lib/erlang/releases/RELEASES" }} paths: - ~/2600hz/kazoo/deps/ - ~/2600hz/kazoo/.git/.kz_deps_hash @@ -216,12 +221,10 @@ jobs: at: ~/ - restore_cache: keys: - - deps-21-v3.2-{{ checksum "~/2600hz/kazoo/make/deps.mk" }} - - run: | - md5sum $KAZOO_ROOT/make/deps.mk || true - ls -al $KAZOO_ROOT/make || true - - run: make -C ${KAZOO_ROOT} fmt - - run: JOBS="2" make -C ${KAZOO_ROOT} + - deps-v1-{{ checksum "~/2600hz/kazoo/make/deps.mk" }}-{{ checksum "/usr/local/lib/erlang/releases/RELEASES" }} + - run: + name: Compiling the project + command: JOBS="2" make -C ${KAZOO_ROOT} - persist_to_workspace: root: ~/ paths: @@ -234,7 +237,7 @@ jobs: at: ~/ - restore_cache: keys: - - deps-21-v3.2-{{ checksum "~/2600hz/kazoo/make/deps.mk" }} + - deps-v1-{{ checksum "~/2600hz/kazoo/make/deps.mk" }}-{{ checksum "/usr/local/lib/erlang/releases/RELEASES" }} - run: name: Displaying deps hash command: | @@ -258,9 +261,6 @@ jobs: - run: name: Running code checks command: make -C ${KAZOO_ROOT} code_checks - - run: - name: Running additional code style checks - command: ${KAZOO_ROOT}/scripts/code_checks.bash $CHANGED - run: name: Checking app source file command: make -C ${KAZOO_ROOT} app_applications @@ -311,19 +311,19 @@ jobs: at: ~/ - restore_cache: keys: - - plt-21-v3.1-{{ checksum "~/2600hz/kazoo/make/deps.mk" }} + - plt-v1-{{ checksum "~/2600hz/kazoo/make/deps.mk" }}-{{ checksum "/usr/local/lib/erlang/releases/RELEASES" }} - run: name: Dailyzing changed Erlang files command: TO_DIALYZE="$(echo $CHANGED)" make -C ${KAZOO_ROOT} build-plt dialyze - save_cache: - key: plt-21-v3.1-{{ checksum "~/2600hz/kazoo/make/deps.mk" }} + key: plt-v1-{{ checksum "~/2600hz/kazoo/make/deps.mk" }}-{{ checksum "/usr/local/lib/erlang/releases/RELEASES" }} paths: - ~/2600hz/kazoo/.kazoo.plt release: <<: *defaults docker: - - image: offical2600hz/circleci:21.3.8 + - image: offical2600hz/circleci:21.3.8.8 - image: couchdb:2.3.1 - image: 2600hz/rabbitmq steps: @@ -407,7 +407,7 @@ jobs: command: ${KAZOO_ROOT}/scripts/circleci.bash - restore_cache: keys: - - deps-centos-21-v3.2-{{ checksum "~/2600hz/kazoo/make/deps.mk" }} + - deps-centos-v1-{{ checksum "~/2600hz/kazoo/make/deps.mk" }}-{{ checksum "/usr/local/lib/erlang/releases/RELEASES" }} - run: name: Preparing dependencies for CentOS7 command: | @@ -423,7 +423,7 @@ jobs: ls -al $KAZOO_ROOT/make || true make -C ${KAZOO_ROOT} deps - save_cache: - key: deps-centos-21-v3.2-{{ checksum "~/2600hz/kazoo/make/deps.mk" }} + key: deps-centos-v1-{{ checksum "~/2600hz/kazoo/make/deps.mk" }}-{{ checksum "/usr/local/lib/erlang/releases/RELEASES" }} paths: - ~/2600hz/kazoo/deps/ - ~/2600hz/kazoo/.git/.kz_deps_hash diff --git a/applications/pivot/.circleci/config.yml b/applications/pivot/.circleci/config.yml index e2bc33a029e..938c7c142ac 100644 --- a/applications/pivot/.circleci/config.yml +++ b/applications/pivot/.circleci/config.yml @@ -2,7 +2,7 @@ version: 2 workflows: version: 2 - build-branch: + build_branch: jobs: - setup - build_deps: @@ -117,7 +117,7 @@ workflows: defaults: &defaults docker: - - image: offical2600hz/circleci:21.3.8 + - image: offical2600hz/circleci:21.3.8.8 shell: /bin/bash --login working_directory: ~/2600hz/the_app environment: @@ -185,9 +185,9 @@ jobs: at: ~/ - restore_cache: keys: - - deps-21-v3.2-{{ checksum "~/2600hz/kazoo/make/deps.mk" }} + - deps-v1-{{ checksum "~/2600hz/kazoo/make/deps.mk" }}-{{ checksum "/usr/local/lib/erlang/releases/RELEASES" }} - run: - name: Calculating dependency hash + name: Calculating dependency hash for CircleCI cache command: | deps_hash=$(md5sum $KAZOO_ROOT/make/deps.mk | cut -d" " -f1) if [ x"$(cat $KAZOO_ROOT/.git/.kz_deps_hash)" = x"$deps_hash" ]; then @@ -196,11 +196,16 @@ jobs: echo -n $(md5sum $KAZOO_ROOT/make/deps.mk | cut -d" " -f1) > "$KAZOO_ROOT/.git/.kz_deps_hash" md5sum $KAZOO_ROOT/make/deps.mk || true ls -al $KAZOO_ROOT/make || true + - run: + name: Show dependency hash + command: | + md5sum make/deps.mk || true + ls -al make || true - run: name: Making deps command: make -C ${KAZOO_ROOT} deps - save_cache: - key: deps-21-v3.2-{{ checksum "~/2600hz/kazoo/make/deps.mk" }} + key: deps-v1-{{ checksum "~/2600hz/kazoo/make/deps.mk" }}-{{ checksum "/usr/local/lib/erlang/releases/RELEASES" }} paths: - ~/2600hz/kazoo/deps/ - ~/2600hz/kazoo/.git/.kz_deps_hash @@ -216,12 +221,10 @@ jobs: at: ~/ - restore_cache: keys: - - deps-21-v3.2-{{ checksum "~/2600hz/kazoo/make/deps.mk" }} - - run: | - md5sum $KAZOO_ROOT/make/deps.mk || true - ls -al $KAZOO_ROOT/make || true - - run: make -C ${KAZOO_ROOT} fmt - - run: JOBS="2" make -C ${KAZOO_ROOT} + - deps-v1-{{ checksum "~/2600hz/kazoo/make/deps.mk" }}-{{ checksum "/usr/local/lib/erlang/releases/RELEASES" }} + - run: + name: Compiling the project + command: JOBS="2" make -C ${KAZOO_ROOT} - persist_to_workspace: root: ~/ paths: @@ -234,7 +237,7 @@ jobs: at: ~/ - restore_cache: keys: - - deps-21-v3.2-{{ checksum "~/2600hz/kazoo/make/deps.mk" }} + - deps-v1-{{ checksum "~/2600hz/kazoo/make/deps.mk" }}-{{ checksum "/usr/local/lib/erlang/releases/RELEASES" }} - run: name: Displaying deps hash command: | @@ -258,9 +261,6 @@ jobs: - run: name: Running code checks command: make -C ${KAZOO_ROOT} code_checks - - run: - name: Running additional code style checks - command: ${KAZOO_ROOT}/scripts/code_checks.bash $CHANGED - run: name: Checking app source file command: make -C ${KAZOO_ROOT} app_applications @@ -311,19 +311,19 @@ jobs: at: ~/ - restore_cache: keys: - - plt-21-v3.1-{{ checksum "~/2600hz/kazoo/make/deps.mk" }} + - plt-v1-{{ checksum "~/2600hz/kazoo/make/deps.mk" }}-{{ checksum "/usr/local/lib/erlang/releases/RELEASES" }} - run: name: Dailyzing changed Erlang files command: TO_DIALYZE="$(echo $CHANGED)" make -C ${KAZOO_ROOT} build-plt dialyze - save_cache: - key: plt-21-v3.1-{{ checksum "~/2600hz/kazoo/make/deps.mk" }} + key: plt-v1-{{ checksum "~/2600hz/kazoo/make/deps.mk" }}-{{ checksum "/usr/local/lib/erlang/releases/RELEASES" }} paths: - ~/2600hz/kazoo/.kazoo.plt release: <<: *defaults docker: - - image: offical2600hz/circleci:21.3.8 + - image: offical2600hz/circleci:21.3.8.8 - image: couchdb:2.3.1 - image: 2600hz/rabbitmq steps: @@ -407,7 +407,7 @@ jobs: command: ${KAZOO_ROOT}/scripts/circleci.bash - restore_cache: keys: - - deps-centos-21-v3.2-{{ checksum "~/2600hz/kazoo/make/deps.mk" }} + - deps-centos-v1-{{ checksum "~/2600hz/kazoo/make/deps.mk" }}-{{ checksum "/usr/local/lib/erlang/releases/RELEASES" }} - run: name: Preparing dependencies for CentOS7 command: | @@ -423,7 +423,7 @@ jobs: ls -al $KAZOO_ROOT/make || true make -C ${KAZOO_ROOT} deps - save_cache: - key: deps-centos-21-v3.2-{{ checksum "~/2600hz/kazoo/make/deps.mk" }} + key: deps-centos-v1-{{ checksum "~/2600hz/kazoo/make/deps.mk" }}-{{ checksum "/usr/local/lib/erlang/releases/RELEASES" }} paths: - ~/2600hz/kazoo/deps/ - ~/2600hz/kazoo/.git/.kz_deps_hash diff --git a/applications/pusher/.circleci/config.yml b/applications/pusher/.circleci/config.yml index e2bc33a029e..938c7c142ac 100644 --- a/applications/pusher/.circleci/config.yml +++ b/applications/pusher/.circleci/config.yml @@ -2,7 +2,7 @@ version: 2 workflows: version: 2 - build-branch: + build_branch: jobs: - setup - build_deps: @@ -117,7 +117,7 @@ workflows: defaults: &defaults docker: - - image: offical2600hz/circleci:21.3.8 + - image: offical2600hz/circleci:21.3.8.8 shell: /bin/bash --login working_directory: ~/2600hz/the_app environment: @@ -185,9 +185,9 @@ jobs: at: ~/ - restore_cache: keys: - - deps-21-v3.2-{{ checksum "~/2600hz/kazoo/make/deps.mk" }} + - deps-v1-{{ checksum "~/2600hz/kazoo/make/deps.mk" }}-{{ checksum "/usr/local/lib/erlang/releases/RELEASES" }} - run: - name: Calculating dependency hash + name: Calculating dependency hash for CircleCI cache command: | deps_hash=$(md5sum $KAZOO_ROOT/make/deps.mk | cut -d" " -f1) if [ x"$(cat $KAZOO_ROOT/.git/.kz_deps_hash)" = x"$deps_hash" ]; then @@ -196,11 +196,16 @@ jobs: echo -n $(md5sum $KAZOO_ROOT/make/deps.mk | cut -d" " -f1) > "$KAZOO_ROOT/.git/.kz_deps_hash" md5sum $KAZOO_ROOT/make/deps.mk || true ls -al $KAZOO_ROOT/make || true + - run: + name: Show dependency hash + command: | + md5sum make/deps.mk || true + ls -al make || true - run: name: Making deps command: make -C ${KAZOO_ROOT} deps - save_cache: - key: deps-21-v3.2-{{ checksum "~/2600hz/kazoo/make/deps.mk" }} + key: deps-v1-{{ checksum "~/2600hz/kazoo/make/deps.mk" }}-{{ checksum "/usr/local/lib/erlang/releases/RELEASES" }} paths: - ~/2600hz/kazoo/deps/ - ~/2600hz/kazoo/.git/.kz_deps_hash @@ -216,12 +221,10 @@ jobs: at: ~/ - restore_cache: keys: - - deps-21-v3.2-{{ checksum "~/2600hz/kazoo/make/deps.mk" }} - - run: | - md5sum $KAZOO_ROOT/make/deps.mk || true - ls -al $KAZOO_ROOT/make || true - - run: make -C ${KAZOO_ROOT} fmt - - run: JOBS="2" make -C ${KAZOO_ROOT} + - deps-v1-{{ checksum "~/2600hz/kazoo/make/deps.mk" }}-{{ checksum "/usr/local/lib/erlang/releases/RELEASES" }} + - run: + name: Compiling the project + command: JOBS="2" make -C ${KAZOO_ROOT} - persist_to_workspace: root: ~/ paths: @@ -234,7 +237,7 @@ jobs: at: ~/ - restore_cache: keys: - - deps-21-v3.2-{{ checksum "~/2600hz/kazoo/make/deps.mk" }} + - deps-v1-{{ checksum "~/2600hz/kazoo/make/deps.mk" }}-{{ checksum "/usr/local/lib/erlang/releases/RELEASES" }} - run: name: Displaying deps hash command: | @@ -258,9 +261,6 @@ jobs: - run: name: Running code checks command: make -C ${KAZOO_ROOT} code_checks - - run: - name: Running additional code style checks - command: ${KAZOO_ROOT}/scripts/code_checks.bash $CHANGED - run: name: Checking app source file command: make -C ${KAZOO_ROOT} app_applications @@ -311,19 +311,19 @@ jobs: at: ~/ - restore_cache: keys: - - plt-21-v3.1-{{ checksum "~/2600hz/kazoo/make/deps.mk" }} + - plt-v1-{{ checksum "~/2600hz/kazoo/make/deps.mk" }}-{{ checksum "/usr/local/lib/erlang/releases/RELEASES" }} - run: name: Dailyzing changed Erlang files command: TO_DIALYZE="$(echo $CHANGED)" make -C ${KAZOO_ROOT} build-plt dialyze - save_cache: - key: plt-21-v3.1-{{ checksum "~/2600hz/kazoo/make/deps.mk" }} + key: plt-v1-{{ checksum "~/2600hz/kazoo/make/deps.mk" }}-{{ checksum "/usr/local/lib/erlang/releases/RELEASES" }} paths: - ~/2600hz/kazoo/.kazoo.plt release: <<: *defaults docker: - - image: offical2600hz/circleci:21.3.8 + - image: offical2600hz/circleci:21.3.8.8 - image: couchdb:2.3.1 - image: 2600hz/rabbitmq steps: @@ -407,7 +407,7 @@ jobs: command: ${KAZOO_ROOT}/scripts/circleci.bash - restore_cache: keys: - - deps-centos-21-v3.2-{{ checksum "~/2600hz/kazoo/make/deps.mk" }} + - deps-centos-v1-{{ checksum "~/2600hz/kazoo/make/deps.mk" }}-{{ checksum "/usr/local/lib/erlang/releases/RELEASES" }} - run: name: Preparing dependencies for CentOS7 command: | @@ -423,7 +423,7 @@ jobs: ls -al $KAZOO_ROOT/make || true make -C ${KAZOO_ROOT} deps - save_cache: - key: deps-centos-21-v3.2-{{ checksum "~/2600hz/kazoo/make/deps.mk" }} + key: deps-centos-v1-{{ checksum "~/2600hz/kazoo/make/deps.mk" }}-{{ checksum "/usr/local/lib/erlang/releases/RELEASES" }} paths: - ~/2600hz/kazoo/deps/ - ~/2600hz/kazoo/.git/.kz_deps_hash diff --git a/applications/registrar/.circleci/config.yml b/applications/registrar/.circleci/config.yml index e2bc33a029e..938c7c142ac 100644 --- a/applications/registrar/.circleci/config.yml +++ b/applications/registrar/.circleci/config.yml @@ -2,7 +2,7 @@ version: 2 workflows: version: 2 - build-branch: + build_branch: jobs: - setup - build_deps: @@ -117,7 +117,7 @@ workflows: defaults: &defaults docker: - - image: offical2600hz/circleci:21.3.8 + - image: offical2600hz/circleci:21.3.8.8 shell: /bin/bash --login working_directory: ~/2600hz/the_app environment: @@ -185,9 +185,9 @@ jobs: at: ~/ - restore_cache: keys: - - deps-21-v3.2-{{ checksum "~/2600hz/kazoo/make/deps.mk" }} + - deps-v1-{{ checksum "~/2600hz/kazoo/make/deps.mk" }}-{{ checksum "/usr/local/lib/erlang/releases/RELEASES" }} - run: - name: Calculating dependency hash + name: Calculating dependency hash for CircleCI cache command: | deps_hash=$(md5sum $KAZOO_ROOT/make/deps.mk | cut -d" " -f1) if [ x"$(cat $KAZOO_ROOT/.git/.kz_deps_hash)" = x"$deps_hash" ]; then @@ -196,11 +196,16 @@ jobs: echo -n $(md5sum $KAZOO_ROOT/make/deps.mk | cut -d" " -f1) > "$KAZOO_ROOT/.git/.kz_deps_hash" md5sum $KAZOO_ROOT/make/deps.mk || true ls -al $KAZOO_ROOT/make || true + - run: + name: Show dependency hash + command: | + md5sum make/deps.mk || true + ls -al make || true - run: name: Making deps command: make -C ${KAZOO_ROOT} deps - save_cache: - key: deps-21-v3.2-{{ checksum "~/2600hz/kazoo/make/deps.mk" }} + key: deps-v1-{{ checksum "~/2600hz/kazoo/make/deps.mk" }}-{{ checksum "/usr/local/lib/erlang/releases/RELEASES" }} paths: - ~/2600hz/kazoo/deps/ - ~/2600hz/kazoo/.git/.kz_deps_hash @@ -216,12 +221,10 @@ jobs: at: ~/ - restore_cache: keys: - - deps-21-v3.2-{{ checksum "~/2600hz/kazoo/make/deps.mk" }} - - run: | - md5sum $KAZOO_ROOT/make/deps.mk || true - ls -al $KAZOO_ROOT/make || true - - run: make -C ${KAZOO_ROOT} fmt - - run: JOBS="2" make -C ${KAZOO_ROOT} + - deps-v1-{{ checksum "~/2600hz/kazoo/make/deps.mk" }}-{{ checksum "/usr/local/lib/erlang/releases/RELEASES" }} + - run: + name: Compiling the project + command: JOBS="2" make -C ${KAZOO_ROOT} - persist_to_workspace: root: ~/ paths: @@ -234,7 +237,7 @@ jobs: at: ~/ - restore_cache: keys: - - deps-21-v3.2-{{ checksum "~/2600hz/kazoo/make/deps.mk" }} + - deps-v1-{{ checksum "~/2600hz/kazoo/make/deps.mk" }}-{{ checksum "/usr/local/lib/erlang/releases/RELEASES" }} - run: name: Displaying deps hash command: | @@ -258,9 +261,6 @@ jobs: - run: name: Running code checks command: make -C ${KAZOO_ROOT} code_checks - - run: - name: Running additional code style checks - command: ${KAZOO_ROOT}/scripts/code_checks.bash $CHANGED - run: name: Checking app source file command: make -C ${KAZOO_ROOT} app_applications @@ -311,19 +311,19 @@ jobs: at: ~/ - restore_cache: keys: - - plt-21-v3.1-{{ checksum "~/2600hz/kazoo/make/deps.mk" }} + - plt-v1-{{ checksum "~/2600hz/kazoo/make/deps.mk" }}-{{ checksum "/usr/local/lib/erlang/releases/RELEASES" }} - run: name: Dailyzing changed Erlang files command: TO_DIALYZE="$(echo $CHANGED)" make -C ${KAZOO_ROOT} build-plt dialyze - save_cache: - key: plt-21-v3.1-{{ checksum "~/2600hz/kazoo/make/deps.mk" }} + key: plt-v1-{{ checksum "~/2600hz/kazoo/make/deps.mk" }}-{{ checksum "/usr/local/lib/erlang/releases/RELEASES" }} paths: - ~/2600hz/kazoo/.kazoo.plt release: <<: *defaults docker: - - image: offical2600hz/circleci:21.3.8 + - image: offical2600hz/circleci:21.3.8.8 - image: couchdb:2.3.1 - image: 2600hz/rabbitmq steps: @@ -407,7 +407,7 @@ jobs: command: ${KAZOO_ROOT}/scripts/circleci.bash - restore_cache: keys: - - deps-centos-21-v3.2-{{ checksum "~/2600hz/kazoo/make/deps.mk" }} + - deps-centos-v1-{{ checksum "~/2600hz/kazoo/make/deps.mk" }}-{{ checksum "/usr/local/lib/erlang/releases/RELEASES" }} - run: name: Preparing dependencies for CentOS7 command: | @@ -423,7 +423,7 @@ jobs: ls -al $KAZOO_ROOT/make || true make -C ${KAZOO_ROOT} deps - save_cache: - key: deps-centos-21-v3.2-{{ checksum "~/2600hz/kazoo/make/deps.mk" }} + key: deps-centos-v1-{{ checksum "~/2600hz/kazoo/make/deps.mk" }}-{{ checksum "/usr/local/lib/erlang/releases/RELEASES" }} paths: - ~/2600hz/kazoo/deps/ - ~/2600hz/kazoo/.git/.kz_deps_hash diff --git a/applications/reorder/.circleci/config.yml b/applications/reorder/.circleci/config.yml index e2bc33a029e..938c7c142ac 100644 --- a/applications/reorder/.circleci/config.yml +++ b/applications/reorder/.circleci/config.yml @@ -2,7 +2,7 @@ version: 2 workflows: version: 2 - build-branch: + build_branch: jobs: - setup - build_deps: @@ -117,7 +117,7 @@ workflows: defaults: &defaults docker: - - image: offical2600hz/circleci:21.3.8 + - image: offical2600hz/circleci:21.3.8.8 shell: /bin/bash --login working_directory: ~/2600hz/the_app environment: @@ -185,9 +185,9 @@ jobs: at: ~/ - restore_cache: keys: - - deps-21-v3.2-{{ checksum "~/2600hz/kazoo/make/deps.mk" }} + - deps-v1-{{ checksum "~/2600hz/kazoo/make/deps.mk" }}-{{ checksum "/usr/local/lib/erlang/releases/RELEASES" }} - run: - name: Calculating dependency hash + name: Calculating dependency hash for CircleCI cache command: | deps_hash=$(md5sum $KAZOO_ROOT/make/deps.mk | cut -d" " -f1) if [ x"$(cat $KAZOO_ROOT/.git/.kz_deps_hash)" = x"$deps_hash" ]; then @@ -196,11 +196,16 @@ jobs: echo -n $(md5sum $KAZOO_ROOT/make/deps.mk | cut -d" " -f1) > "$KAZOO_ROOT/.git/.kz_deps_hash" md5sum $KAZOO_ROOT/make/deps.mk || true ls -al $KAZOO_ROOT/make || true + - run: + name: Show dependency hash + command: | + md5sum make/deps.mk || true + ls -al make || true - run: name: Making deps command: make -C ${KAZOO_ROOT} deps - save_cache: - key: deps-21-v3.2-{{ checksum "~/2600hz/kazoo/make/deps.mk" }} + key: deps-v1-{{ checksum "~/2600hz/kazoo/make/deps.mk" }}-{{ checksum "/usr/local/lib/erlang/releases/RELEASES" }} paths: - ~/2600hz/kazoo/deps/ - ~/2600hz/kazoo/.git/.kz_deps_hash @@ -216,12 +221,10 @@ jobs: at: ~/ - restore_cache: keys: - - deps-21-v3.2-{{ checksum "~/2600hz/kazoo/make/deps.mk" }} - - run: | - md5sum $KAZOO_ROOT/make/deps.mk || true - ls -al $KAZOO_ROOT/make || true - - run: make -C ${KAZOO_ROOT} fmt - - run: JOBS="2" make -C ${KAZOO_ROOT} + - deps-v1-{{ checksum "~/2600hz/kazoo/make/deps.mk" }}-{{ checksum "/usr/local/lib/erlang/releases/RELEASES" }} + - run: + name: Compiling the project + command: JOBS="2" make -C ${KAZOO_ROOT} - persist_to_workspace: root: ~/ paths: @@ -234,7 +237,7 @@ jobs: at: ~/ - restore_cache: keys: - - deps-21-v3.2-{{ checksum "~/2600hz/kazoo/make/deps.mk" }} + - deps-v1-{{ checksum "~/2600hz/kazoo/make/deps.mk" }}-{{ checksum "/usr/local/lib/erlang/releases/RELEASES" }} - run: name: Displaying deps hash command: | @@ -258,9 +261,6 @@ jobs: - run: name: Running code checks command: make -C ${KAZOO_ROOT} code_checks - - run: - name: Running additional code style checks - command: ${KAZOO_ROOT}/scripts/code_checks.bash $CHANGED - run: name: Checking app source file command: make -C ${KAZOO_ROOT} app_applications @@ -311,19 +311,19 @@ jobs: at: ~/ - restore_cache: keys: - - plt-21-v3.1-{{ checksum "~/2600hz/kazoo/make/deps.mk" }} + - plt-v1-{{ checksum "~/2600hz/kazoo/make/deps.mk" }}-{{ checksum "/usr/local/lib/erlang/releases/RELEASES" }} - run: name: Dailyzing changed Erlang files command: TO_DIALYZE="$(echo $CHANGED)" make -C ${KAZOO_ROOT} build-plt dialyze - save_cache: - key: plt-21-v3.1-{{ checksum "~/2600hz/kazoo/make/deps.mk" }} + key: plt-v1-{{ checksum "~/2600hz/kazoo/make/deps.mk" }}-{{ checksum "/usr/local/lib/erlang/releases/RELEASES" }} paths: - ~/2600hz/kazoo/.kazoo.plt release: <<: *defaults docker: - - image: offical2600hz/circleci:21.3.8 + - image: offical2600hz/circleci:21.3.8.8 - image: couchdb:2.3.1 - image: 2600hz/rabbitmq steps: @@ -407,7 +407,7 @@ jobs: command: ${KAZOO_ROOT}/scripts/circleci.bash - restore_cache: keys: - - deps-centos-21-v3.2-{{ checksum "~/2600hz/kazoo/make/deps.mk" }} + - deps-centos-v1-{{ checksum "~/2600hz/kazoo/make/deps.mk" }}-{{ checksum "/usr/local/lib/erlang/releases/RELEASES" }} - run: name: Preparing dependencies for CentOS7 command: | @@ -423,7 +423,7 @@ jobs: ls -al $KAZOO_ROOT/make || true make -C ${KAZOO_ROOT} deps - save_cache: - key: deps-centos-21-v3.2-{{ checksum "~/2600hz/kazoo/make/deps.mk" }} + key: deps-centos-v1-{{ checksum "~/2600hz/kazoo/make/deps.mk" }}-{{ checksum "/usr/local/lib/erlang/releases/RELEASES" }} paths: - ~/2600hz/kazoo/deps/ - ~/2600hz/kazoo/.git/.kz_deps_hash diff --git a/applications/skel/.circleci/config.yml b/applications/skel/.circleci/config.yml index e2bc33a029e..938c7c142ac 100644 --- a/applications/skel/.circleci/config.yml +++ b/applications/skel/.circleci/config.yml @@ -2,7 +2,7 @@ version: 2 workflows: version: 2 - build-branch: + build_branch: jobs: - setup - build_deps: @@ -117,7 +117,7 @@ workflows: defaults: &defaults docker: - - image: offical2600hz/circleci:21.3.8 + - image: offical2600hz/circleci:21.3.8.8 shell: /bin/bash --login working_directory: ~/2600hz/the_app environment: @@ -185,9 +185,9 @@ jobs: at: ~/ - restore_cache: keys: - - deps-21-v3.2-{{ checksum "~/2600hz/kazoo/make/deps.mk" }} + - deps-v1-{{ checksum "~/2600hz/kazoo/make/deps.mk" }}-{{ checksum "/usr/local/lib/erlang/releases/RELEASES" }} - run: - name: Calculating dependency hash + name: Calculating dependency hash for CircleCI cache command: | deps_hash=$(md5sum $KAZOO_ROOT/make/deps.mk | cut -d" " -f1) if [ x"$(cat $KAZOO_ROOT/.git/.kz_deps_hash)" = x"$deps_hash" ]; then @@ -196,11 +196,16 @@ jobs: echo -n $(md5sum $KAZOO_ROOT/make/deps.mk | cut -d" " -f1) > "$KAZOO_ROOT/.git/.kz_deps_hash" md5sum $KAZOO_ROOT/make/deps.mk || true ls -al $KAZOO_ROOT/make || true + - run: + name: Show dependency hash + command: | + md5sum make/deps.mk || true + ls -al make || true - run: name: Making deps command: make -C ${KAZOO_ROOT} deps - save_cache: - key: deps-21-v3.2-{{ checksum "~/2600hz/kazoo/make/deps.mk" }} + key: deps-v1-{{ checksum "~/2600hz/kazoo/make/deps.mk" }}-{{ checksum "/usr/local/lib/erlang/releases/RELEASES" }} paths: - ~/2600hz/kazoo/deps/ - ~/2600hz/kazoo/.git/.kz_deps_hash @@ -216,12 +221,10 @@ jobs: at: ~/ - restore_cache: keys: - - deps-21-v3.2-{{ checksum "~/2600hz/kazoo/make/deps.mk" }} - - run: | - md5sum $KAZOO_ROOT/make/deps.mk || true - ls -al $KAZOO_ROOT/make || true - - run: make -C ${KAZOO_ROOT} fmt - - run: JOBS="2" make -C ${KAZOO_ROOT} + - deps-v1-{{ checksum "~/2600hz/kazoo/make/deps.mk" }}-{{ checksum "/usr/local/lib/erlang/releases/RELEASES" }} + - run: + name: Compiling the project + command: JOBS="2" make -C ${KAZOO_ROOT} - persist_to_workspace: root: ~/ paths: @@ -234,7 +237,7 @@ jobs: at: ~/ - restore_cache: keys: - - deps-21-v3.2-{{ checksum "~/2600hz/kazoo/make/deps.mk" }} + - deps-v1-{{ checksum "~/2600hz/kazoo/make/deps.mk" }}-{{ checksum "/usr/local/lib/erlang/releases/RELEASES" }} - run: name: Displaying deps hash command: | @@ -258,9 +261,6 @@ jobs: - run: name: Running code checks command: make -C ${KAZOO_ROOT} code_checks - - run: - name: Running additional code style checks - command: ${KAZOO_ROOT}/scripts/code_checks.bash $CHANGED - run: name: Checking app source file command: make -C ${KAZOO_ROOT} app_applications @@ -311,19 +311,19 @@ jobs: at: ~/ - restore_cache: keys: - - plt-21-v3.1-{{ checksum "~/2600hz/kazoo/make/deps.mk" }} + - plt-v1-{{ checksum "~/2600hz/kazoo/make/deps.mk" }}-{{ checksum "/usr/local/lib/erlang/releases/RELEASES" }} - run: name: Dailyzing changed Erlang files command: TO_DIALYZE="$(echo $CHANGED)" make -C ${KAZOO_ROOT} build-plt dialyze - save_cache: - key: plt-21-v3.1-{{ checksum "~/2600hz/kazoo/make/deps.mk" }} + key: plt-v1-{{ checksum "~/2600hz/kazoo/make/deps.mk" }}-{{ checksum "/usr/local/lib/erlang/releases/RELEASES" }} paths: - ~/2600hz/kazoo/.kazoo.plt release: <<: *defaults docker: - - image: offical2600hz/circleci:21.3.8 + - image: offical2600hz/circleci:21.3.8.8 - image: couchdb:2.3.1 - image: 2600hz/rabbitmq steps: @@ -407,7 +407,7 @@ jobs: command: ${KAZOO_ROOT}/scripts/circleci.bash - restore_cache: keys: - - deps-centos-21-v3.2-{{ checksum "~/2600hz/kazoo/make/deps.mk" }} + - deps-centos-v1-{{ checksum "~/2600hz/kazoo/make/deps.mk" }}-{{ checksum "/usr/local/lib/erlang/releases/RELEASES" }} - run: name: Preparing dependencies for CentOS7 command: | @@ -423,7 +423,7 @@ jobs: ls -al $KAZOO_ROOT/make || true make -C ${KAZOO_ROOT} deps - save_cache: - key: deps-centos-21-v3.2-{{ checksum "~/2600hz/kazoo/make/deps.mk" }} + key: deps-centos-v1-{{ checksum "~/2600hz/kazoo/make/deps.mk" }}-{{ checksum "/usr/local/lib/erlang/releases/RELEASES" }} paths: - ~/2600hz/kazoo/deps/ - ~/2600hz/kazoo/.git/.kz_deps_hash diff --git a/applications/spyvsspy/.circleci/config.yml b/applications/spyvsspy/.circleci/config.yml index e2bc33a029e..938c7c142ac 100644 --- a/applications/spyvsspy/.circleci/config.yml +++ b/applications/spyvsspy/.circleci/config.yml @@ -2,7 +2,7 @@ version: 2 workflows: version: 2 - build-branch: + build_branch: jobs: - setup - build_deps: @@ -117,7 +117,7 @@ workflows: defaults: &defaults docker: - - image: offical2600hz/circleci:21.3.8 + - image: offical2600hz/circleci:21.3.8.8 shell: /bin/bash --login working_directory: ~/2600hz/the_app environment: @@ -185,9 +185,9 @@ jobs: at: ~/ - restore_cache: keys: - - deps-21-v3.2-{{ checksum "~/2600hz/kazoo/make/deps.mk" }} + - deps-v1-{{ checksum "~/2600hz/kazoo/make/deps.mk" }}-{{ checksum "/usr/local/lib/erlang/releases/RELEASES" }} - run: - name: Calculating dependency hash + name: Calculating dependency hash for CircleCI cache command: | deps_hash=$(md5sum $KAZOO_ROOT/make/deps.mk | cut -d" " -f1) if [ x"$(cat $KAZOO_ROOT/.git/.kz_deps_hash)" = x"$deps_hash" ]; then @@ -196,11 +196,16 @@ jobs: echo -n $(md5sum $KAZOO_ROOT/make/deps.mk | cut -d" " -f1) > "$KAZOO_ROOT/.git/.kz_deps_hash" md5sum $KAZOO_ROOT/make/deps.mk || true ls -al $KAZOO_ROOT/make || true + - run: + name: Show dependency hash + command: | + md5sum make/deps.mk || true + ls -al make || true - run: name: Making deps command: make -C ${KAZOO_ROOT} deps - save_cache: - key: deps-21-v3.2-{{ checksum "~/2600hz/kazoo/make/deps.mk" }} + key: deps-v1-{{ checksum "~/2600hz/kazoo/make/deps.mk" }}-{{ checksum "/usr/local/lib/erlang/releases/RELEASES" }} paths: - ~/2600hz/kazoo/deps/ - ~/2600hz/kazoo/.git/.kz_deps_hash @@ -216,12 +221,10 @@ jobs: at: ~/ - restore_cache: keys: - - deps-21-v3.2-{{ checksum "~/2600hz/kazoo/make/deps.mk" }} - - run: | - md5sum $KAZOO_ROOT/make/deps.mk || true - ls -al $KAZOO_ROOT/make || true - - run: make -C ${KAZOO_ROOT} fmt - - run: JOBS="2" make -C ${KAZOO_ROOT} + - deps-v1-{{ checksum "~/2600hz/kazoo/make/deps.mk" }}-{{ checksum "/usr/local/lib/erlang/releases/RELEASES" }} + - run: + name: Compiling the project + command: JOBS="2" make -C ${KAZOO_ROOT} - persist_to_workspace: root: ~/ paths: @@ -234,7 +237,7 @@ jobs: at: ~/ - restore_cache: keys: - - deps-21-v3.2-{{ checksum "~/2600hz/kazoo/make/deps.mk" }} + - deps-v1-{{ checksum "~/2600hz/kazoo/make/deps.mk" }}-{{ checksum "/usr/local/lib/erlang/releases/RELEASES" }} - run: name: Displaying deps hash command: | @@ -258,9 +261,6 @@ jobs: - run: name: Running code checks command: make -C ${KAZOO_ROOT} code_checks - - run: - name: Running additional code style checks - command: ${KAZOO_ROOT}/scripts/code_checks.bash $CHANGED - run: name: Checking app source file command: make -C ${KAZOO_ROOT} app_applications @@ -311,19 +311,19 @@ jobs: at: ~/ - restore_cache: keys: - - plt-21-v3.1-{{ checksum "~/2600hz/kazoo/make/deps.mk" }} + - plt-v1-{{ checksum "~/2600hz/kazoo/make/deps.mk" }}-{{ checksum "/usr/local/lib/erlang/releases/RELEASES" }} - run: name: Dailyzing changed Erlang files command: TO_DIALYZE="$(echo $CHANGED)" make -C ${KAZOO_ROOT} build-plt dialyze - save_cache: - key: plt-21-v3.1-{{ checksum "~/2600hz/kazoo/make/deps.mk" }} + key: plt-v1-{{ checksum "~/2600hz/kazoo/make/deps.mk" }}-{{ checksum "/usr/local/lib/erlang/releases/RELEASES" }} paths: - ~/2600hz/kazoo/.kazoo.plt release: <<: *defaults docker: - - image: offical2600hz/circleci:21.3.8 + - image: offical2600hz/circleci:21.3.8.8 - image: couchdb:2.3.1 - image: 2600hz/rabbitmq steps: @@ -407,7 +407,7 @@ jobs: command: ${KAZOO_ROOT}/scripts/circleci.bash - restore_cache: keys: - - deps-centos-21-v3.2-{{ checksum "~/2600hz/kazoo/make/deps.mk" }} + - deps-centos-v1-{{ checksum "~/2600hz/kazoo/make/deps.mk" }}-{{ checksum "/usr/local/lib/erlang/releases/RELEASES" }} - run: name: Preparing dependencies for CentOS7 command: | @@ -423,7 +423,7 @@ jobs: ls -al $KAZOO_ROOT/make || true make -C ${KAZOO_ROOT} deps - save_cache: - key: deps-centos-21-v3.2-{{ checksum "~/2600hz/kazoo/make/deps.mk" }} + key: deps-centos-v1-{{ checksum "~/2600hz/kazoo/make/deps.mk" }}-{{ checksum "/usr/local/lib/erlang/releases/RELEASES" }} paths: - ~/2600hz/kazoo/deps/ - ~/2600hz/kazoo/.git/.kz_deps_hash diff --git a/applications/stats/.circleci/config.yml b/applications/stats/.circleci/config.yml index e2bc33a029e..938c7c142ac 100644 --- a/applications/stats/.circleci/config.yml +++ b/applications/stats/.circleci/config.yml @@ -2,7 +2,7 @@ version: 2 workflows: version: 2 - build-branch: + build_branch: jobs: - setup - build_deps: @@ -117,7 +117,7 @@ workflows: defaults: &defaults docker: - - image: offical2600hz/circleci:21.3.8 + - image: offical2600hz/circleci:21.3.8.8 shell: /bin/bash --login working_directory: ~/2600hz/the_app environment: @@ -185,9 +185,9 @@ jobs: at: ~/ - restore_cache: keys: - - deps-21-v3.2-{{ checksum "~/2600hz/kazoo/make/deps.mk" }} + - deps-v1-{{ checksum "~/2600hz/kazoo/make/deps.mk" }}-{{ checksum "/usr/local/lib/erlang/releases/RELEASES" }} - run: - name: Calculating dependency hash + name: Calculating dependency hash for CircleCI cache command: | deps_hash=$(md5sum $KAZOO_ROOT/make/deps.mk | cut -d" " -f1) if [ x"$(cat $KAZOO_ROOT/.git/.kz_deps_hash)" = x"$deps_hash" ]; then @@ -196,11 +196,16 @@ jobs: echo -n $(md5sum $KAZOO_ROOT/make/deps.mk | cut -d" " -f1) > "$KAZOO_ROOT/.git/.kz_deps_hash" md5sum $KAZOO_ROOT/make/deps.mk || true ls -al $KAZOO_ROOT/make || true + - run: + name: Show dependency hash + command: | + md5sum make/deps.mk || true + ls -al make || true - run: name: Making deps command: make -C ${KAZOO_ROOT} deps - save_cache: - key: deps-21-v3.2-{{ checksum "~/2600hz/kazoo/make/deps.mk" }} + key: deps-v1-{{ checksum "~/2600hz/kazoo/make/deps.mk" }}-{{ checksum "/usr/local/lib/erlang/releases/RELEASES" }} paths: - ~/2600hz/kazoo/deps/ - ~/2600hz/kazoo/.git/.kz_deps_hash @@ -216,12 +221,10 @@ jobs: at: ~/ - restore_cache: keys: - - deps-21-v3.2-{{ checksum "~/2600hz/kazoo/make/deps.mk" }} - - run: | - md5sum $KAZOO_ROOT/make/deps.mk || true - ls -al $KAZOO_ROOT/make || true - - run: make -C ${KAZOO_ROOT} fmt - - run: JOBS="2" make -C ${KAZOO_ROOT} + - deps-v1-{{ checksum "~/2600hz/kazoo/make/deps.mk" }}-{{ checksum "/usr/local/lib/erlang/releases/RELEASES" }} + - run: + name: Compiling the project + command: JOBS="2" make -C ${KAZOO_ROOT} - persist_to_workspace: root: ~/ paths: @@ -234,7 +237,7 @@ jobs: at: ~/ - restore_cache: keys: - - deps-21-v3.2-{{ checksum "~/2600hz/kazoo/make/deps.mk" }} + - deps-v1-{{ checksum "~/2600hz/kazoo/make/deps.mk" }}-{{ checksum "/usr/local/lib/erlang/releases/RELEASES" }} - run: name: Displaying deps hash command: | @@ -258,9 +261,6 @@ jobs: - run: name: Running code checks command: make -C ${KAZOO_ROOT} code_checks - - run: - name: Running additional code style checks - command: ${KAZOO_ROOT}/scripts/code_checks.bash $CHANGED - run: name: Checking app source file command: make -C ${KAZOO_ROOT} app_applications @@ -311,19 +311,19 @@ jobs: at: ~/ - restore_cache: keys: - - plt-21-v3.1-{{ checksum "~/2600hz/kazoo/make/deps.mk" }} + - plt-v1-{{ checksum "~/2600hz/kazoo/make/deps.mk" }}-{{ checksum "/usr/local/lib/erlang/releases/RELEASES" }} - run: name: Dailyzing changed Erlang files command: TO_DIALYZE="$(echo $CHANGED)" make -C ${KAZOO_ROOT} build-plt dialyze - save_cache: - key: plt-21-v3.1-{{ checksum "~/2600hz/kazoo/make/deps.mk" }} + key: plt-v1-{{ checksum "~/2600hz/kazoo/make/deps.mk" }}-{{ checksum "/usr/local/lib/erlang/releases/RELEASES" }} paths: - ~/2600hz/kazoo/.kazoo.plt release: <<: *defaults docker: - - image: offical2600hz/circleci:21.3.8 + - image: offical2600hz/circleci:21.3.8.8 - image: couchdb:2.3.1 - image: 2600hz/rabbitmq steps: @@ -407,7 +407,7 @@ jobs: command: ${KAZOO_ROOT}/scripts/circleci.bash - restore_cache: keys: - - deps-centos-21-v3.2-{{ checksum "~/2600hz/kazoo/make/deps.mk" }} + - deps-centos-v1-{{ checksum "~/2600hz/kazoo/make/deps.mk" }}-{{ checksum "/usr/local/lib/erlang/releases/RELEASES" }} - run: name: Preparing dependencies for CentOS7 command: | @@ -423,7 +423,7 @@ jobs: ls -al $KAZOO_ROOT/make || true make -C ${KAZOO_ROOT} deps - save_cache: - key: deps-centos-21-v3.2-{{ checksum "~/2600hz/kazoo/make/deps.mk" }} + key: deps-centos-v1-{{ checksum "~/2600hz/kazoo/make/deps.mk" }}-{{ checksum "/usr/local/lib/erlang/releases/RELEASES" }} paths: - ~/2600hz/kazoo/deps/ - ~/2600hz/kazoo/.git/.kz_deps_hash diff --git a/applications/stepswitch/.circleci/config.yml b/applications/stepswitch/.circleci/config.yml index e2bc33a029e..938c7c142ac 100644 --- a/applications/stepswitch/.circleci/config.yml +++ b/applications/stepswitch/.circleci/config.yml @@ -2,7 +2,7 @@ version: 2 workflows: version: 2 - build-branch: + build_branch: jobs: - setup - build_deps: @@ -117,7 +117,7 @@ workflows: defaults: &defaults docker: - - image: offical2600hz/circleci:21.3.8 + - image: offical2600hz/circleci:21.3.8.8 shell: /bin/bash --login working_directory: ~/2600hz/the_app environment: @@ -185,9 +185,9 @@ jobs: at: ~/ - restore_cache: keys: - - deps-21-v3.2-{{ checksum "~/2600hz/kazoo/make/deps.mk" }} + - deps-v1-{{ checksum "~/2600hz/kazoo/make/deps.mk" }}-{{ checksum "/usr/local/lib/erlang/releases/RELEASES" }} - run: - name: Calculating dependency hash + name: Calculating dependency hash for CircleCI cache command: | deps_hash=$(md5sum $KAZOO_ROOT/make/deps.mk | cut -d" " -f1) if [ x"$(cat $KAZOO_ROOT/.git/.kz_deps_hash)" = x"$deps_hash" ]; then @@ -196,11 +196,16 @@ jobs: echo -n $(md5sum $KAZOO_ROOT/make/deps.mk | cut -d" " -f1) > "$KAZOO_ROOT/.git/.kz_deps_hash" md5sum $KAZOO_ROOT/make/deps.mk || true ls -al $KAZOO_ROOT/make || true + - run: + name: Show dependency hash + command: | + md5sum make/deps.mk || true + ls -al make || true - run: name: Making deps command: make -C ${KAZOO_ROOT} deps - save_cache: - key: deps-21-v3.2-{{ checksum "~/2600hz/kazoo/make/deps.mk" }} + key: deps-v1-{{ checksum "~/2600hz/kazoo/make/deps.mk" }}-{{ checksum "/usr/local/lib/erlang/releases/RELEASES" }} paths: - ~/2600hz/kazoo/deps/ - ~/2600hz/kazoo/.git/.kz_deps_hash @@ -216,12 +221,10 @@ jobs: at: ~/ - restore_cache: keys: - - deps-21-v3.2-{{ checksum "~/2600hz/kazoo/make/deps.mk" }} - - run: | - md5sum $KAZOO_ROOT/make/deps.mk || true - ls -al $KAZOO_ROOT/make || true - - run: make -C ${KAZOO_ROOT} fmt - - run: JOBS="2" make -C ${KAZOO_ROOT} + - deps-v1-{{ checksum "~/2600hz/kazoo/make/deps.mk" }}-{{ checksum "/usr/local/lib/erlang/releases/RELEASES" }} + - run: + name: Compiling the project + command: JOBS="2" make -C ${KAZOO_ROOT} - persist_to_workspace: root: ~/ paths: @@ -234,7 +237,7 @@ jobs: at: ~/ - restore_cache: keys: - - deps-21-v3.2-{{ checksum "~/2600hz/kazoo/make/deps.mk" }} + - deps-v1-{{ checksum "~/2600hz/kazoo/make/deps.mk" }}-{{ checksum "/usr/local/lib/erlang/releases/RELEASES" }} - run: name: Displaying deps hash command: | @@ -258,9 +261,6 @@ jobs: - run: name: Running code checks command: make -C ${KAZOO_ROOT} code_checks - - run: - name: Running additional code style checks - command: ${KAZOO_ROOT}/scripts/code_checks.bash $CHANGED - run: name: Checking app source file command: make -C ${KAZOO_ROOT} app_applications @@ -311,19 +311,19 @@ jobs: at: ~/ - restore_cache: keys: - - plt-21-v3.1-{{ checksum "~/2600hz/kazoo/make/deps.mk" }} + - plt-v1-{{ checksum "~/2600hz/kazoo/make/deps.mk" }}-{{ checksum "/usr/local/lib/erlang/releases/RELEASES" }} - run: name: Dailyzing changed Erlang files command: TO_DIALYZE="$(echo $CHANGED)" make -C ${KAZOO_ROOT} build-plt dialyze - save_cache: - key: plt-21-v3.1-{{ checksum "~/2600hz/kazoo/make/deps.mk" }} + key: plt-v1-{{ checksum "~/2600hz/kazoo/make/deps.mk" }}-{{ checksum "/usr/local/lib/erlang/releases/RELEASES" }} paths: - ~/2600hz/kazoo/.kazoo.plt release: <<: *defaults docker: - - image: offical2600hz/circleci:21.3.8 + - image: offical2600hz/circleci:21.3.8.8 - image: couchdb:2.3.1 - image: 2600hz/rabbitmq steps: @@ -407,7 +407,7 @@ jobs: command: ${KAZOO_ROOT}/scripts/circleci.bash - restore_cache: keys: - - deps-centos-21-v3.2-{{ checksum "~/2600hz/kazoo/make/deps.mk" }} + - deps-centos-v1-{{ checksum "~/2600hz/kazoo/make/deps.mk" }}-{{ checksum "/usr/local/lib/erlang/releases/RELEASES" }} - run: name: Preparing dependencies for CentOS7 command: | @@ -423,7 +423,7 @@ jobs: ls -al $KAZOO_ROOT/make || true make -C ${KAZOO_ROOT} deps - save_cache: - key: deps-centos-21-v3.2-{{ checksum "~/2600hz/kazoo/make/deps.mk" }} + key: deps-centos-v1-{{ checksum "~/2600hz/kazoo/make/deps.mk" }}-{{ checksum "/usr/local/lib/erlang/releases/RELEASES" }} paths: - ~/2600hz/kazoo/deps/ - ~/2600hz/kazoo/.git/.kz_deps_hash diff --git a/applications/sysconf/.circleci/config.yml b/applications/sysconf/.circleci/config.yml index e2bc33a029e..938c7c142ac 100644 --- a/applications/sysconf/.circleci/config.yml +++ b/applications/sysconf/.circleci/config.yml @@ -2,7 +2,7 @@ version: 2 workflows: version: 2 - build-branch: + build_branch: jobs: - setup - build_deps: @@ -117,7 +117,7 @@ workflows: defaults: &defaults docker: - - image: offical2600hz/circleci:21.3.8 + - image: offical2600hz/circleci:21.3.8.8 shell: /bin/bash --login working_directory: ~/2600hz/the_app environment: @@ -185,9 +185,9 @@ jobs: at: ~/ - restore_cache: keys: - - deps-21-v3.2-{{ checksum "~/2600hz/kazoo/make/deps.mk" }} + - deps-v1-{{ checksum "~/2600hz/kazoo/make/deps.mk" }}-{{ checksum "/usr/local/lib/erlang/releases/RELEASES" }} - run: - name: Calculating dependency hash + name: Calculating dependency hash for CircleCI cache command: | deps_hash=$(md5sum $KAZOO_ROOT/make/deps.mk | cut -d" " -f1) if [ x"$(cat $KAZOO_ROOT/.git/.kz_deps_hash)" = x"$deps_hash" ]; then @@ -196,11 +196,16 @@ jobs: echo -n $(md5sum $KAZOO_ROOT/make/deps.mk | cut -d" " -f1) > "$KAZOO_ROOT/.git/.kz_deps_hash" md5sum $KAZOO_ROOT/make/deps.mk || true ls -al $KAZOO_ROOT/make || true + - run: + name: Show dependency hash + command: | + md5sum make/deps.mk || true + ls -al make || true - run: name: Making deps command: make -C ${KAZOO_ROOT} deps - save_cache: - key: deps-21-v3.2-{{ checksum "~/2600hz/kazoo/make/deps.mk" }} + key: deps-v1-{{ checksum "~/2600hz/kazoo/make/deps.mk" }}-{{ checksum "/usr/local/lib/erlang/releases/RELEASES" }} paths: - ~/2600hz/kazoo/deps/ - ~/2600hz/kazoo/.git/.kz_deps_hash @@ -216,12 +221,10 @@ jobs: at: ~/ - restore_cache: keys: - - deps-21-v3.2-{{ checksum "~/2600hz/kazoo/make/deps.mk" }} - - run: | - md5sum $KAZOO_ROOT/make/deps.mk || true - ls -al $KAZOO_ROOT/make || true - - run: make -C ${KAZOO_ROOT} fmt - - run: JOBS="2" make -C ${KAZOO_ROOT} + - deps-v1-{{ checksum "~/2600hz/kazoo/make/deps.mk" }}-{{ checksum "/usr/local/lib/erlang/releases/RELEASES" }} + - run: + name: Compiling the project + command: JOBS="2" make -C ${KAZOO_ROOT} - persist_to_workspace: root: ~/ paths: @@ -234,7 +237,7 @@ jobs: at: ~/ - restore_cache: keys: - - deps-21-v3.2-{{ checksum "~/2600hz/kazoo/make/deps.mk" }} + - deps-v1-{{ checksum "~/2600hz/kazoo/make/deps.mk" }}-{{ checksum "/usr/local/lib/erlang/releases/RELEASES" }} - run: name: Displaying deps hash command: | @@ -258,9 +261,6 @@ jobs: - run: name: Running code checks command: make -C ${KAZOO_ROOT} code_checks - - run: - name: Running additional code style checks - command: ${KAZOO_ROOT}/scripts/code_checks.bash $CHANGED - run: name: Checking app source file command: make -C ${KAZOO_ROOT} app_applications @@ -311,19 +311,19 @@ jobs: at: ~/ - restore_cache: keys: - - plt-21-v3.1-{{ checksum "~/2600hz/kazoo/make/deps.mk" }} + - plt-v1-{{ checksum "~/2600hz/kazoo/make/deps.mk" }}-{{ checksum "/usr/local/lib/erlang/releases/RELEASES" }} - run: name: Dailyzing changed Erlang files command: TO_DIALYZE="$(echo $CHANGED)" make -C ${KAZOO_ROOT} build-plt dialyze - save_cache: - key: plt-21-v3.1-{{ checksum "~/2600hz/kazoo/make/deps.mk" }} + key: plt-v1-{{ checksum "~/2600hz/kazoo/make/deps.mk" }}-{{ checksum "/usr/local/lib/erlang/releases/RELEASES" }} paths: - ~/2600hz/kazoo/.kazoo.plt release: <<: *defaults docker: - - image: offical2600hz/circleci:21.3.8 + - image: offical2600hz/circleci:21.3.8.8 - image: couchdb:2.3.1 - image: 2600hz/rabbitmq steps: @@ -407,7 +407,7 @@ jobs: command: ${KAZOO_ROOT}/scripts/circleci.bash - restore_cache: keys: - - deps-centos-21-v3.2-{{ checksum "~/2600hz/kazoo/make/deps.mk" }} + - deps-centos-v1-{{ checksum "~/2600hz/kazoo/make/deps.mk" }}-{{ checksum "/usr/local/lib/erlang/releases/RELEASES" }} - run: name: Preparing dependencies for CentOS7 command: | @@ -423,7 +423,7 @@ jobs: ls -al $KAZOO_ROOT/make || true make -C ${KAZOO_ROOT} deps - save_cache: - key: deps-centos-21-v3.2-{{ checksum "~/2600hz/kazoo/make/deps.mk" }} + key: deps-centos-v1-{{ checksum "~/2600hz/kazoo/make/deps.mk" }}-{{ checksum "/usr/local/lib/erlang/releases/RELEASES" }} paths: - ~/2600hz/kazoo/deps/ - ~/2600hz/kazoo/.git/.kz_deps_hash diff --git a/applications/tasks/.circleci/config.yml b/applications/tasks/.circleci/config.yml index e2bc33a029e..938c7c142ac 100644 --- a/applications/tasks/.circleci/config.yml +++ b/applications/tasks/.circleci/config.yml @@ -2,7 +2,7 @@ version: 2 workflows: version: 2 - build-branch: + build_branch: jobs: - setup - build_deps: @@ -117,7 +117,7 @@ workflows: defaults: &defaults docker: - - image: offical2600hz/circleci:21.3.8 + - image: offical2600hz/circleci:21.3.8.8 shell: /bin/bash --login working_directory: ~/2600hz/the_app environment: @@ -185,9 +185,9 @@ jobs: at: ~/ - restore_cache: keys: - - deps-21-v3.2-{{ checksum "~/2600hz/kazoo/make/deps.mk" }} + - deps-v1-{{ checksum "~/2600hz/kazoo/make/deps.mk" }}-{{ checksum "/usr/local/lib/erlang/releases/RELEASES" }} - run: - name: Calculating dependency hash + name: Calculating dependency hash for CircleCI cache command: | deps_hash=$(md5sum $KAZOO_ROOT/make/deps.mk | cut -d" " -f1) if [ x"$(cat $KAZOO_ROOT/.git/.kz_deps_hash)" = x"$deps_hash" ]; then @@ -196,11 +196,16 @@ jobs: echo -n $(md5sum $KAZOO_ROOT/make/deps.mk | cut -d" " -f1) > "$KAZOO_ROOT/.git/.kz_deps_hash" md5sum $KAZOO_ROOT/make/deps.mk || true ls -al $KAZOO_ROOT/make || true + - run: + name: Show dependency hash + command: | + md5sum make/deps.mk || true + ls -al make || true - run: name: Making deps command: make -C ${KAZOO_ROOT} deps - save_cache: - key: deps-21-v3.2-{{ checksum "~/2600hz/kazoo/make/deps.mk" }} + key: deps-v1-{{ checksum "~/2600hz/kazoo/make/deps.mk" }}-{{ checksum "/usr/local/lib/erlang/releases/RELEASES" }} paths: - ~/2600hz/kazoo/deps/ - ~/2600hz/kazoo/.git/.kz_deps_hash @@ -216,12 +221,10 @@ jobs: at: ~/ - restore_cache: keys: - - deps-21-v3.2-{{ checksum "~/2600hz/kazoo/make/deps.mk" }} - - run: | - md5sum $KAZOO_ROOT/make/deps.mk || true - ls -al $KAZOO_ROOT/make || true - - run: make -C ${KAZOO_ROOT} fmt - - run: JOBS="2" make -C ${KAZOO_ROOT} + - deps-v1-{{ checksum "~/2600hz/kazoo/make/deps.mk" }}-{{ checksum "/usr/local/lib/erlang/releases/RELEASES" }} + - run: + name: Compiling the project + command: JOBS="2" make -C ${KAZOO_ROOT} - persist_to_workspace: root: ~/ paths: @@ -234,7 +237,7 @@ jobs: at: ~/ - restore_cache: keys: - - deps-21-v3.2-{{ checksum "~/2600hz/kazoo/make/deps.mk" }} + - deps-v1-{{ checksum "~/2600hz/kazoo/make/deps.mk" }}-{{ checksum "/usr/local/lib/erlang/releases/RELEASES" }} - run: name: Displaying deps hash command: | @@ -258,9 +261,6 @@ jobs: - run: name: Running code checks command: make -C ${KAZOO_ROOT} code_checks - - run: - name: Running additional code style checks - command: ${KAZOO_ROOT}/scripts/code_checks.bash $CHANGED - run: name: Checking app source file command: make -C ${KAZOO_ROOT} app_applications @@ -311,19 +311,19 @@ jobs: at: ~/ - restore_cache: keys: - - plt-21-v3.1-{{ checksum "~/2600hz/kazoo/make/deps.mk" }} + - plt-v1-{{ checksum "~/2600hz/kazoo/make/deps.mk" }}-{{ checksum "/usr/local/lib/erlang/releases/RELEASES" }} - run: name: Dailyzing changed Erlang files command: TO_DIALYZE="$(echo $CHANGED)" make -C ${KAZOO_ROOT} build-plt dialyze - save_cache: - key: plt-21-v3.1-{{ checksum "~/2600hz/kazoo/make/deps.mk" }} + key: plt-v1-{{ checksum "~/2600hz/kazoo/make/deps.mk" }}-{{ checksum "/usr/local/lib/erlang/releases/RELEASES" }} paths: - ~/2600hz/kazoo/.kazoo.plt release: <<: *defaults docker: - - image: offical2600hz/circleci:21.3.8 + - image: offical2600hz/circleci:21.3.8.8 - image: couchdb:2.3.1 - image: 2600hz/rabbitmq steps: @@ -407,7 +407,7 @@ jobs: command: ${KAZOO_ROOT}/scripts/circleci.bash - restore_cache: keys: - - deps-centos-21-v3.2-{{ checksum "~/2600hz/kazoo/make/deps.mk" }} + - deps-centos-v1-{{ checksum "~/2600hz/kazoo/make/deps.mk" }}-{{ checksum "/usr/local/lib/erlang/releases/RELEASES" }} - run: name: Preparing dependencies for CentOS7 command: | @@ -423,7 +423,7 @@ jobs: ls -al $KAZOO_ROOT/make || true make -C ${KAZOO_ROOT} deps - save_cache: - key: deps-centos-21-v3.2-{{ checksum "~/2600hz/kazoo/make/deps.mk" }} + key: deps-centos-v1-{{ checksum "~/2600hz/kazoo/make/deps.mk" }}-{{ checksum "/usr/local/lib/erlang/releases/RELEASES" }} paths: - ~/2600hz/kazoo/deps/ - ~/2600hz/kazoo/.git/.kz_deps_hash diff --git a/applications/teletype/.circleci/config.yml b/applications/teletype/.circleci/config.yml index e2bc33a029e..938c7c142ac 100644 --- a/applications/teletype/.circleci/config.yml +++ b/applications/teletype/.circleci/config.yml @@ -2,7 +2,7 @@ version: 2 workflows: version: 2 - build-branch: + build_branch: jobs: - setup - build_deps: @@ -117,7 +117,7 @@ workflows: defaults: &defaults docker: - - image: offical2600hz/circleci:21.3.8 + - image: offical2600hz/circleci:21.3.8.8 shell: /bin/bash --login working_directory: ~/2600hz/the_app environment: @@ -185,9 +185,9 @@ jobs: at: ~/ - restore_cache: keys: - - deps-21-v3.2-{{ checksum "~/2600hz/kazoo/make/deps.mk" }} + - deps-v1-{{ checksum "~/2600hz/kazoo/make/deps.mk" }}-{{ checksum "/usr/local/lib/erlang/releases/RELEASES" }} - run: - name: Calculating dependency hash + name: Calculating dependency hash for CircleCI cache command: | deps_hash=$(md5sum $KAZOO_ROOT/make/deps.mk | cut -d" " -f1) if [ x"$(cat $KAZOO_ROOT/.git/.kz_deps_hash)" = x"$deps_hash" ]; then @@ -196,11 +196,16 @@ jobs: echo -n $(md5sum $KAZOO_ROOT/make/deps.mk | cut -d" " -f1) > "$KAZOO_ROOT/.git/.kz_deps_hash" md5sum $KAZOO_ROOT/make/deps.mk || true ls -al $KAZOO_ROOT/make || true + - run: + name: Show dependency hash + command: | + md5sum make/deps.mk || true + ls -al make || true - run: name: Making deps command: make -C ${KAZOO_ROOT} deps - save_cache: - key: deps-21-v3.2-{{ checksum "~/2600hz/kazoo/make/deps.mk" }} + key: deps-v1-{{ checksum "~/2600hz/kazoo/make/deps.mk" }}-{{ checksum "/usr/local/lib/erlang/releases/RELEASES" }} paths: - ~/2600hz/kazoo/deps/ - ~/2600hz/kazoo/.git/.kz_deps_hash @@ -216,12 +221,10 @@ jobs: at: ~/ - restore_cache: keys: - - deps-21-v3.2-{{ checksum "~/2600hz/kazoo/make/deps.mk" }} - - run: | - md5sum $KAZOO_ROOT/make/deps.mk || true - ls -al $KAZOO_ROOT/make || true - - run: make -C ${KAZOO_ROOT} fmt - - run: JOBS="2" make -C ${KAZOO_ROOT} + - deps-v1-{{ checksum "~/2600hz/kazoo/make/deps.mk" }}-{{ checksum "/usr/local/lib/erlang/releases/RELEASES" }} + - run: + name: Compiling the project + command: JOBS="2" make -C ${KAZOO_ROOT} - persist_to_workspace: root: ~/ paths: @@ -234,7 +237,7 @@ jobs: at: ~/ - restore_cache: keys: - - deps-21-v3.2-{{ checksum "~/2600hz/kazoo/make/deps.mk" }} + - deps-v1-{{ checksum "~/2600hz/kazoo/make/deps.mk" }}-{{ checksum "/usr/local/lib/erlang/releases/RELEASES" }} - run: name: Displaying deps hash command: | @@ -258,9 +261,6 @@ jobs: - run: name: Running code checks command: make -C ${KAZOO_ROOT} code_checks - - run: - name: Running additional code style checks - command: ${KAZOO_ROOT}/scripts/code_checks.bash $CHANGED - run: name: Checking app source file command: make -C ${KAZOO_ROOT} app_applications @@ -311,19 +311,19 @@ jobs: at: ~/ - restore_cache: keys: - - plt-21-v3.1-{{ checksum "~/2600hz/kazoo/make/deps.mk" }} + - plt-v1-{{ checksum "~/2600hz/kazoo/make/deps.mk" }}-{{ checksum "/usr/local/lib/erlang/releases/RELEASES" }} - run: name: Dailyzing changed Erlang files command: TO_DIALYZE="$(echo $CHANGED)" make -C ${KAZOO_ROOT} build-plt dialyze - save_cache: - key: plt-21-v3.1-{{ checksum "~/2600hz/kazoo/make/deps.mk" }} + key: plt-v1-{{ checksum "~/2600hz/kazoo/make/deps.mk" }}-{{ checksum "/usr/local/lib/erlang/releases/RELEASES" }} paths: - ~/2600hz/kazoo/.kazoo.plt release: <<: *defaults docker: - - image: offical2600hz/circleci:21.3.8 + - image: offical2600hz/circleci:21.3.8.8 - image: couchdb:2.3.1 - image: 2600hz/rabbitmq steps: @@ -407,7 +407,7 @@ jobs: command: ${KAZOO_ROOT}/scripts/circleci.bash - restore_cache: keys: - - deps-centos-21-v3.2-{{ checksum "~/2600hz/kazoo/make/deps.mk" }} + - deps-centos-v1-{{ checksum "~/2600hz/kazoo/make/deps.mk" }}-{{ checksum "/usr/local/lib/erlang/releases/RELEASES" }} - run: name: Preparing dependencies for CentOS7 command: | @@ -423,7 +423,7 @@ jobs: ls -al $KAZOO_ROOT/make || true make -C ${KAZOO_ROOT} deps - save_cache: - key: deps-centos-21-v3.2-{{ checksum "~/2600hz/kazoo/make/deps.mk" }} + key: deps-centos-v1-{{ checksum "~/2600hz/kazoo/make/deps.mk" }}-{{ checksum "/usr/local/lib/erlang/releases/RELEASES" }} paths: - ~/2600hz/kazoo/deps/ - ~/2600hz/kazoo/.git/.kz_deps_hash diff --git a/applications/trunkstore/.circleci/config.yml b/applications/trunkstore/.circleci/config.yml index e2bc33a029e..938c7c142ac 100644 --- a/applications/trunkstore/.circleci/config.yml +++ b/applications/trunkstore/.circleci/config.yml @@ -2,7 +2,7 @@ version: 2 workflows: version: 2 - build-branch: + build_branch: jobs: - setup - build_deps: @@ -117,7 +117,7 @@ workflows: defaults: &defaults docker: - - image: offical2600hz/circleci:21.3.8 + - image: offical2600hz/circleci:21.3.8.8 shell: /bin/bash --login working_directory: ~/2600hz/the_app environment: @@ -185,9 +185,9 @@ jobs: at: ~/ - restore_cache: keys: - - deps-21-v3.2-{{ checksum "~/2600hz/kazoo/make/deps.mk" }} + - deps-v1-{{ checksum "~/2600hz/kazoo/make/deps.mk" }}-{{ checksum "/usr/local/lib/erlang/releases/RELEASES" }} - run: - name: Calculating dependency hash + name: Calculating dependency hash for CircleCI cache command: | deps_hash=$(md5sum $KAZOO_ROOT/make/deps.mk | cut -d" " -f1) if [ x"$(cat $KAZOO_ROOT/.git/.kz_deps_hash)" = x"$deps_hash" ]; then @@ -196,11 +196,16 @@ jobs: echo -n $(md5sum $KAZOO_ROOT/make/deps.mk | cut -d" " -f1) > "$KAZOO_ROOT/.git/.kz_deps_hash" md5sum $KAZOO_ROOT/make/deps.mk || true ls -al $KAZOO_ROOT/make || true + - run: + name: Show dependency hash + command: | + md5sum make/deps.mk || true + ls -al make || true - run: name: Making deps command: make -C ${KAZOO_ROOT} deps - save_cache: - key: deps-21-v3.2-{{ checksum "~/2600hz/kazoo/make/deps.mk" }} + key: deps-v1-{{ checksum "~/2600hz/kazoo/make/deps.mk" }}-{{ checksum "/usr/local/lib/erlang/releases/RELEASES" }} paths: - ~/2600hz/kazoo/deps/ - ~/2600hz/kazoo/.git/.kz_deps_hash @@ -216,12 +221,10 @@ jobs: at: ~/ - restore_cache: keys: - - deps-21-v3.2-{{ checksum "~/2600hz/kazoo/make/deps.mk" }} - - run: | - md5sum $KAZOO_ROOT/make/deps.mk || true - ls -al $KAZOO_ROOT/make || true - - run: make -C ${KAZOO_ROOT} fmt - - run: JOBS="2" make -C ${KAZOO_ROOT} + - deps-v1-{{ checksum "~/2600hz/kazoo/make/deps.mk" }}-{{ checksum "/usr/local/lib/erlang/releases/RELEASES" }} + - run: + name: Compiling the project + command: JOBS="2" make -C ${KAZOO_ROOT} - persist_to_workspace: root: ~/ paths: @@ -234,7 +237,7 @@ jobs: at: ~/ - restore_cache: keys: - - deps-21-v3.2-{{ checksum "~/2600hz/kazoo/make/deps.mk" }} + - deps-v1-{{ checksum "~/2600hz/kazoo/make/deps.mk" }}-{{ checksum "/usr/local/lib/erlang/releases/RELEASES" }} - run: name: Displaying deps hash command: | @@ -258,9 +261,6 @@ jobs: - run: name: Running code checks command: make -C ${KAZOO_ROOT} code_checks - - run: - name: Running additional code style checks - command: ${KAZOO_ROOT}/scripts/code_checks.bash $CHANGED - run: name: Checking app source file command: make -C ${KAZOO_ROOT} app_applications @@ -311,19 +311,19 @@ jobs: at: ~/ - restore_cache: keys: - - plt-21-v3.1-{{ checksum "~/2600hz/kazoo/make/deps.mk" }} + - plt-v1-{{ checksum "~/2600hz/kazoo/make/deps.mk" }}-{{ checksum "/usr/local/lib/erlang/releases/RELEASES" }} - run: name: Dailyzing changed Erlang files command: TO_DIALYZE="$(echo $CHANGED)" make -C ${KAZOO_ROOT} build-plt dialyze - save_cache: - key: plt-21-v3.1-{{ checksum "~/2600hz/kazoo/make/deps.mk" }} + key: plt-v1-{{ checksum "~/2600hz/kazoo/make/deps.mk" }}-{{ checksum "/usr/local/lib/erlang/releases/RELEASES" }} paths: - ~/2600hz/kazoo/.kazoo.plt release: <<: *defaults docker: - - image: offical2600hz/circleci:21.3.8 + - image: offical2600hz/circleci:21.3.8.8 - image: couchdb:2.3.1 - image: 2600hz/rabbitmq steps: @@ -407,7 +407,7 @@ jobs: command: ${KAZOO_ROOT}/scripts/circleci.bash - restore_cache: keys: - - deps-centos-21-v3.2-{{ checksum "~/2600hz/kazoo/make/deps.mk" }} + - deps-centos-v1-{{ checksum "~/2600hz/kazoo/make/deps.mk" }}-{{ checksum "/usr/local/lib/erlang/releases/RELEASES" }} - run: name: Preparing dependencies for CentOS7 command: | @@ -423,7 +423,7 @@ jobs: ls -al $KAZOO_ROOT/make || true make -C ${KAZOO_ROOT} deps - save_cache: - key: deps-centos-21-v3.2-{{ checksum "~/2600hz/kazoo/make/deps.mk" }} + key: deps-centos-v1-{{ checksum "~/2600hz/kazoo/make/deps.mk" }}-{{ checksum "/usr/local/lib/erlang/releases/RELEASES" }} paths: - ~/2600hz/kazoo/deps/ - ~/2600hz/kazoo/.git/.kz_deps_hash diff --git a/applications/webhooks/.circleci/config.yml b/applications/webhooks/.circleci/config.yml index e2bc33a029e..938c7c142ac 100644 --- a/applications/webhooks/.circleci/config.yml +++ b/applications/webhooks/.circleci/config.yml @@ -2,7 +2,7 @@ version: 2 workflows: version: 2 - build-branch: + build_branch: jobs: - setup - build_deps: @@ -117,7 +117,7 @@ workflows: defaults: &defaults docker: - - image: offical2600hz/circleci:21.3.8 + - image: offical2600hz/circleci:21.3.8.8 shell: /bin/bash --login working_directory: ~/2600hz/the_app environment: @@ -185,9 +185,9 @@ jobs: at: ~/ - restore_cache: keys: - - deps-21-v3.2-{{ checksum "~/2600hz/kazoo/make/deps.mk" }} + - deps-v1-{{ checksum "~/2600hz/kazoo/make/deps.mk" }}-{{ checksum "/usr/local/lib/erlang/releases/RELEASES" }} - run: - name: Calculating dependency hash + name: Calculating dependency hash for CircleCI cache command: | deps_hash=$(md5sum $KAZOO_ROOT/make/deps.mk | cut -d" " -f1) if [ x"$(cat $KAZOO_ROOT/.git/.kz_deps_hash)" = x"$deps_hash" ]; then @@ -196,11 +196,16 @@ jobs: echo -n $(md5sum $KAZOO_ROOT/make/deps.mk | cut -d" " -f1) > "$KAZOO_ROOT/.git/.kz_deps_hash" md5sum $KAZOO_ROOT/make/deps.mk || true ls -al $KAZOO_ROOT/make || true + - run: + name: Show dependency hash + command: | + md5sum make/deps.mk || true + ls -al make || true - run: name: Making deps command: make -C ${KAZOO_ROOT} deps - save_cache: - key: deps-21-v3.2-{{ checksum "~/2600hz/kazoo/make/deps.mk" }} + key: deps-v1-{{ checksum "~/2600hz/kazoo/make/deps.mk" }}-{{ checksum "/usr/local/lib/erlang/releases/RELEASES" }} paths: - ~/2600hz/kazoo/deps/ - ~/2600hz/kazoo/.git/.kz_deps_hash @@ -216,12 +221,10 @@ jobs: at: ~/ - restore_cache: keys: - - deps-21-v3.2-{{ checksum "~/2600hz/kazoo/make/deps.mk" }} - - run: | - md5sum $KAZOO_ROOT/make/deps.mk || true - ls -al $KAZOO_ROOT/make || true - - run: make -C ${KAZOO_ROOT} fmt - - run: JOBS="2" make -C ${KAZOO_ROOT} + - deps-v1-{{ checksum "~/2600hz/kazoo/make/deps.mk" }}-{{ checksum "/usr/local/lib/erlang/releases/RELEASES" }} + - run: + name: Compiling the project + command: JOBS="2" make -C ${KAZOO_ROOT} - persist_to_workspace: root: ~/ paths: @@ -234,7 +237,7 @@ jobs: at: ~/ - restore_cache: keys: - - deps-21-v3.2-{{ checksum "~/2600hz/kazoo/make/deps.mk" }} + - deps-v1-{{ checksum "~/2600hz/kazoo/make/deps.mk" }}-{{ checksum "/usr/local/lib/erlang/releases/RELEASES" }} - run: name: Displaying deps hash command: | @@ -258,9 +261,6 @@ jobs: - run: name: Running code checks command: make -C ${KAZOO_ROOT} code_checks - - run: - name: Running additional code style checks - command: ${KAZOO_ROOT}/scripts/code_checks.bash $CHANGED - run: name: Checking app source file command: make -C ${KAZOO_ROOT} app_applications @@ -311,19 +311,19 @@ jobs: at: ~/ - restore_cache: keys: - - plt-21-v3.1-{{ checksum "~/2600hz/kazoo/make/deps.mk" }} + - plt-v1-{{ checksum "~/2600hz/kazoo/make/deps.mk" }}-{{ checksum "/usr/local/lib/erlang/releases/RELEASES" }} - run: name: Dailyzing changed Erlang files command: TO_DIALYZE="$(echo $CHANGED)" make -C ${KAZOO_ROOT} build-plt dialyze - save_cache: - key: plt-21-v3.1-{{ checksum "~/2600hz/kazoo/make/deps.mk" }} + key: plt-v1-{{ checksum "~/2600hz/kazoo/make/deps.mk" }}-{{ checksum "/usr/local/lib/erlang/releases/RELEASES" }} paths: - ~/2600hz/kazoo/.kazoo.plt release: <<: *defaults docker: - - image: offical2600hz/circleci:21.3.8 + - image: offical2600hz/circleci:21.3.8.8 - image: couchdb:2.3.1 - image: 2600hz/rabbitmq steps: @@ -407,7 +407,7 @@ jobs: command: ${KAZOO_ROOT}/scripts/circleci.bash - restore_cache: keys: - - deps-centos-21-v3.2-{{ checksum "~/2600hz/kazoo/make/deps.mk" }} + - deps-centos-v1-{{ checksum "~/2600hz/kazoo/make/deps.mk" }}-{{ checksum "/usr/local/lib/erlang/releases/RELEASES" }} - run: name: Preparing dependencies for CentOS7 command: | @@ -423,7 +423,7 @@ jobs: ls -al $KAZOO_ROOT/make || true make -C ${KAZOO_ROOT} deps - save_cache: - key: deps-centos-21-v3.2-{{ checksum "~/2600hz/kazoo/make/deps.mk" }} + key: deps-centos-v1-{{ checksum "~/2600hz/kazoo/make/deps.mk" }}-{{ checksum "/usr/local/lib/erlang/releases/RELEASES" }} paths: - ~/2600hz/kazoo/deps/ - ~/2600hz/kazoo/.git/.kz_deps_hash diff --git a/scripts/cover.escript b/scripts/cover.escript index 0d882ffff8c..af4cf74aafd 100755 --- a/scripts/cover.escript +++ b/scripts/cover.escript @@ -7,11 +7,16 @@ -export([main/1]). main(_) -> - All = filelib:wildcard("*/*/*.coverdata"), - ok = code:add_pathsa([filename:join(filename:dirname(Path), "ebin") || Path <- All]), - Id = os:getenv("TRAVIS_JOB_ID"), - true = is_list(Id), - try coveralls:convert_and_send_file(All, Id, "travis-ci", "") + All = filelib:wildcard("**/*/*.coverdata"), + 'ok' = code:add_pathsa([filename:join(filename:dirname(Path), "ebin") || Path <- All]), + {ServiceName, JobId} = get_ci_job_id(os:getenv("TRAVIS_JOB_ID"), os:getenv("CIRCLECI")), + 'true' = is_list(JobId), + try coveralls:convert_and_send_file(All, JobId, ServiceName, "") catch _E:_R -> io:format("\ncoveralls ~p:\n\t~p\n", [_E, _R]) end. + +get_ci_job_id("true", _) -> + {"travis-ci", os:getenv("TRAVIS_JOB_ID")}; +get_ci_job_id(_, "true") -> + {"circleci", os:getenv("CIRCLE_BUILD_NUM")}.