Skip to content

Commit

Permalink
Merge branch 'v1.x' into mergify/bp/v1.x/pr-2560
Browse files Browse the repository at this point in the history
  • Loading branch information
cmwaters authored Sep 22, 2023
2 parents 6551c6c + e08ead2 commit fd77903
Show file tree
Hide file tree
Showing 3 changed files with 6 additions and 5 deletions.
5 changes: 4 additions & 1 deletion .github/workflows/ci-release.yml
Original file line number Diff line number Diff line change
Expand Up @@ -31,13 +31,16 @@ jobs:
lint:
uses: ./.github/workflows/lint.yml

markdown-linter:
uses: ./.github/workflows/markdown-linter.yml

test:
uses: ./.github/workflows/test.yml

# If this was a workflow dispatch event, we need to generate and push a tag
# for goreleaser to grab
version_bump:
needs: [lint, test]
needs: [lint, markdown-linter, test]
runs-on: ubuntu-latest
permissions: "write-all"
steps:
Expand Down
2 changes: 0 additions & 2 deletions .github/workflows/lint.yml
Original file line number Diff line number Diff line change
@@ -1,5 +1,3 @@
# lint runs all linters in this repository. This workflow is run on every pull
# request and push to main.
name: lint
on:
workflow_call:
Expand Down
4 changes: 2 additions & 2 deletions .github/workflows/markdown-linter.yml
Original file line number Diff line number Diff line change
@@ -1,6 +1,6 @@
name: "markdown-linter"
name: markdown-linter
on:
push:
workflow_call:

jobs:
markdown-lint:
Expand Down

0 comments on commit fd77903

Please sign in to comment.