Skip to content
This repository has been archived by the owner on Jun 8, 2021. It is now read-only.

Commit

Permalink
ci: ensure that workflows run on main
Browse files Browse the repository at this point in the history
Closes: diem#7871
  • Loading branch information
bmwill authored and bors-libra committed Mar 10, 2021
1 parent a73ddaf commit be4811e
Show file tree
Hide file tree
Showing 6 changed files with 6 additions and 6 deletions.
2 changes: 1 addition & 1 deletion .github/actions/land-blocking/find-lbt-images.sh
Original file line number Diff line number Diff line change
Expand Up @@ -8,7 +8,7 @@ REPOS=(diem/validator diem/cluster_test diem/init diem/validator_tcb)
# the number of commits backwards we want to look
END=50

BASE_REF=${BASE_REF:-master}
BASE_REF=${BASE_REF:-main}

image_tag_exists() {
if [ -z $1 ]; then
Expand Down
2 changes: 1 addition & 1 deletion .github/workflows/ci-update-sccache.yml
Original file line number Diff line number Diff line change
Expand Up @@ -2,7 +2,7 @@ name: ci-update-sccache

on:
push:
branches: [master, release-*, gha-test-*]
branches: [main, master, release-*, gha-test-*]

defaults:
run:
Expand Down
2 changes: 1 addition & 1 deletion .github/workflows/daily.yml
Original file line number Diff line number Diff line change
Expand Up @@ -17,7 +17,7 @@ jobs:
matrix:
#this is a painful solution since it doesn't pick up new branches, other option is lotsa shell in one job....
#to test in canary add in canary here.....
target-branch: [master, release-1.1]
target-branch: [main, master, release-1.1]
env:
MESSAGE_PAYLOAD_FILE: /tmp/message
steps:
Expand Down
2 changes: 1 addition & 1 deletion .github/workflows/developer-site-ci.yml
Original file line number Diff line number Diff line change
Expand Up @@ -7,7 +7,7 @@ on:
# paths: [ 'developers.diem.com/**' ]
# but want to build rustdocs on main Diem code changes outside of the website too
pull_request:
branches: [ master ]
branches: [ main, master ]
# would have had
# paths: [ 'developers.diem.com/**' ]
# but want to build rustdocs on main Diem code changes outside of the website too
Expand Down
2 changes: 1 addition & 1 deletion .github/workflows/docker-publish.yml
Original file line number Diff line number Diff line change
Expand Up @@ -2,7 +2,7 @@ name: docker-publish.yml

on:
push:
branches: [master, release-*]
branches: [main, master, release-*]

jobs:
build-images:
Expand Down
2 changes: 1 addition & 1 deletion .github/workflows/rustdoc.yml
Original file line number Diff line number Diff line change
Expand Up @@ -2,7 +2,7 @@ name: rustdoc

on:
push:
branches: [ master ]
branches: [ main, master ]

env:
CARGO_INCREMENTAL: 0
Expand Down

0 comments on commit be4811e

Please sign in to comment.