Skip to content

Commit 6beee9f

Browse files
committed
Merge remote-tracking branch 'origin/feature/github-actions-windows-ci' into feature/github-actions-windows-ci
# Conflicts: # .github/workflows/cmake-windows.yml
2 parents 3a571b5 + 9a0354c commit 6beee9f

File tree

2 files changed

+4
-2
lines changed

2 files changed

+4
-2
lines changed

.github/workflows/cmake-windows.yml

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -2,9 +2,9 @@ name: CMake Windows build and test
22

33
on:
44
push:
5-
branches: [ master ]
5+
branches: [ master, feature/github-actions-windows-ci ]
66
pull_request:
7-
branches: [ master ]
7+
branches: [ master, feature/github-actions-windows-ci ]
88
workflow_dispatch:
99

1010
env:

Readme.md

Lines changed: 2 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -5,6 +5,8 @@ Continuous Integration
55
----------------------
66
Github actions CMake Ubuntu [![CMake Ubuntu build and test](https://github.com/MEONMedical/Log4Qt/actions/workflows/cmake-ubuntu.yml/badge.svg)](https://github.com/MEONMedical/Log4Qt/actions/workflows/cmake-ubuntu.yml)
77

8+
Github actions CMake Windows [![CMake Windows build and test](https://github.com/MEONMedical/Log4Qt/actions/workflows/cmake-windows.yml/badge.svg)](https://github.com/MEONMedical/Log4Qt/actions/workflows/cmake-windows.yml)
9+
810
Appveyor CI (Windows) [![Build status](https://ci.appveyor.com/api/projects/status/yhlqvbqeooy7ds2l?svg=true)](https://ci.appveyor.com/project/MeonMedical/log4qt)
911

1012

0 commit comments

Comments
 (0)