projects
/
awesomized
/
libmemcached
/ commitdiff
commit
grep
author
committer
pickaxe
?
search:
re
summary
|
shortlog
|
log
|
commit
| commitdiff |
tree
|
github
raw
|
patch
|
inline
| side by side (from parent 1:
b4ef76f
)
update ci
author
Michael Wallner
<mike@php.net>
Sun, 27 Dec 2020 10:50:18 +0000
(11:50 +0100)
committer
Michael Wallner
<mike@php.net>
Sun, 27 Dec 2020 10:55:57 +0000
(11:55 +0100)
.builds/scripts/notify-gitter
patch
|
blob
|
history
.github/notify-gitter.sh
patch
|
blob
|
history
.github/workflows/cmake-build-ci.gen
patch
|
blob
|
history
.github/workflows/cmake-build-ci.yml
patch
|
blob
|
history
diff --git
a/.builds/scripts/notify-gitter
b/.builds/scripts/notify-gitter
index 7be63d08f30b22f3aeebe4296105ef0b76189188..cac46b7598a0f6797ffc8ad1f169f6cbd40e0eb0 100755
(executable)
--- a/
.builds/scripts/notify-gitter
+++ b/
.builds/scripts/notify-gitter
@@
-10,12
+10,17
@@
REF_URL=https://github.com/${REPO}/commits/${REF}
BUILD_URL=${JOB_URL}
BUILD_TAG=$(uname -o 2>/dev/null || uname -s)
BUILD_URL=${JOB_URL}
BUILD_TAG=$(uname -o 2>/dev/null || uname -s)
-if
test "$BUILD_TAG" = "GNU/Linux"
+if
expr match "$BUILD_TAG" ".*Linux" >/dev/null
then
BUILD_TAG=$(lsb_release -irs)
fi
BUILD_CXX=$(c++ --version | head -1)
then
BUILD_TAG=$(lsb_release -irs)
fi
BUILD_CXX=$(c++ --version | head -1)
-BUILD_ENV=${BUILD_TAG}/${BUILD_CXX}
+if expr match "${BUILD_CXX}" "${BUILD_TAG}" >/dev/null
+then
+ BUILD_ENV="${BUILD_CXX}"
+else
+ BUILD_ENV="${BUILD_TAG}/${BUILD_CXX}"
+fi
case "$STATUS" in
success)
case "$STATUS" in
success)
diff --git
a/.github/notify-gitter.sh
b/.github/notify-gitter.sh
index edfe9995d9f5cd13e1ebe0712574962801a0826b..036e932c3a41676d44898ec051d1f1c403e13d42 100755
(executable)
--- a/
.github/notify-gitter.sh
+++ b/
.github/notify-gitter.sh
@@
-1,6
+1,4
@@
#!/usr/bin/env bash
#!/usr/bin/env bash
-GITTER=$1
-
REPO=${GITHUB_REPOSITORY}
REF=$(basename ${GITHUB_REF})
REPO=${GITHUB_REPOSITORY}
REF=$(basename ${GITHUB_REF})
@@
-9,7
+7,7
@@
REF_URL=https://github.com/${REPO}/commits/${REF}
BUILD_URL=https://github.com/${REPO}/actions/runs/${GITHUB_RUN_ID}
BUILD_ENV=${ImageOS}/${CC:-${CC_VND}-${CC_VER}}
BUILD_URL=https://github.com/${REPO}/actions/runs/${GITHUB_RUN_ID}
BUILD_ENV=${ImageOS}/${CC:-${CC_VND}-${CC_VER}}
-case "$
2
" in
+case "$
1
" in
1|true|success)
level=info
status=success
1|true|success)
level=info
status=success
diff --git
a/.github/workflows/cmake-build-ci.gen
b/.github/workflows/cmake-build-ci.gen
index 5cdc10c8126fda2e4ed2a39364f8df7bb3706bb6..cf1871369f767801349d393040c7cb39cf779661 100755
(executable)
--- a/
.github/workflows/cmake-build-ci.gen
+++ b/
.github/workflows/cmake-build-ci.gen
@@
-250,7
+250,7
@@
function steps_package() {
- name: Package
env:
PUSH_ARTIFACTS_ID: ${{ secrets.PUSH_ARTIFACTS_ID }}
- name: Package
env:
PUSH_ARTIFACTS_ID: ${{ secrets.PUSH_ARTIFACTS_ID }}
- if: env.CMAKE_BUILD_TYPE == 'Release' && !(env.OS_VER == 'ubuntu-18.04' && env.CC_VND == 'gnu' && env.CC_VER == 'new ')
+ if: env.
PUSH_ARTIFACTS_ID != '' && env.
CMAKE_BUILD_TYPE == 'Release' && !(env.OS_VER == 'ubuntu-18.04' && env.CC_VND == 'gnu' && env.CC_VER == 'new ')
run: |
cmake --config ${{ env.CMAKE_BUILD_TYPE }} -S . -B build
cmake --build build --config ${{ env.CMAKE_BUILD_TYPE }} -j2 --target package
run: |
cmake --config ${{ env.CMAKE_BUILD_TYPE }} -S . -B build
cmake --build build --config ${{ env.CMAKE_BUILD_TYPE }} -j2 --target package
@@
-263,8
+263,10
@@
function steps_package() {
function steps_notify($os_vnd) {
?>
- name: Notify Gitter
function steps_notify($os_vnd) {
?>
- name: Notify Gitter
- if: success() || failure()
- run: bash .github/notify-gitter.sh ${{ secrets.GITTER }} ${{ job.status }}
+ env:
+ GITTER: ${{ secrets.GITTER }}
+ if: (success() || failure()) && env.GITTER != ''
+ run: bash .github/notify-gitter.sh ${{ job.status }}
<?php
}
<?php
}
@@
-302,13
+304,13
@@
on:
types: [published]
push:
paths:
types: [published]
push:
paths:
+ - ".github/workflows/cmake-build-ci*"
+ - "CMake*"
+ - "CPack*"
- "contrib/**"
- "include/**"
- "src/**"
- "test/**"
- "contrib/**"
- "include/**"
- "src/**"
- "test/**"
- - "CMake*"
- - "CPack*"
- - ".github/workflows/cmake-build-ci*"
branches-ignore:
- gh-pages
pull_request:
branches-ignore:
- gh-pages
pull_request:
diff --git
a/.github/workflows/cmake-build-ci.yml
b/.github/workflows/cmake-build-ci.yml
index 729c7af7099db96e281c7fedd95dd69085a810d5..6356fa6492cd57f1a83208217fbdaa89afeddf36 100644
(file)
--- a/
.github/workflows/cmake-build-ci.yml
+++ b/
.github/workflows/cmake-build-ci.yml
@@
-6,13
+6,13
@@
on:
types: [published]
push:
paths:
types: [published]
push:
paths:
+ - ".github/workflows/cmake-build-ci*"
+ - "CMake*"
+ - "CPack*"
- "contrib/**"
- "include/**"
- "src/**"
- "test/**"
- "contrib/**"
- "include/**"
- "src/**"
- "test/**"
- - "CMake*"
- - "CPack*"
- - ".github/workflows/cmake-build-ci*"
branches-ignore:
- gh-pages
pull_request:
branches-ignore:
- gh-pages
pull_request:
@@
-106,7
+106,7
@@
jobs:
- name: Package
env:
PUSH_ARTIFACTS_ID: ${{ secrets.PUSH_ARTIFACTS_ID }}
- name: Package
env:
PUSH_ARTIFACTS_ID: ${{ secrets.PUSH_ARTIFACTS_ID }}
- if: env.CMAKE_BUILD_TYPE == 'Release' && !(env.OS_VER == 'ubuntu-18.04' && env.CC_VND == 'gnu' && env.CC_VER == 'new ')
+ if: env.
PUSH_ARTIFACTS_ID != '' && env.
CMAKE_BUILD_TYPE == 'Release' && !(env.OS_VER == 'ubuntu-18.04' && env.CC_VND == 'gnu' && env.CC_VER == 'new ')
run: |
cmake --config ${{ env.CMAKE_BUILD_TYPE }} -S . -B build
cmake --build build --config ${{ env.CMAKE_BUILD_TYPE }} -j2 --target package
run: |
cmake --config ${{ env.CMAKE_BUILD_TYPE }} -S . -B build
cmake --build build --config ${{ env.CMAKE_BUILD_TYPE }} -j2 --target package
@@
-114,8
+114,10
@@
jobs:
cmake --build build --config ${{ env.CMAKE_BUILD_TYPE }} -j2 --target package
cmake --build build --config ${{ env.CMAKE_BUILD_TYPE }} -j2 --target push-artifacts
- name: Notify Gitter
cmake --build build --config ${{ env.CMAKE_BUILD_TYPE }} -j2 --target package
cmake --build build --config ${{ env.CMAKE_BUILD_TYPE }} -j2 --target push-artifacts
- name: Notify Gitter
- if: success() || failure()
- run: bash .github/notify-gitter.sh ${{ secrets.GITTER }} ${{ job.status }}
+ env:
+ GITTER: ${{ secrets.GITTER }}
+ if: (success() || failure()) && env.GITTER != ''
+ run: bash .github/notify-gitter.sh ${{ job.status }}
- uses: codecov/codecov-action@v1.0.13
# sanitizer build
- uses: codecov/codecov-action@v1.0.13
# sanitizer build
@@
-185,7
+187,7
@@
jobs:
- name: Package
env:
PUSH_ARTIFACTS_ID: ${{ secrets.PUSH_ARTIFACTS_ID }}
- name: Package
env:
PUSH_ARTIFACTS_ID: ${{ secrets.PUSH_ARTIFACTS_ID }}
- if: env.CMAKE_BUILD_TYPE == 'Release' && !(env.OS_VER == 'ubuntu-18.04' && env.CC_VND == 'gnu' && env.CC_VER == 'new ')
+ if: env.
PUSH_ARTIFACTS_ID != '' && env.
CMAKE_BUILD_TYPE == 'Release' && !(env.OS_VER == 'ubuntu-18.04' && env.CC_VND == 'gnu' && env.CC_VER == 'new ')
run: |
cmake --config ${{ env.CMAKE_BUILD_TYPE }} -S . -B build
cmake --build build --config ${{ env.CMAKE_BUILD_TYPE }} -j2 --target package
run: |
cmake --config ${{ env.CMAKE_BUILD_TYPE }} -S . -B build
cmake --build build --config ${{ env.CMAKE_BUILD_TYPE }} -j2 --target package
@@
-193,8
+195,10
@@
jobs:
cmake --build build --config ${{ env.CMAKE_BUILD_TYPE }} -j2 --target package
cmake --build build --config ${{ env.CMAKE_BUILD_TYPE }} -j2 --target push-artifacts
- name: Notify Gitter
cmake --build build --config ${{ env.CMAKE_BUILD_TYPE }} -j2 --target package
cmake --build build --config ${{ env.CMAKE_BUILD_TYPE }} -j2 --target push-artifacts
- name: Notify Gitter
- if: success() || failure()
- run: bash .github/notify-gitter.sh ${{ secrets.GITTER }} ${{ job.status }}
+ env:
+ GITTER: ${{ secrets.GITTER }}
+ if: (success() || failure()) && env.GITTER != ''
+ run: bash .github/notify-gitter.sh ${{ job.status }}
# mac debug
dbg-mac:
# mac debug
dbg-mac:
@@
-257,7
+261,7
@@
jobs:
- name: Package
env:
PUSH_ARTIFACTS_ID: ${{ secrets.PUSH_ARTIFACTS_ID }}
- name: Package
env:
PUSH_ARTIFACTS_ID: ${{ secrets.PUSH_ARTIFACTS_ID }}
- if: env.CMAKE_BUILD_TYPE == 'Release' && !(env.OS_VER == 'ubuntu-18.04' && env.CC_VND == 'gnu' && env.CC_VER == 'new ')
+ if: env.
PUSH_ARTIFACTS_ID != '' && env.
CMAKE_BUILD_TYPE == 'Release' && !(env.OS_VER == 'ubuntu-18.04' && env.CC_VND == 'gnu' && env.CC_VER == 'new ')
run: |
cmake --config ${{ env.CMAKE_BUILD_TYPE }} -S . -B build
cmake --build build --config ${{ env.CMAKE_BUILD_TYPE }} -j2 --target package
run: |
cmake --config ${{ env.CMAKE_BUILD_TYPE }} -S . -B build
cmake --build build --config ${{ env.CMAKE_BUILD_TYPE }} -j2 --target package
@@
-265,8
+269,10
@@
jobs:
cmake --build build --config ${{ env.CMAKE_BUILD_TYPE }} -j2 --target package
cmake --build build --config ${{ env.CMAKE_BUILD_TYPE }} -j2 --target push-artifacts
- name: Notify Gitter
cmake --build build --config ${{ env.CMAKE_BUILD_TYPE }} -j2 --target package
cmake --build build --config ${{ env.CMAKE_BUILD_TYPE }} -j2 --target push-artifacts
- name: Notify Gitter
- if: success() || failure()
- run: bash .github/notify-gitter.sh ${{ secrets.GITTER }} ${{ job.status }}
+ env:
+ GITTER: ${{ secrets.GITTER }}
+ if: (success() || failure()) && env.GITTER != ''
+ run: bash .github/notify-gitter.sh ${{ job.status }}
- uses: codecov/codecov-action@v1.0.13
# mac release
- uses: codecov/codecov-action@v1.0.13
# mac release
@@
-329,7
+335,7
@@
jobs:
- name: Package
env:
PUSH_ARTIFACTS_ID: ${{ secrets.PUSH_ARTIFACTS_ID }}
- name: Package
env:
PUSH_ARTIFACTS_ID: ${{ secrets.PUSH_ARTIFACTS_ID }}
- if: env.CMAKE_BUILD_TYPE == 'Release' && !(env.OS_VER == 'ubuntu-18.04' && env.CC_VND == 'gnu' && env.CC_VER == 'new ')
+ if: env.
PUSH_ARTIFACTS_ID != '' && env.
CMAKE_BUILD_TYPE == 'Release' && !(env.OS_VER == 'ubuntu-18.04' && env.CC_VND == 'gnu' && env.CC_VER == 'new ')
run: |
cmake --config ${{ env.CMAKE_BUILD_TYPE }} -S . -B build
cmake --build build --config ${{ env.CMAKE_BUILD_TYPE }} -j2 --target package
run: |
cmake --config ${{ env.CMAKE_BUILD_TYPE }} -S . -B build
cmake --build build --config ${{ env.CMAKE_BUILD_TYPE }} -j2 --target package
@@
-337,8
+343,10
@@
jobs:
cmake --build build --config ${{ env.CMAKE_BUILD_TYPE }} -j2 --target package
cmake --build build --config ${{ env.CMAKE_BUILD_TYPE }} -j2 --target push-artifacts
- name: Notify Gitter
cmake --build build --config ${{ env.CMAKE_BUILD_TYPE }} -j2 --target package
cmake --build build --config ${{ env.CMAKE_BUILD_TYPE }} -j2 --target push-artifacts
- name: Notify Gitter
- if: success() || failure()
- run: bash .github/notify-gitter.sh ${{ secrets.GITTER }} ${{ job.status }}
+ env:
+ GITTER: ${{ secrets.GITTER }}
+ if: (success() || failure()) && env.GITTER != ''
+ run: bash .github/notify-gitter.sh ${{ job.status }}
# windows release builds
windows:
# windows release builds
windows:
@@
-393,7
+401,7
@@
jobs:
- name: Package
env:
PUSH_ARTIFACTS_ID: ${{ secrets.PUSH_ARTIFACTS_ID }}
- name: Package
env:
PUSH_ARTIFACTS_ID: ${{ secrets.PUSH_ARTIFACTS_ID }}
- if: env.CMAKE_BUILD_TYPE == 'Release' && !(env.OS_VER == 'ubuntu-18.04' && env.CC_VND == 'gnu' && env.CC_VER == 'new ')
+ if: env.
PUSH_ARTIFACTS_ID != '' && env.
CMAKE_BUILD_TYPE == 'Release' && !(env.OS_VER == 'ubuntu-18.04' && env.CC_VND == 'gnu' && env.CC_VER == 'new ')
run: |
cmake --config ${{ env.CMAKE_BUILD_TYPE }} -S . -B build
cmake --build build --config ${{ env.CMAKE_BUILD_TYPE }} -j2 --target package
run: |
cmake --config ${{ env.CMAKE_BUILD_TYPE }} -S . -B build
cmake --build build --config ${{ env.CMAKE_BUILD_TYPE }} -j2 --target package
@@
-401,8
+409,10
@@
jobs:
cmake --build build --config ${{ env.CMAKE_BUILD_TYPE }} -j2 --target package
cmake --build build --config ${{ env.CMAKE_BUILD_TYPE }} -j2 --target push-artifacts
- name: Notify Gitter
cmake --build build --config ${{ env.CMAKE_BUILD_TYPE }} -j2 --target package
cmake --build build --config ${{ env.CMAKE_BUILD_TYPE }} -j2 --target push-artifacts
- name: Notify Gitter
- if: success() || failure()
- run: bash .github/notify-gitter.sh ${{ secrets.GITTER }} ${{ job.status }}
+ env:
+ GITTER: ${{ secrets.GITTER }}
+ if: (success() || failure()) && env.GITTER != ''
+ run: bash .github/notify-gitter.sh ${{ job.status }}
# linux release builds
release:
# linux release builds
release:
@@
-544,7
+554,7
@@
jobs:
- name: Package
env:
PUSH_ARTIFACTS_ID: ${{ secrets.PUSH_ARTIFACTS_ID }}
- name: Package
env:
PUSH_ARTIFACTS_ID: ${{ secrets.PUSH_ARTIFACTS_ID }}
- if: env.CMAKE_BUILD_TYPE == 'Release' && !(env.OS_VER == 'ubuntu-18.04' && env.CC_VND == 'gnu' && env.CC_VER == 'new ')
+ if: env.
PUSH_ARTIFACTS_ID != '' && env.
CMAKE_BUILD_TYPE == 'Release' && !(env.OS_VER == 'ubuntu-18.04' && env.CC_VND == 'gnu' && env.CC_VER == 'new ')
run: |
cmake --config ${{ env.CMAKE_BUILD_TYPE }} -S . -B build
cmake --build build --config ${{ env.CMAKE_BUILD_TYPE }} -j2 --target package
run: |
cmake --config ${{ env.CMAKE_BUILD_TYPE }} -S . -B build
cmake --build build --config ${{ env.CMAKE_BUILD_TYPE }} -j2 --target package
@@
-552,5
+562,7
@@
jobs:
cmake --build build --config ${{ env.CMAKE_BUILD_TYPE }} -j2 --target package
cmake --build build --config ${{ env.CMAKE_BUILD_TYPE }} -j2 --target push-artifacts
- name: Notify Gitter
cmake --build build --config ${{ env.CMAKE_BUILD_TYPE }} -j2 --target package
cmake --build build --config ${{ env.CMAKE_BUILD_TYPE }} -j2 --target push-artifacts
- name: Notify Gitter
- if: success() || failure()
- run: bash .github/notify-gitter.sh ${{ secrets.GITTER }} ${{ job.status }}
+ env:
+ GITTER: ${{ secrets.GITTER }}
+ if: (success() || failure()) && env.GITTER != ''
+ run: bash .github/notify-gitter.sh ${{ job.status }}