Skip to content

Commit

Permalink
ci: add dev- branches as supported PR target (#8828)
Browse files Browse the repository at this point in the history
Co-authored-by: mergify[bot] <37929162+mergify[bot]@users.noreply.github.com>
  • Loading branch information
mhofman and mergify[bot] committed Jan 30, 2024
1 parent f55616a commit b718b64
Show file tree
Hide file tree
Showing 6 changed files with 15 additions and 0 deletions.
5 changes: 5 additions & 0 deletions .github/workflows/after-merge.yml
Original file line number Diff line number Diff line change
Expand Up @@ -7,6 +7,7 @@ on:
# $default-branch
- master
- 'release-*'
- 'dev-*'
workflow_dispatch:

jobs:
Expand Down Expand Up @@ -60,6 +61,10 @@ jobs:
# A pre-release.
TAG=${GITHUB_REF_NAME#release-}-dev
;;
dev-*)
# A pre-release while our release branch is straying from master
TAG=${GITHUB_REF_NAME#dev-}-dev
;;
master)
# A trunk dev release.
TAG=dev
Expand Down
1 change: 1 addition & 0 deletions .github/workflows/ag-solo-xs.yml.DISABLED
Original file line number Diff line number Diff line change
Expand Up @@ -9,6 +9,7 @@ on:
# $default-branch
- master
- 'release-*'
- 'dev-*'

jobs:
xs-build:
Expand Down
5 changes: 5 additions & 0 deletions .github/workflows/docker.yml
Original file line number Diff line number Diff line change
Expand Up @@ -6,6 +6,7 @@ on:
# $default-branch
- master
- 'release-*'
- 'dev-*'
tags:
- '@agoric/sdk@*'
workflow_dispatch:
Expand Down Expand Up @@ -147,6 +148,10 @@ jobs:
# A pre-release.
DOCKER_TAGS=${GITHUB_REF_NAME#release-}-dev
;;
dev-*)
# A pre-release while our release branch is straying from master
DOCKER_TAGS=${GITHUB_REF_NAME#dev-}-dev
;;
master)
# A trunk dev release.
DOCKER_TAGS=dev
Expand Down
1 change: 1 addition & 0 deletions .github/workflows/golangci-lint.yml
Original file line number Diff line number Diff line change
Expand Up @@ -7,6 +7,7 @@ on:
# $default-branch
- master
- 'release-*'
- 'dev-*'
pull_request:
merge_group:
permissions:
Expand Down
1 change: 1 addition & 0 deletions .github/workflows/integration.yml
Original file line number Diff line number Diff line change
Expand Up @@ -8,6 +8,7 @@ on:
branches:
- master
- 'release-*'
- 'dev-*'
- beta
tags:
- '@agoric/sdk@*'
Expand Down
2 changes: 2 additions & 0 deletions .github/workflows/pre-check-integration.yml
Original file line number Diff line number Diff line change
Expand Up @@ -17,6 +17,7 @@ on:
(
github.event.pull_request.base.ref == 'master' ||
startsWith(github.event.pull_request.base.ref, 'release-') ||
startsWith(github.event.pull_request.base.ref, 'dev-') ||
github.event.pull_request.base.ref == 'beta'
) &&
github.event.pull_request.draft == false &&
Expand All @@ -38,6 +39,7 @@ jobs:
(
github.event.pull_request.base.ref == 'master' ||
startsWith(github.event.pull_request.base.ref, 'release-') ||
startsWith(github.event.pull_request.base.ref, 'dev-') ||
github.event.pull_request.base.ref == 'beta'
) &&
github.event.pull_request.draft == false &&
Expand Down

0 comments on commit b718b64

Please sign in to comment.