diff --git a/.circleci/config.yml b/.circleci/config.yml index 53a24c24a..6b17bc543 100644 --- a/.circleci/config.yml +++ b/.circleci/config.yml @@ -174,15 +174,9 @@ jobs: "$(echo -en ${PULL_REQUEST_TITLE}\\n\\n${AUTHOR_NAME}: https://github.com/${CIRCLE_PROJECT_USERNAME}/${CIRCLE_PROJECT_REPONAME}/pull/${PULL_REQUEST_ID})" - run: - name: Deploy datahub - command: | - hubploy deploy --timeout 30m datahub hub ${CIRCLE_BRANCH} - no_output_timeout: 30m - - - run: - name: Deploy data8 + name: Deploy a11y command: | - hubploy deploy --timeout 30m data8 hub ${CIRCLE_BRANCH} + hubploy deploy --timeout 30m a11y hub ${CIRCLE_BRANCH} no_output_timeout: 30m - run: @@ -191,58 +185,58 @@ jobs: hubploy deploy --timeout 30m astro hub ${CIRCLE_BRANCH} no_output_timeout: 30m - #- run: - # name: Deploy stat159 - # command: | - # hubploy deploy --timeout 30m stat159 hub ${CIRCLE_BRANCH} - # no_output_timeout: 30m - - run: - name: Deploy stat20 + name: Deploy biology command: | - hubploy deploy --timeout 30m stat20 hub ${CIRCLE_BRANCH} + hubploy deploy --timeout 30m biology hub ${CIRCLE_BRANCH} no_output_timeout: 30m - run: - name: Deploy ischool + name: Deploy cee command: | - hubploy deploy --timeout 30m ischool hub ${CIRCLE_BRANCH} + hubploy deploy --timeout 30m cee hub ${CIRCLE_BRANCH} no_output_timeout: 30m - run: - name: Deploy publichealth + name: Deploy data8 command: | - hubploy deploy --timeout 30m publichealth hub ${CIRCLE_BRANCH} + hubploy deploy --timeout 30m data8 hub ${CIRCLE_BRANCH} no_output_timeout: 30m +# - run: +# name: Deploy data8xv2 +# command: | +# hubploy deploy --timeout 30m data8xv2 hub ${CIRCLE_BRANCH} +# no_output_timeout: 30m + - run: - name: Deploy highschool hub + name: Deploy data100 command: | - hubploy deploy --timeout 30m highschool hub ${CIRCLE_BRANCH} + hubploy deploy --timeout 30m data100 hub ${CIRCLE_BRANCH} no_output_timeout: 30m - run: - name: Deploy prob140 + name: Deploy data101 command: | - hubploy deploy --timeout 30m prob140 hub ${CIRCLE_BRANCH} + hubploy deploy --timeout 30m data101 hub ${CIRCLE_BRANCH} no_output_timeout: 30m - run: - name: Deploy biology + name: Deploy data102 command: | - hubploy deploy --timeout 30m biology hub ${CIRCLE_BRANCH} + hubploy deploy --timeout 30m data102 hub ${CIRCLE_BRANCH} no_output_timeout: 30m - run: - name: Deploy julia + name: Deploy datahub command: | - hubploy deploy --timeout 30m julia hub ${CIRCLE_BRANCH} + hubploy deploy --timeout 30m datahub hub ${CIRCLE_BRANCH} no_output_timeout: 30m - run: - name: Deploy R + name: Deploy dev-r command: | - hubploy deploy --timeout 30m r hub ${CIRCLE_BRANCH} + hubploy deploy --timeout 30m dev-r hub ${CIRCLE_BRANCH} no_output_timeout: 30m - run: @@ -251,78 +245,79 @@ jobs: hubploy deploy --timeout 30m dlab hub ${CIRCLE_BRANCH} no_output_timeout: 30m -# - run: -# name: Deploy data8x -# command: | -# hubploy deploy --timeout 30m data8x hub ${CIRCLE_BRANCH} -# no_output_timeout: 30m - -# - run: -# name: Deploy data8xv2 -# command: | -# hubploy deploy --timeout 30m data8xv2 hub ${CIRCLE_BRANCH} -# no_output_timeout: 30m + - run: + name: Deploy eecs + command: | + hubploy deploy --timeout 30m eecs hub ${CIRCLE_BRANCH} + no_output_timeout: 30m - run: - name: Deploy data100 + name: Deploy highschool hub command: | - hubploy deploy --timeout 30m data100 hub ${CIRCLE_BRANCH} + hubploy deploy --timeout 30m highschool hub ${CIRCLE_BRANCH} no_output_timeout: 30m - run: - name: Deploy data101 + name: Deploy ischool command: | - hubploy deploy --timeout 30m data101 hub ${CIRCLE_BRANCH} + hubploy deploy --timeout 30m ischool hub ${CIRCLE_BRANCH} no_output_timeout: 30m - - run: - name: Deploy data102 + - run: + name: Deploy julia command: | - hubploy deploy --timeout 30m data102 hub ${CIRCLE_BRANCH} + hubploy deploy --timeout 30m julia hub ${CIRCLE_BRANCH} no_output_timeout: 30m - run: - name: Deploy shiny + name: Deploy logodev command: | - hubploy deploy --timeout 30m shiny hub ${CIRCLE_BRANCH} + hubploy deploy --timeout 30m logodev hub ${CIRCLE_BRANCH} no_output_timeout: 30m - run: - name: Deploy cee + name: Deploy prob140 command: | - hubploy deploy --timeout 30m cee hub ${CIRCLE_BRANCH} + hubploy deploy --timeout 30m prob140 hub ${CIRCLE_BRANCH} no_output_timeout: 30m - run: - name: Deploy logodev + name: Deploy publichealth command: | - hubploy deploy --timeout 30m logodev hub ${CIRCLE_BRANCH} + hubploy deploy --timeout 30m publichealth hub ${CIRCLE_BRANCH} no_output_timeout: 30m - run: - name: Deploy workshop + name: Deploy R command: | - hubploy deploy --timeout 30m workshop hub ${CIRCLE_BRANCH} + hubploy deploy --timeout 30m r hub ${CIRCLE_BRANCH} no_output_timeout: 30m - run: - name: Deploy eecs + name: Deploy shiny command: | - hubploy deploy --timeout 30m eecs hub ${CIRCLE_BRANCH} + hubploy deploy --timeout 30m shiny hub ${CIRCLE_BRANCH} no_output_timeout: 30m + # - run: + # name: Deploy stat159 + # command: | + # hubploy deploy --timeout 30m stat159 hub ${CIRCLE_BRANCH} + # no_output_timeout: 30m + - run: - name: Deploy a11y + name: Deploy stat20 command: | - hubploy deploy --timeout 30m a11y hub ${CIRCLE_BRANCH} + hubploy deploy --timeout 30m stat20 hub ${CIRCLE_BRANCH} no_output_timeout: 30m - run: - name: Deploy dev-r + name: Deploy workshop command: | - hubploy deploy --timeout 30m dev-r hub ${CIRCLE_BRANCH} + hubploy deploy --timeout 30m workshop hub ${CIRCLE_BRANCH} no_output_timeout: 30m + deploy-node-placeholder: docker: - image: buildpack-deps:bionic-scm @@ -442,9 +437,8 @@ workflows: test-build-images: jobs: - hubploy/build-image: - deployment: datahub - # Workshop hub also uses this - name: datahub image build + deployment: a11y + name: a11y image build # Filters can only be per-job? wtf filters: branches: @@ -452,8 +446,8 @@ workflows: - staging - prod - hubploy/build-image: - deployment: data8 - name: data8 image build + deployment: astro + name: astro image build # Filters can only be per-job? wtf filters: branches: @@ -461,8 +455,8 @@ workflows: - staging - prod - hubploy/build-image: - deployment: astro - name: astro image build + deployment: biology + name: biology image build # Filters can only be per-job? wtf filters: branches: @@ -470,8 +464,8 @@ workflows: - staging - prod - hubploy/build-image: - deployment: data100 - name: data100 image build + deployment: cee + name: cee image build # Filters can only be per-job? wtf filters: branches: @@ -479,34 +473,35 @@ workflows: - staging - prod - hubploy/build-image: - deployment: data101 - name: data101 image build + deployment: data8 + name: data8 image build # Filters can only be per-job? wtf filters: branches: ignore: - staging - prod +# - hubploy/build-image: +# deployment: data8xv2 +# name: data8xv2 image build +# # Filters can only be per-job? wtf +# filters: +# branches: +# ignore: +# - staging +# - prod - hubploy/build-image: - deployment: data102 - name: data102 image build + deployment: data100 + name: data100 image build + # Filters can only be per-job? wtf filters: branches: ignore: - staging - prod - #- hubploy/build-image: - # deployment: stat159 - # name: stat159 image build - # # Filters can only be per-job? wtf - # filters: - # branches: - # ignore: - # - staging - # - prod - hubploy/build-image: - deployment: stat20 - name: stat20 image build + deployment: data101 + name: data101 image build # Filters can only be per-job? wtf filters: branches: @@ -514,17 +509,17 @@ workflows: - staging - prod - hubploy/build-image: - deployment: ischool - name: ischool image build - # Filters can only be per-job? wtf + deployment: data102 + name: data102 image build filters: branches: ignore: - staging - prod - hubploy/build-image: - deployment: shiny - name: shiny image build + deployment: datahub + # Workshop hub also uses this + name: datahub image build # Filters can only be per-job? wtf filters: branches: @@ -532,17 +527,19 @@ workflows: - staging - prod - hubploy/build-image: - deployment: cee - name: cee image build - # Filters can only be per-job? wtf + # This has no effect yet because docker-py doesn't support buildkit. + #environment: + # DOCKER_BUILDKIT: 1 + deployment: dev-r + name: dev-r image build filters: branches: ignore: - staging - prod - hubploy/build-image: - deployment: publichealth - name: publichealth image build + deployment: eecs + name: eecs image build # Filters can only be per-job? wtf filters: branches: @@ -550,8 +547,8 @@ workflows: - staging - prod - hubploy/build-image: - deployment: biology - name: biology image build + deployment: ischool + name: ischool image build # Filters can only be per-job? wtf filters: branches: @@ -567,27 +564,9 @@ workflows: ignore: - staging - prod -# - hubploy/build-image: -# deployment: data8x -# name: data8x image build -# # Filters can only be per-job? wtf -# filters: -# branches: -# ignore: -# - staging -# - prod -# - hubploy/build-image: -# deployment: data8xv2 -# name: data8xv2 image build -# # Filters can only be per-job? wtf -# filters: -# branches: -# ignore: -# - staging -# - prod - hubploy/build-image: - deployment: eecs - name: eecs image build + deployment: publichealth + name: publichealth image build # Filters can only be per-job? wtf filters: branches: @@ -595,20 +574,27 @@ workflows: - staging - prod - hubploy/build-image: - deployment: a11y - name: a11y image build + deployment: shiny + name: shiny image build # Filters can only be per-job? wtf filters: branches: ignore: - staging - prod + #- hubploy/build-image: + # deployment: stat159 + # name: stat159 image build + # # Filters can only be per-job? wtf + # filters: + # branches: + # ignore: + # - staging + # - prod - hubploy/build-image: - # This has no effect yet because docker-py doesn't support buildkit. - #environment: - # DOCKER_BUILDKIT: 1 - deployment: dev-r - name: dev-r image build + deployment: stat20 + name: stat20 image build + # Filters can only be per-job? wtf filters: branches: ignore: @@ -618,9 +604,8 @@ workflows: deploy: jobs: - hubploy/build-image: - # workshop hub also uses this image - deployment: datahub - name: datahub image build + deployment: a11y + name: a11y image build push: true # Filters can only be per-job? wtf filters: @@ -628,26 +613,17 @@ workflows: only: - staging - hubploy/build-image: - deployment: shiny - name: shiny image build + deployment: astro + name: astro image build push: true # Filters can only be per-job? wtf filters: branches: only: - staging - #- hubploy/build-image: - # deployment: logodev - # name: logodev image build - # push: true - # # Filters can only be per-job? wtf - # filters: - # branches: - # only: - # - staging - hubploy/build-image: - deployment: cee - name: cee image build + deployment: biology + name: biology image build push: true # Filters can only be per-job? wtf filters: @@ -655,8 +631,8 @@ workflows: only: - staging - hubploy/build-image: - deployment: data8 - name: data8 image build + deployment: cee + name: cee image build push: true # Filters can only be per-job? wtf filters: @@ -664,14 +640,23 @@ workflows: only: - staging - hubploy/build-image: - deployment: astro - name: astro image build + deployment: data8 + name: data8 image build push: true # Filters can only be per-job? wtf filters: branches: only: - staging +# - hubploy/build-image: +# deployment: data8xv2 +# name: data8xv2 image build +# push: true +# # Filters can only be per-job? wtf +# filters: +# branches: +# only: +# - staging - hubploy/build-image: deployment: data100 name: data100 image build @@ -697,18 +682,10 @@ workflows: branches: only: - staging - #- hubploy/build-image: - # deployment: stat159 - # name: stat159 image build - # push: true - # # Filters can only be per-job? wtf - # filters: - # branches: - # only: - # - staging - hubploy/build-image: - deployment: stat20 - name: stat20 image build + # workshop hub also uses this image + deployment: datahub + name: datahub image build push: true # Filters can only be per-job? wtf filters: @@ -716,8 +693,8 @@ workflows: only: - staging - hubploy/build-image: - deployment: ischool - name: ischool image build + deployment: dev-r + name: dev-r image build push: true # Filters can only be per-job? wtf filters: @@ -725,8 +702,8 @@ workflows: only: - staging - hubploy/build-image: - deployment: publichealth - name: publichealth image build + deployment: eecs + name: eecs image build push: true # Filters can only be per-job? wtf filters: @@ -734,8 +711,8 @@ workflows: only: - staging - hubploy/build-image: - deployment: biology - name: biology image build + deployment: ischool + name: ischool image build push: true # Filters can only be per-job? wtf filters: @@ -751,27 +728,18 @@ workflows: branches: only: - staging -# - hubploy/build-image: -# deployment: data8x -# name: data8x image build -# push: true -# # Filters can only be per-job? wtf -# filters: -# branches: -# only: -# - staging -# - hubploy/build-image: -# deployment: data8xv2 -# name: data8xv2 image build -# push: true -# # Filters can only be per-job? wtf -# filters: -# branches: -# only: -# - staging + #- hubploy/build-image: + # deployment: logodev + # name: logodev image build + # push: true + # # Filters can only be per-job? wtf + # filters: + # branches: + # only: + # - staging - hubploy/build-image: - deployment: eecs - name: eecs image build + deployment: publichealth + name: publichealth image build push: true # Filters can only be per-job? wtf filters: @@ -779,17 +747,26 @@ workflows: only: - staging - hubploy/build-image: - deployment: a11y - name: a11y image build + deployment: shiny + name: shiny image build push: true # Filters can only be per-job? wtf filters: branches: only: - staging + #- hubploy/build-image: + # deployment: stat159 + # name: stat159 image build + # push: true + # # Filters can only be per-job? wtf + # filters: + # branches: + # only: + # - staging - hubploy/build-image: - deployment: dev-r - name: dev-r image build + deployment: stat20 + name: stat20 image build push: true # Filters can only be per-job? wtf filters: @@ -802,26 +779,26 @@ workflows: # CI level, we also make prod deploys go faster! - deploy: requires: - - datahub image build + - a11y image build + - astro image build + - biology image build + - cee image build - data8 image build +# - data8xv2 image build - data100 image build - data101 image build - data102 image build - - astro image build - #- stat159 image build - - stat20 image build + - datahub image build + - dev-r image build + - eecs image build - ischool image build + - julia hub image build + #- logodev image build - publichealth image build - - cee image build - shiny image build - #- logodev image build - - biology image build - - julia hub image build -# - data8x image build -# - data8xv2 image build - - eecs image build - - a11y image build - - dev-r image build + #- stat159 image build + - stat20 image build + filters: branches: only: