Update config.yml

This commit is contained in:
Jonathan Turner 2020-07-06 08:21:46 +12:00 committed by GitHub
parent b2e0dc5b77
commit 455b1ac294
No known key found for this signature in database
GPG Key ID: 4AEE18F83AFDEB23

View File

@ -27,7 +27,7 @@ orbs:
workflows: workflows:
version: 2.0 version: 2.0
# This builds on all pull requests to test, and ignores master # This builds on all pull requests to test, and ignores main
build_without_deploy: build_without_deploy:
jobs: jobs:
- docker/publish: - docker/publish:
@ -39,7 +39,7 @@ workflows:
filters: filters:
branches: branches:
ignore: ignore:
- master - main
before_build: before_build:
- pull_cache - pull_cache
after_build: after_build:
@ -98,11 +98,11 @@ workflows:
docker push quay.io/nushell/nu docker push quay.io/nushell/nu
# publish devel to Docker Hub on merge to master (doesn't build --release) # publish devel to Docker Hub on merge to main (doesn't build --release)
build_with_deploy_devel: build_with_deploy_devel:
jobs: jobs:
# Deploy devel tag on merge to master # Deploy devel tag on merge to main
- docker/publish: - docker/publish:
image: nushell/nu-base image: nushell/nu-base
registry: quay.io registry: quay.io
@ -113,7 +113,7 @@ workflows:
- pull_cache - pull_cache
filters: filters:
branches: branches:
only: master only: main
after_build: after_build:
- run: - run:
name: Build Multistage (smaller) container name: Build Multistage (smaller) container
@ -137,7 +137,7 @@ workflows:
filters: filters:
branches: branches:
only: only:
- master - main
jobs: jobs:
- docker/publish: - docker/publish:
image: nushell/nu-base image: nushell/nu-base