Skip to content

Commit

Permalink
[stable-4.5] Rename master to main in workflows and docs (#4124)
Browse files Browse the repository at this point in the history
* Rename master to main in workflows and docs

and sometimes to stable-4.5 when it makes sense to prefer over main

No-Issue

* fix cypress cron branch, interval

* pr-checks.yml: drop check_commit, same as 4.6
  • Loading branch information
himdel authored Aug 31, 2023
1 parent 85685fe commit 615cd61
Show file tree
Hide file tree
Showing 4 changed files with 9 additions and 28 deletions.
12 changes: 6 additions & 6 deletions .github/workflows/cypress.yml
Original file line number Diff line number Diff line change
Expand Up @@ -4,12 +4,12 @@ on:
# allow running manually
workflow_dispatch:
pull_request:
branches: [ 'master', 'stable-*', 'feature/*' ]
branches: [ 'main', 'stable-*', 'feature/*' ]
push:
branches: [ 'master', 'stable-*', 'feature/*' ]
# daily on master
branches: [ 'main', 'stable-*', 'feature/*' ]
# monthly on stable-4.5
schedule:
- cron: '30 5 * * *'
- cron: '30 5 1 * *'

concurrency:
group: cypress-${{ github.ref }}
Expand All @@ -19,8 +19,8 @@ jobs:
cypress:
runs-on: ubuntu-latest
env:
# base of a PR, or pushed-to branch outside PRs, or master
BRANCH: ${{ github.base_ref || github.ref || 'refs/heads/master' }}
# base of a PR, or pushed-to branch outside PRs, or stable-4.5
BRANCH: ${{ github.base_ref || github.ref || 'refs/heads/stable-4.5' }}

steps:

Expand Down
21 changes: 1 addition & 20 deletions .github/workflows/pr-checks.yml
Original file line number Diff line number Diff line change
Expand Up @@ -2,29 +2,10 @@ name: "PR checks"

on:
pull_request:
branches: [ 'master', 'stable-*' ]
branches: [ 'main', 'stable-*' ]

jobs:

check_commit:
runs-on: ubuntu-latest
steps:

- name: Checkout code
uses: actions/checkout@v3
with:
ref: ${{ github.event.after }} # for PR avoids checking out merge commit
fetch-depth: 0 # include all history

- name: Run script to validate commits for both pull request and a push
env:
GITHUB_PR_COMMITS_URL: ${{ github.event.pull_request.commits_url }}
GITHUB_USER: ${{ github.event.pull_request.user.login }}
START_COMMIT: ${{ github.event.before }}
END_COMMIT: ${{ github.event.after }}
run: |
curl https://raw.githubusercontent.com/ansible/galaxy_ng/master/.ci/scripts/validate_commit_message_custom.py | python
pr-checks:
runs-on: ubuntu-latest
steps:
Expand Down
2 changes: 1 addition & 1 deletion README.md
Original file line number Diff line number Diff line change
Expand Up @@ -28,4 +28,4 @@ The app will run on http://localhost:8002 and proxy requests for `api/automation

## UI Testing

For more information about UI testing go to [test README](https://github.com/ansible/ansible-hub-ui/tree/master/test/README.md).
For more information about UI testing go to [test README](https://github.com/ansible/ansible-hub-ui/tree/stable-4.5/test/README.md).
2 changes: 1 addition & 1 deletion test/README.md
Original file line number Diff line number Diff line change
Expand Up @@ -156,7 +156,7 @@ name like `$collection-form.js`
name like `$collection-$action.js` (using camel\_case for both collection name and action name)

* test the action on each available screen
* prefer to loop the same test over an array of "get me there" functions (see [`execution_environments_use_in_controller.js`](https://github.com/ansible/ansible-hub-ui/blob/master/test/cypress/integration/execution_environments_use_in_controller.js#L53-L83) for an example)
* prefer to loop the same test over an array of "get me there" functions (see [`execution_environments_use_in_controller.js`](https://github.com/ansible/ansible-hub-ui/blob/stable-4.5/test/cypress/integration/execution_environments_use_in_controller.js#L53-L83) for an example)
* make sure to wait until every request associated with submitting that action ends, including tasks, and subsequent list screen reloads

## GalaxyKit Integration
Expand Down

0 comments on commit 615cd61

Please sign in to comment.