Skip to content
New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

chore: change circleci comments from old to alternate versions #1257

Merged
merged 2 commits into from
Nov 25, 2024
Merged

chore: change circleci comments from old to alternate versions #1257

Changes from all commits
Commits
Show all changes
2 commits
Select commit Hold shift + click to select a range
3365353
chore: change circleci comments from old to alternate versions
MikeMcC399 Nov 25, 2024
bd5eea6
Merge branch 'master' into alternate-publish
MikeMcC399 Nov 25, 2024
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
15 changes: 8 additions & 7 deletions circle.yml
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -1,8 +1,8 @@
# info on building Docker images on Circle
# https://circleci.com/docs/2.0/building-docker-images/

## If you wish to release an older Docker image, do not modify this file in the master branch.
## Follow the instructions in the CONTRIBUTING document and work instead in a feature branch.
## If you wish to release Docker image(s) with alternate (i.e. non-primary) versions, do not modify this file in the master branch.
## Follow the instructions in the CONTRIBUTING document for alternate versions and work instead in a feature branch.
## Modify the push jobs below to be triggered on the feature branch, not the master branch.

version: 2.1
Expand Down Expand Up @@ -351,8 +351,9 @@ workflows:
branches:
only:
# Only branches matching the below regex filters will run
# Change to a feature branch such as <cypress-version>-node-<node.js version>-publish
# if publishing an old version
# Follow the instructions in the CONTRIBUTING document for alternate versions and
# change to a feature branch such as <cypress-version>-node-<node.js version>-publish
# if publishing an alternate (non-primary) version
# This job must run because the base, browsers and included jobs depend on it
- master
requires:
Expand All @@ -369,7 +370,7 @@ workflows:
only:
# Only branches matching the below regex filters will run
# Change to a feature branch such as <cypress-version>-node-<node.js version>-publish
# if publishing an old version
# if publishing an alternate version
- master
requires:
- "Push Factory Image"
Expand All @@ -384,7 +385,7 @@ workflows:
only:
# Only branches matching the below regex filters will run
# Change to a feature branch such as <cypress-version>-node-<node.js version>-publish
# if publishing an old version
# if publishing an alternate version
- master
requires:
- "Push Factory Image"
Expand All @@ -399,7 +400,7 @@ workflows:
only:
# Only branches matching the below regex filters will run
# Change to a feature branch such as <cypress-version>-node-<node.js version>-publish
# if publishing an old version
# if publishing an alternate version
- master
requires:
- "Push Factory Image"
Expand Down