Movatterモバイル変換

[0]ホーム
URL:

Skip to content

Navigation Menu

Sign in
Appearance settings

Search code, repositories, users, issues, pull requests...

Provide feedback

We read every piece of feedback, and take your input very seriously.

Saved searches

Use saved searches to filter your results more quickly

 Sign up
Appearance settings

Commit333e3eb

Browse files
committed
Sync build system and CI scripts with ndn-cxx
 * Update build flags * Update waf to version 2.0.21 * Replace Travis CI with GitHub ActionsChange-Id: Ic9331d1d86681e6a4dfbfa6e8286cbba50852dfd
1 parent6df6880 commit333e3eb

File tree

10 files changed

+152
-167
lines changed

10 files changed

+152
-167
lines changed

‎.github/workflows/ci.yml‎

Lines changed: 68 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,68 @@
1+
name:CI
2+
on:
3+
push:
4+
paths-ignore:
5+
-'docs/**'
6+
-'*.md'
7+
-'.mailmap'
8+
workflow_dispatch:
9+
10+
permissions:
11+
contents:read
12+
13+
jobs:
14+
linux:
15+
name:${{ matrix.compiler }} on ${{ matrix.os }}
16+
strategy:
17+
fail-fast:false
18+
matrix:
19+
compiler:[g++-8, g++-9, g++-10, g++-11,
20+
clang++-7, clang++-8, clang++-9, clang++-10, clang++-11, clang++-12]
21+
os:[ubuntu-20.04]
22+
include:
23+
-compiler:g++-7
24+
os:ubuntu-18.04
25+
-compiler:clang++-5.0
26+
os:ubuntu-18.04
27+
-compiler:clang++-6.0
28+
os:ubuntu-18.04
29+
runs-on:${{ matrix.os }}
30+
env:
31+
CXX:${{ matrix.compiler }}
32+
NODE_LABELS:Linux Ubuntu
33+
WAF_JOBS:2
34+
steps:
35+
-name:Install C++ compiler
36+
run:|
37+
sudo apt-get -qy install ${CXX/clang++/clang}
38+
${CXX} --version
39+
-name:Checkout
40+
uses:actions/checkout@v2
41+
-name:Build and test
42+
run:./.jenkins
43+
44+
macos:
45+
name:Xcode ${{ matrix.xcode }} on ${{ matrix.os }}
46+
strategy:
47+
fail-fast:false
48+
matrix:
49+
xcode:['11.3', '11.7', '12.4']
50+
os:[macos-10.15]
51+
include:
52+
-xcode:'12.5'
53+
os:macos-11
54+
-xcode:'13'
55+
os:macos-11
56+
runs-on:${{ matrix.os }}
57+
env:
58+
NODE_LABELS:OSX
59+
WAF_JOBS:3
60+
steps:
61+
-name:Set up Xcode
62+
uses:maxim-lobanov/setup-xcode@v1
63+
with:
64+
xcode-version:${{ matrix.xcode }}
65+
-name:Checkout
66+
uses:actions/checkout@v2
67+
-name:Build and test
68+
run:./.jenkins

‎.gitignore‎

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -26,4 +26,4 @@ __pycache__/
2626
*.py[cod]
2727

2828
# Other
29-
/VERSION
29+
/VERSION.info

‎.jenkins‎

Lines changed: 7 additions & 13 deletions
Original file line numberDiff line numberDiff line change
@@ -2,31 +2,25 @@
22
set -e
33
source .jenkins.d/util.sh
44

5+
if has Linux$NODE_LABELS;then
6+
export PATH="${HOME}/.local/bin${PATH:+:}${PATH}"
7+
fi
58
export CACHE_DIR=${CACHE_DIR:-/tmp}
69
export WAF_JOBS=${WAF_JOBS:-1}
710
[[$JOB_NAME==*"code-coverage" ]]&&export DISABLE_ASAN=yes
811

