scratchfoundation/scratch-www
1
0
Fork 0
mirror of https://github.com/scratchfoundation/scratch-www.git synced 2024-11-27 17:45:52 -05:00
Code Issues Projects Releases Packages Wiki Activity Actions 4

Merge pull request #5177 from BryceLTaylor/switch-to-circle-for-develop

Browse source 
circleci deploy to staging with circle instead of travis
This commit is contained in:
Bryce Taylor 2021-03-30 14:39:10 -04:00 committed by GitHub
commit 13f2c3eeaf
No known key found for this signature in database
GPG key ID: 4AEE18F83AFDEB23
2 changed files with 38 additions and 50 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

77
.circleci/config.yml
View file

@ -134,7 +134,7 @@ jobs:
# <<: *integration_tap # <<: *integration_tap
workflows: workflows:
build-staging-production: # build-test-deploy build-test-deploy:
jobs: jobs:
- build-staging: - build-staging:
context: context:
@ -154,42 +154,39 @@ workflows:
branches: branches:
only: only:
- master - master
# - deploy-staging: - deploy-staging:
# context: context:
# - scratch-www-all - scratch-www-all
# - scratch-www-staging - scratch-www-staging
# requires: requires:
# - build-staging - build-staging
# filters: filters:
# branches: branches:
# only: only:
# - develop - develop
# - /^hotfix\/.*/ - /^hotfix\/.*/
# - /^release\/.*/ - /^release\/.*/
# - circleCI-configure-tests - integration-staging-jest:
# - integration-staging-jest: context:
# context: - scratch-www-all
# - scratch-www-all - scratch-www-staging
# - scratch-www-staging requires:
# requires: - deploy-staging
# - deploy-staging filters:
# filters: branches:
# branches: only:
# only: - develop
# - develop - /^hotfix\/.*/
# - /^hotfix\/.*/ - /^release\/.*/
# - /^release\/.*/ - integration-staging-tap:
# - circleCI-configure-tests context:
# - integration-staging-tap: - scratch-www-all
# context: - scratch-www-staging
# - scratch-www-all requires:
# - scratch-www-staging - deploy-staging
# requires: filters:
# - deploy-staging branches:
# filters: only:
# branches: - develop
# only: - /^hotfix\/.*/
# - develop - /^release\/.*/
# - /^hotfix\/.*/
# - /^release\/.*/
# - circleCI-configure-tests

11
.travis.yml
View file

@ -114,15 +114,6 @@ jobs:
include: include:
- stage: test - stage: test
deploy: deploy:
- provider: script
skip_cleanup: $SKIP_CLEANUP
script: npm run deploy
on:
repo: LLK/scratch-www
branch:
- develop
- hotfix/*
- release/*
- provider: script - provider: script
skip_cleanup: $SKIP_CLEANUP skip_cleanup: $SKIP_CLEANUP
script: npm run deploy script: npm run deploy
@ -138,6 +129,6 @@ stages:
- name: test - name: test
if: type != cron if: type != cron
- name: smoke - name: smoke
if: type NOT IN (cron, pull_request) AND (branch =~ /^(develop|master|release\/|hotfix\/)/) if: type NOT IN (cron, pull_request) AND (branch =~ /^(master)/)
- name: update translations - name: update translations
if: branch == develop AND type == cron if: branch == develop AND type == cron