Skip to content

Commit

Permalink
ci: add macOS 11 Big Sur
Browse files Browse the repository at this point in the history
Remove all traces of Travis CI

Change-Id: I1839ae96e41678f722cba052a56ae7c54255defd
  • Loading branch information
Pesa committed Sep 27, 2021
1 parent 94dfcf1 commit 83f8d16
Show file tree
Hide file tree
Showing 6 changed files with 16 additions and 144 deletions.
8 changes: 6 additions & 2 deletions .github/workflows/ci.yml
Original file line number Diff line number Diff line change
Expand Up @@ -5,7 +5,6 @@ on:
- 'docs/**'
- '*.md'
- '.mailmap'
- '.travis.yml'
workflow_dispatch:

permissions:
Expand Down Expand Up @@ -49,9 +48,14 @@ jobs:
matrix:
xcode: ['11.3', '11.7', '12.4']
os: [macos-10.15]
include:
- xcode: '12.5'
os: macos-11
- xcode: '13'
os: macos-11
runs-on: ${{ matrix.os }}
env:
NODE_LABELS: OSX OSX-10.15
NODE_LABELS: OSX
WAF_JOBS: 3
steps:
- name: Set up Xcode
Expand Down
8 changes: 4 additions & 4 deletions .github/workflows/docs.yml
Original file line number Diff line number Diff line change
Expand Up @@ -2,8 +2,8 @@ name: Docs
on:
push:
paths-ignore:
- '*.md'
- '.mailmap'
- '.travis.yml'
workflow_dispatch:

permissions:
Expand All @@ -14,7 +14,7 @@ jobs:
strategy:
fail-fast: false
matrix:
os: [macos-10.15, ubuntu-20.04]
os: [macos-11, ubuntu-20.04]
runs-on: ${{ matrix.os }}
env:
JOB_NAME: Docs
Expand All @@ -25,8 +25,8 @@ jobs:
- name: Install dependencies
run: |
case ${RUNNER_OS} in
Linux) export NODE_LABELS="Linux Ubuntu Ubuntu-20.04" ;;
macOS) export NODE_LABELS="OSX OSX-10.15" ;;
Linux) export NODE_LABELS="Linux Ubuntu" ;;
macOS) export NODE_LABELS="OSX" ;;
esac
find .jenkins.d/ -type f -name '[1-9]*.sh' -exec chmod -x '{}' +
./.jenkins
Expand Down
17 changes: 2 additions & 15 deletions .jenkins
Original file line number Diff line number Diff line change
Expand Up @@ -3,37 +3,24 @@ set -e
source .jenkins.d/util.sh

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

nanos() {
# Cannot use date(1) because macOS does not support %N format specifier
python3 -c 'import time; print(int(time.time() * 1e9))'
}

for file in .jenkins.d/*; do
[[ -f $file && -x $file ]] || continue

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

echo "\$ $file"
"$file"

if [[ -n $GITHUB_ACTIONS ]]; then
echo "::endgroup::"
elif [[ -n $TRAVIS ]]; then
finish=$(nanos)
echo -ne "travis_time:end:${label}:start=${start},finish=${finish},duration=$((finish-start)),event=${label}\r"
echo -ne "travis_fold:end:${label}\r"
fi
done
9 changes: 3 additions & 6 deletions .jenkins.d/00-deps.sh
Original file line number Diff line number Diff line change
Expand Up @@ -3,16 +3,13 @@ set -ex

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

if [[ -n $GITHUB_ACTIONS || -n $TRAVIS ]]; then
# GitHub Actions and Travis images come with a large number of
# pre-installed packages. Don't waste time upgrading all of them.
if [[ -n $GITHUB_ACTIONS ]]; then
# GitHub Actions runners have a large number of pre-installed
# Homebrew packages. Don't waste time upgrading all of them.
brew list --versions "${FORMULAE[@]}" || brew update
for FORMULA in "${FORMULAE[@]}"; do
brew list --versions "$FORMULA" || brew install "$FORMULA"
Expand Down
116 changes: 0 additions & 116 deletions .travis.yml

This file was deleted.

2 changes: 1 addition & 1 deletion docs/INSTALL.rst
Original file line number Diff line number Diff line change
Expand Up @@ -11,6 +11,7 @@ following platforms:
- Ubuntu 20.04 (amd64)
- Ubuntu 21.04 (amd64)
- macOS 10.15
- macOS 11 (Intel only)
- CentOS 8

ndn-cxx is known to work on the following platforms, although they are not officially
Expand All @@ -24,7 +25,6 @@ supported:
- FreeBSD >= 11.3
- macOS 10.13
- macOS 10.14
- macOS 11 (Intel only)

Prerequisites
-------------
Expand Down

0 comments on commit 83f8d16

Please sign in to comment.