projects
/
awesomized
/
libmemcached
/ blobdiff
commit
grep
author
committer
pickaxe
?
search:
re
summary
|
shortlog
|
log
|
commit
|
commitdiff
|
tree
|
github
raw
|
inline
| side by side
gh-actions
[awesomized/libmemcached]
/
.github
/
workflows
/
cmake-build-ci.yml
diff --git
a/.github/workflows/cmake-build-ci.yml
b/.github/workflows/cmake-build-ci.yml
index e07723b2a4f4833bab6e201a4dc36031d56a44f5..de828eeb7f68b91b4ac4f044256e5037ae4b344e 100644
(file)
--- a/
.github/workflows/cmake-build-ci.yml
+++ b/
.github/workflows/cmake-build-ci.yml
@@
-34,10
+34,6
@@
jobs:
compiler_vendor: [gnu, clang]
compiler_version: [new, cur, old]
runs-on: ${{ matrix.os }}
compiler_vendor: [gnu, clang]
compiler_version: [new, cur, old]
runs-on: ${{ matrix.os }}
-<<<<<<< HEAD
- if: matrix.os != 'ubuntu-18.04' || matrix.compiler_vendor != 'clang' || matrix.compiler_version != 'old'
-=======
->>>>>>> 60a29acb... gh-actions
env:
CMAKE_CONFIG_TYPE: Release
OS_VND: Linux
env:
CMAKE_CONFIG_TYPE: Release
OS_VND: Linux