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

Don't run CLA workflow twice #1808

Merged
merged 5 commits into from
Mar 17, 2021
Merged

Don't run CLA workflow twice #1808

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
5 commits
Select commit Hold shift + click to select a range
238ac14
Don't run CLA workflow twice
Jag96 Mar 16, 2021
8765c1d
upadte branches-ignore syntax, add logging for workflows
Jag96 Mar 17, 2021
b59ed4e
Merge branch 'master' into joe-prevent-duplicate-cla
Jag96 Mar 17, 2021
ca83889
remove failsafe
Jag96 Mar 17, 2021
cc0214d
fix run syntax
Jag96 Mar 17, 2021
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
3 changes: 3 additions & 0 deletions .github/workflows/automerge.yml
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -65,6 +65,9 @@ jobs:
github-token: ${{ secrets.GITHUB_TOKEN }}
if: github.event.pull_request.mergeable && github.event.pull_request.head.ref == 'master'

- name: Check PR mergable states
run: echo "Mergeable - ${{ github.event.pull_request.mergeable }} Clean - ${{ github.event.pull_request.mergeable_state }}"

- name: Check for an auto merge
# Version: 0.12.0
uses: pascalgn/automerge-action@c9bd1823770819dc8fb8a5db2d11a3a95fbe9b07
Expand Down
3 changes: 1 addition & 2 deletions .github/workflows/cla.yml
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -5,8 +5,7 @@ on:
types: [created]
pull_request_target:
types: [opened, closed, synchronize]
pull_request:
branches-ignore: [staging, production]
branches-ignore: [staging, production]

jobs:
CLA:
Expand Down
10 changes: 0 additions & 10 deletions .github/workflows/preDeploy.yml
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -63,16 +63,6 @@ jobs:
fetch-depth: 0
token: ${{ secrets.OS_BOTIFY_TOKEN }}

# TODO: Remove once we know that automerge doesn't infinitely loop with this action
- name: Check current version
id: checkCurrentVersion
run: echo "::set-output name=CURRENT_VERSION::$(npm run print-version --silent)"

# TODO: Remove once we know that automerge doesn't infinitely loop with this action
- name: Quit early
if: ${{ steps.checkCurrentVersion.outputs.CURRENT_VERSION == '1.0.2-60' }}
run: exit 1

- uses: softprops/turnstyle@8db075d65b19bf94e6e8687b504db69938dc3c65
with:
poll-interval-seconds: 10
Expand Down