9-
nanos() {
10-
# Cannot use date(1) because macOS does not support %N format specifier
11-
python3 -c'import time; print(int(time.time() * 1e9))'
12-
}
13-
1412
forfilein .jenkins.d/*;do
1513
[[-f$file&&-x$file ]]||continue
1614

17-
if [[-n$TRAVIS ]];then
15+
if [[-n$GITHUB_ACTIONS ]];then
1816
label=$(basename"$file"| sed -E's/[[:digit:]]+-(.*)\..*/\1/')
19-
echo -ne"travis_fold:start:${label}\r"
20-
echo -ne"travis_time:start:${label}\r"
21-
start=$(nanos)
17+
echo"::group::${label}"
2218
fi
2319

2420
echo"\$$file"
2521
"$file"
2622

27-
if [[-n$TRAVIS ]];then
28-
finish=$(nanos)
29-
echo -ne"travis_time:end:${label}:start=${start},finish=${finish},duration=$((finish-start)),event=${label}\r"
30-
echo -ne"travis_fold:end:${label}\r"
23+
if [[-n$GITHUB_ACTIONS ]];then
24+
echo"::endgroup::"
3125
fi
3226
done

‎.jenkins.d/00-deps.sh‎

Lines changed: 20 additions & 5 deletions
Original file line numberDiff line numberDiff line change
@@ -3,13 +3,13 @@ set -ex
33

44
if has OSX$NODE_LABELS;then
55
FORMULAE=(boost openssl pkg-config)
6-
ifhas OSX-10.13$NODE_LABELS|| has OSX-10.14$NODE_LABELS;then
7-
FORMULAE+=(python)
6+
if[[$JOB_NAME==*"Docs" ]];then
7+
FORMULAE+=(doxygen graphviz)
88
fi
99

10-
if [[-n$TRAVIS ]];then
11-
#Travis images come with a large number of pre-installed
12-
#brew packages, don't waste time upgrading all of them
10+
if [[-n$GITHUB_ACTIONS ]];then
11+
#GitHub Actions runners have a large number of pre-installed
12+
#Homebrew packages. Don't waste time upgrading all of them.
1313
brew list --versions"${FORMULAE[@]}"|| brew update
1414
forFORMULAin"${FORMULAE[@]}";do
1515
brew list --versions"$FORMULA"|| brew install"$FORMULA"
@@ -23,8 +23,23 @@ if has OSX $NODE_LABELS; then
2323
brew cleanup
2424
fi
2525

26+
if [[$JOB_NAME==*"Docs" ]];then
27+
pip3 install --upgrade --upgrade-strategy=eager sphinx sphinxcontrib-doxylink
28+
fi
29+
2630
elif has Ubuntu$NODE_LABELS;then
2731
sudo apt-get -qq update
2832
sudo apt-get -qy install build-essential pkg-config python3-minimal \
2933
libboost-all-dev libssl-dev libsqlite3-dev
34+
35+
case$JOB_NAMEin
36+
*code-coverage)
37+
sudo apt-get -qy install lcov python3-pip
38+
pip3 install --user --upgrade --upgrade-strategy=eager'gcovr~=5.0'
39+
;;
40+
*Docs)
41+
sudo apt-get -qy install doxygen graphviz python3-pip
42+
pip3 install --user --upgrade --upgrade-strategy=eager sphinx sphinxcontrib-doxylink
43+
;;
44+
esac
3045
fi

‎.jenkins.d/20-tests.sh‎

Lines changed: 0 additions & 5 deletions
Original file line numberDiff line numberDiff line change
@@ -3,11 +3,6 @@ set -ex
33

44
# Prepare environment
55
rm -rf~/.ndn
6-
7-
if has OSX$NODE_LABELS;then
8-
security unlock-keychain -p named-data
9-
fi
10-
116
ndnsec key-gen"/tmp/jenkins/$NODE_NAME"| ndnsec cert-install -
127

138
# https://github.com/google/sanitizers/wiki/AddressSanitizerFlags

‎.travis.yml‎

Lines changed: 0 additions & 98 deletions
This file was deleted.

0 commit comments

Comments
 (0)
[8]ページ先頭
©2009-2025 Movatter.jp