Skip to content

Commit

Permalink
ci: stop auto-updating PRs after merge (#1156)
Browse files Browse the repository at this point in the history
* ci: stop auto-updating PRs after merge

Because the PR-update action uses the default GitHub user agent, it doesn't trigger ci checks to rerun. Updating the branch manually, on the other hand, does.

Also updates workflow name to match filename and job name to match ID

* fix: run cypress tests in chrome

avoids a bug we were getting with the electron browser
  • Loading branch information
sourcefilter authored Aug 29, 2024
1 parent e923913 commit 59a34a2
Show file tree
Hide file tree
Showing 2 changed files with 5 additions and 8 deletions.
3 changes: 2 additions & 1 deletion .github/workflows/ci.yml
Original file line number Diff line number Diff line change
Expand Up @@ -82,10 +82,11 @@ jobs:
docker-compose run web yarn install --frozen-lockfile
docker-compose up --detach
docker-compose run web bundle exec rails db:setup
- uses: cypress-io/github-action@v3
- uses: cypress-io/github-action@v6
with:
command-prefix: 'percy exec -- npx'
working-directory: e2e
browser: chrome
env:
PERCY_TOKEN: ${{ secrets.PERCY_TOKEN }}
- name: Stop docker services
Expand Down
10 changes: 3 additions & 7 deletions .github/workflows/on-merge.yml
Original file line number Diff line number Diff line change
@@ -1,20 +1,16 @@
name: Post-merge chores
name: On merge

on:
push:
branches:
- main

jobs:
autoupdate:
name: Update outstanding PRs
deploy-ursus:
name: Deploy Ursus main branch to test
runs-on: ubuntu-latest
steps:
- uses: actions/checkout@v1
- name: update all prs
uses: maxkomarychev/pr-updater-action@92cb6e15dc3c4b9b148b65eef32836bb428587b9 # v1.0.1
with:
token: ${{ secrets.GITHUB_TOKEN }}
- name: Jenkins webhook
uses: enflo/curl-action@fabe347922c7a9e88bafa15c4b7d6326ea802695
with:
Expand Down

0 comments on commit 59a34a2

Please sign in to comment.