Skip to content

Commit

Permalink
Merge remote-tracking branch 'refs/remotes/origin/v5.0'
Browse files Browse the repository at this point in the history
  • Loading branch information
dirkwhoffmann committed May 31, 2024
2 parents 236b9d2 + 281bd8f commit dc9e105
Show file tree
Hide file tree
Showing 2 changed files with 4 additions and 4 deletions.
4 changes: 2 additions & 2 deletions .github/workflows/cmake-mingw.yml
Original file line number Diff line number Diff line change
Expand Up @@ -2,9 +2,9 @@ name: CMake-MinGW

on:
push:
branches: [ master, dev ]
branches: [ master, dev, v5.0 ]
pull_request:
branches: [ master, dev ]
branches: [ master, dev, v5.0 ]

env:
BUILD_TYPE: Release
Expand Down
4 changes: 2 additions & 2 deletions .github/workflows/cmake-msvc.yml
Original file line number Diff line number Diff line change
Expand Up @@ -2,9 +2,9 @@ name: CMake-MSVC

on:
push:
branches: [ master, dev ]
branches: [ master, dev, v5.0 ]
pull_request:
branches: [ master, dev ]
branches: [ master, dev, v5.0 ]

env:
BUILD_TYPE: Release
Expand Down

0 comments on commit dc9e105

Please sign in to comment.