mirror of
https://github.com/goatcorp/Dalamud.git
synced 2025-12-12 18:27:23 +01:00
Merge remote-tracking branch 'origin/master' into net8-rollup
This commit is contained in:
commit
7e1d006a5f
4 changed files with 25 additions and 30 deletions
9
.github/workflows/rollup.yml
vendored
9
.github/workflows/rollup.yml
vendored
|
|
@ -1,8 +1,8 @@
|
|||
name: Rollup changes to next version
|
||||
on:
|
||||
# push:
|
||||
# branches:
|
||||
# - master
|
||||
push:
|
||||
branches:
|
||||
- master
|
||||
workflow_dispatch:
|
||||
|
||||
jobs:
|
||||
|
|
@ -11,7 +11,8 @@ jobs:
|
|||
strategy:
|
||||
matrix:
|
||||
branches:
|
||||
- v9
|
||||
- net8
|
||||
#- new_im_hooks # Unmergeable
|
||||
|
||||
defaults:
|
||||
run:
|
||||
|
|
|
|||
Loading…
Add table
Add a link
Reference in a new issue