Skip to content

Commit

Permalink
Handle update from master -> main
Browse files Browse the repository at this point in the history
Signed-off-by: Chris Evich <cevich@redhat.com>
  • Loading branch information
cevich committed May 14, 2021
1 parent ba57b00 commit ed5bf88
Show file tree
Hide file tree
Showing 3 changed files with 8 additions and 8 deletions.
2 changes: 1 addition & 1 deletion README.md
Original file line number Diff line number Diff line change
Expand Up @@ -37,7 +37,7 @@ retrieve tree-history details. This is required for the installer to properly
set the actual version-number as part of the process.

Though not recommended at all, it is also possible to specify the version as
`latest`. This will clone down whatever happens to be on the master branch
`latest`. This will clone down whatever happens to be on the 'main' branch
at the time. Though it will probably work, it's best for stability to specify
an explicit released version.

Expand Down
2 changes: 1 addition & 1 deletion bin/install_automation.sh
Original file line number Diff line number Diff line change
Expand Up @@ -15,7 +15,7 @@ set +x
# install

AUTOMATION_REPO_URL=${AUTOMATION_REPO_URL:-https://github.com/containers/automation.git}
AUTOMATION_REPO_BRANCH=${AUTOMATION_REPO_BRANCH:-master}
AUTOMATION_REPO_BRANCH=${AUTOMATION_REPO_BRANCH:-main}
# This must be hard-coded for executing via pipe to bash
SCRIPT_FILENAME=install_automation.sh
# When non-empty, contains the installation source-files
Expand Down
12 changes: 6 additions & 6 deletions cirrus-ci_retrospective/README.md
Original file line number Diff line number Diff line change
Expand Up @@ -13,7 +13,7 @@ to tests passing on a tagged commit.

# Example Github Action Workflow

On the master (default) branch of a repository (previously setup and running
On the 'main' (default) branch of a repository (previously setup and running
tasks in Cirrus-CI), add the following file:

`.github/workflows/cirrus-ci_retrospective.yml`
Expand All @@ -38,7 +38,7 @@ jobs:

## Dependencies:

In addition to the basic `common` requirements (see [top-level README.md](../master/README.md))
In addition to the basic `common` requirements (see [top-level README.md](../README.md))
the following system packages (or their equivalents) are needed:

* curl
Expand Down Expand Up @@ -66,7 +66,7 @@ the following system packages (or their equivalents) are needed:
## Warning

Due to security concerns, Github Actions only supports execution vs check_suite events
from workflows already committed on the master branch. This makes it difficult to
from workflows already committed on the 'main' branch. This makes it difficult to
test implementations, since they will not execute until merged.

However, the output JSON does provide all the necessary details to re-create, then possibly
Expand Down Expand Up @@ -128,15 +128,15 @@ action will not execute again, irrespective of pass, fail or any other manual ta
Also, if any task in Cirrus-CI is dependent on a manual task, the build itself will not
conclude until the manual task is triggered and completes (pass, fail, or other).

## After merging pull request 34 into master branch (merge commit added)
## After merging pull request 34 into main branch (merge commit added)

```json
{
...cut...
"build": {
"id": "foobarbaz"
"changeIdInRepo": "232bae5d8ffb6082393e7543e4e53f978152f98a",
"branch": "master",
"branch": "main",
"pullRequest": null,
...cut...
}
Expand Down Expand Up @@ -169,6 +169,6 @@ Given a "conclusion" task name in Cirrus-CI (e.g. `cirrus-ci/test_success`):
`'.[] | select(.name == "cirrus-ci/test_success") | .build.pullRequest'`

* Obtain the HEAD commit ID used by Cirrus-CI for the build (always available)
'.[] | select(.name == "cirrus-ci/test_success") | .build.changeIdInRepo'
`'.[] | select(.name == "cirrus-ci/test_success") | .build.changeIdInRepo'`

* ...todo: add more

0 comments on commit ed5bf88

Please sign in to comment.