Skip to content

Commit

Permalink
Merge branch 'main' into develop
Browse files Browse the repository at this point in the history
  • Loading branch information
TurtIeSocks committed Feb 6, 2024
2 parents 49bd269 + b8db2c0 commit c52a898
Show file tree
Hide file tree
Showing 4 changed files with 424 additions and 452 deletions.
5 changes: 4 additions & 1 deletion .github/workflows/lint.yml
Original file line number Diff line number Diff line change
@@ -1,5 +1,8 @@
name: Lint
on: [push, pull_request]
on:
push:
pull_request:
types: [opened, synchronize, reopened]

jobs:
lint:
Expand Down
5 changes: 4 additions & 1 deletion .github/workflows/main.yml
Original file line number Diff line number Diff line change
@@ -1,5 +1,8 @@
name: Main CI
on: [push, pull_request]
on:
push:
pull_request:
types: [opened, synchronize, reopened]

jobs:
config:
Expand Down
Loading

0 comments on commit c52a898

Please sign in to comment.