Skip to content

Commit

Permalink
Merge branch 'main' into v3-clean-lint
Browse files Browse the repository at this point in the history
  • Loading branch information
ecooper authored Dec 19, 2024
2 parents d61c9a5 + 55e7a6f commit 0c738c9
Show file tree
Hide file tree
Showing 2 changed files with 4 additions and 5 deletions.
4 changes: 2 additions & 2 deletions .github/workflows/lint.yml
Original file line number Diff line number Diff line change
Expand Up @@ -6,9 +6,9 @@ name: Lint and prettify
on:
# temporarily "v3"; change to "main" after merge
push:
branches: ["v3"]
branches: ["main"]
pull_request:
branches: ["v3"]
branches: ["main"]

jobs:
lint:
Expand Down
5 changes: 2 additions & 3 deletions .github/workflows/test.yml
Original file line number Diff line number Diff line change
Expand Up @@ -4,11 +4,10 @@
name: Test

on:
# temporarily "v3"; change to "main" after merge
push:
branches: ["v3"]
branches: ["main"]
pull_request:
branches: ["v3"]
branches: ["main"]

jobs:
test:
Expand Down

0 comments on commit 0c738c9

Please sign in to comment.