mirror of
https://github.com/86Box/86Box.git
synced 2026-02-22 01:25:33 -07:00
Pervent merge conflict
This commit is contained in:
2
.github/workflows/cmake_linux.yml
vendored
2
.github/workflows/cmake_linux.yml
vendored
@@ -3,7 +3,6 @@ name: CMake (Linux)
|
||||
on:
|
||||
|
||||
push:
|
||||
branches: [ "main" ]
|
||||
paths:
|
||||
- src/**
|
||||
- cmake/**
|
||||
@@ -15,7 +14,6 @@ on:
|
||||
- "!**/Makefile*"
|
||||
|
||||
pull_request:
|
||||
branches: [ "main" ]
|
||||
paths:
|
||||
- src/**
|
||||
- cmake/**
|
||||
|
||||
2
.github/workflows/cmake_macos.yml
vendored
2
.github/workflows/cmake_macos.yml
vendored
@@ -3,7 +3,6 @@ name: CMake (macos)
|
||||
on:
|
||||
|
||||
push:
|
||||
branches: [ "main" ]
|
||||
paths:
|
||||
- src/**
|
||||
- cmake/**
|
||||
@@ -15,7 +14,6 @@ on:
|
||||
- "!**/Makefile*"
|
||||
|
||||
pull_request:
|
||||
branches: [ "main" ]
|
||||
paths:
|
||||
- src/**
|
||||
- cmake/**
|
||||
|
||||
2
.github/workflows/cmake_windows_msys2.yml
vendored
2
.github/workflows/cmake_windows_msys2.yml
vendored
@@ -3,7 +3,6 @@ name: CMake (Windows, msys2)
|
||||
on:
|
||||
|
||||
push:
|
||||
branches: [ "main" ]
|
||||
paths:
|
||||
- src/**
|
||||
- cmake/**
|
||||
@@ -15,7 +14,6 @@ on:
|
||||
- "!**/Makefile*"
|
||||
|
||||
pull_request:
|
||||
branches: [ "msin" ]
|
||||
paths:
|
||||
- src/**
|
||||
- cmake/**
|
||||
|
||||
Reference in New Issue
Block a user