Skip to content

Commit

Permalink
Merge commit 'bf676b4bdfdbcdfdb028609e86c98815373757dd'
Browse files Browse the repository at this point in the history
  • Loading branch information
bensuperpc committed Nov 17, 2021
2 parents d16982e + bf676b4 commit 3b6da47
Show file tree
Hide file tree
Showing 3 changed files with 10 additions and 11 deletions.
17 changes: 8 additions & 9 deletions .github/workflows/base.yml
Original file line number Diff line number Diff line change
Expand Up @@ -3,11 +3,13 @@ name: Continuous Integration
on:
push:
branches:
- master

- "*"
paths-ignore:
- "**.md"
pull_request:
branches:
- master
- "*"
workflow_dispatch:

jobs:
lint:
Expand Down Expand Up @@ -44,8 +46,7 @@ jobs:
# placeholder to your GitHub name.
# If you do not wish to use codecov, then simply delete this job from the
# workflow.
if: github.repository_owner == '<name>'
&& false
if: github.repository_owner == 'bensuperpc'

steps:
- name: "Checkout Code"
Expand Down Expand Up @@ -172,10 +173,8 @@ jobs:
# this comment and the last line in the conditional below.
# If you do not wish to use GitHub Pages for deploying documentation, then
# simply delete this job similarly to the coverage one.
if: github.ref == 'refs/heads/master'
&& github.event_name == 'push'
&& github.repository_owner == '<name>'
&& false
if: github.ref == 'refs/heads/main'
&& github.repository_owner == 'bensuperpc'

steps:
- name: "Checkout Code"
Expand Down
2 changes: 1 addition & 1 deletion CMakePresets.json
Original file line number Diff line number Diff line change
Expand Up @@ -61,7 +61,7 @@
"hidden": true,
"cacheVariables": {
"CMAKE_CXX_FLAGS": "-Wall -Wextra -Wpedantic -Wshadow -Wold-style-cast",
"CMAKE_C_FLAGS": "-Wall -Wextra -Wpedantic -Wshadow -Wold-style-cast"
"CMAKE_C_FLAGS": "-Wall -Wextra -Wpedantic -Wshadow"
}
},
{
Expand Down
2 changes: 1 addition & 1 deletion test/CMakeLists.txt
Original file line number Diff line number Diff line change
Expand Up @@ -17,7 +17,7 @@ if(NOT WIN32)
FetchContent_Declare(
googletest
GIT_REPOSITORY https://github.com/google/googletest.git
GIT_TAG master)
GIT_TAG main)

FetchContent_Declare(
googlebenchmark
Expand Down

0 comments on commit 3b6da47

Please sign in to comment.