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

Update Differential ShellCheck workflow #440

Merged
merged 4 commits into from
Jul 31, 2024
Merged

Update Differential ShellCheck workflow #440

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
4 commits
Select commit Hold shift + click to select a range
cf5032a
ci: update Differential ShellCheck workflow
jamacku Jul 31, 2024
47b67ac
lint: fix warnings
jamacku Jul 31, 2024
89349fa
ci: run unit tests in merge queue
jamacku Jul 31, 2024
a494bfa
ci: run ShellCheck on push only if target branch is `main`
jamacku Jul 31, 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
9 changes: 3 additions & 6 deletions .github/workflows/differential-shellcheck.yml
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -3,18 +3,18 @@
name: Differential ShellCheck
on:
push:
branches: [ main ]
pull_request:
branches: [ main ]
merge_group:
branches:
- main
types: [ checks_requested ]

permissions:
contents: read

jobs:
lint:
name: Test latest changes
name: Differential ShellCheck - test current changes
runs-on: ubuntu-latest

permissions:
Expand Down Expand Up @@ -46,9 +46,6 @@ jobs:
src/**.{zsh,osh}
display-engine: sarif-fmt
token: ${{ secrets.GITHUB_TOKEN }}
triggering-event: ${{ github.event_name == 'merge_group' && 'manual' || github.event_name }}
base: ${{ github.event.merge_group.base_sha }}
head: ${{ github.event.merge_group.head_sha }}

- if: always()
name: Upload artifact with defects in SARIF format
Expand Down
2 changes: 2 additions & 0 deletions .github/workflows/unit-test.yml
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -6,6 +6,8 @@ on:
branches: [ main ]
push:
branches: [ main ]
merge_group:
types: [ checks_requested ]

permissions:
contents: read
Expand Down
4 changes: 3 additions & 1 deletion docs/CHANGELOG.md
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -2,6 +2,8 @@

## Next release

* Native support for `merge_group` trigger event

## v5.3.1

* Update `csutils` (`csdiff`) to 3.4.0
Expand Down Expand Up @@ -225,7 +227,7 @@

* Bugfixes:
* Make directory /github/workspace git-save
* Remove double quotes to avoid git empty pathspec warnings
* Remove double quotes to avoid `git` empty pathspec warnings
* Make GA tests ran on current version of repo/fork
* Bump actions/checkout from 2 to 3

Expand Down