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

Jump to bottom

Test manual ci with fallback branch in workflow #1274

Open
wants to merge 4 commits into
base: my-tasks-scaffold
Choose a base branch
from
Open

Test manual ci with fallback branch in workflow #1274

Changes from all commits
Commits
Show all changes
4 commits
Select commit Hold shift + click to select a range
7a4e88c
test ci
MattBudz Jun 26, 2024
7272e5b
add fallback branch for rubocop to compare against when manually trig…
MattBudz Jun 26, 2024
2aa4046
add `origin/` prefix to fallback branch
MattBudz Jun 26, 2024
a21f9c1
Revert "test ci"
MattBudz Jun 26, 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
3 changes: 2 additions & 1 deletion .github/workflows/ci.yml
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -32,6 +32,7 @@ jobs:
IS_MERGE: ${{ github.base_ref == '' }}
PREV_SHA: ${{ github.event.before }}
TARGET_BRANCH: ${{ github.base_ref }}
FALLBACK_BRANCH: 'origin/develop'
Copy link
Contributor

@caitmich caitmich Jun 26, 2024 •
edited
Loading

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

Is specifying origin needed since we have this check in rubocop-ci

steps:
- name: Checkout code
uses: actions/checkout@v1
Expand All @@ -40,7 +41,7 @@ jobs:
with:
bundler-cache: true
- name: Lint changed files
run: bin/rubocop-ci ${{ env.TARGET_BRANCH || env.PREV_SHA }} ${{ env.IS_MERGE }}
run: bin/rubocop-ci ${{ env.TARGET_BRANCH || env.PREV_SHA || env.FALLBACK_BRANCH }} ${{ env.IS_MERGE }}
rspec:
name: RSpec
needs: [audits, rubocop]
Expand Down
Loading