diff --git a/.github/workflows/ci.yml b/.github/workflows/ci.yml index b551e45..a9f36bb 100644 --- a/.github/workflows/ci.yml +++ b/.github/workflows/ci.yml @@ -1,65 +1,12 @@ name: CI on: push: - paths-ignore: - - 'docs/**' - - '*.md' - - '.mailmap' workflow_dispatch: -permissions: - contents: read +permissions: {} jobs: - linux: - name: ${{ matrix.compiler }} on ${{ matrix.os }} - runs-on: ${{ matrix.os }} - strategy: - fail-fast: false - matrix: - os: [ubuntu-20.04] - compiler: [g++-7, g++-8, g++-9, g++-10, - clang++-7, clang++-8, clang++-9, clang++-10, clang++-11, clang++-12] - include: - - os: ubuntu-22.04 - compiler: g++-11 - - os: ubuntu-22.04 - compiler: g++-12 - - os: ubuntu-22.04 - compiler: clang++-13 - - os: ubuntu-22.04 - compiler: clang++-14 - env: - CXX: ${{ matrix.compiler }} - steps: - - name: Install C++ compiler - run: | - sudo apt-get -qy install ${CXX/clang++/clang} - ${CXX} --version - - name: Checkout - uses: actions/checkout@v3 - - name: Build and test - run: ./.jenkins - - macos: - name: Xcode ${{ matrix.xcode }} on ${{ matrix.os }} - runs-on: ${{ matrix.os }} - strategy: - fail-fast: false - matrix: - os: [macos-11] - xcode: ['12.4', '12.5', '13.2'] - include: - - os: macos-12 - xcode: '13.4' - - os: macos-12 - xcode: '14.1' - steps: - - name: Set up Xcode - uses: maxim-lobanov/setup-xcode@v1 - with: - xcode-version: ${{ matrix.xcode }} - - name: Checkout - uses: actions/checkout@v3 - - name: Build and test - run: ./.jenkins + Ubuntu: + uses: named-data/actions/.github/workflows/jenkins-script-ubuntu.yml@v1 + macOS: + uses: named-data/actions/.github/workflows/jenkins-script-macos.yml@v1 diff --git a/.jenkins.d/00-deps.sh b/.jenkins.d/00-deps.sh index a677d91..299b052 100755 --- a/.jenkins.d/00-deps.sh +++ b/.jenkins.d/00-deps.sh @@ -20,7 +20,7 @@ set -x if [[ $ID == macos ]]; then if [[ -n $GITHUB_ACTIONS ]]; then - export HOMEBREW_NO_INSTALL_UPGRADE=1 + export HOMEBREW_NO_INSTALLED_DEPENDENTS_CHECK=1 fi brew update brew install --formula "${FORMULAE[@]}" diff --git a/README.md b/README.md index 6112e61..3b77b9b 100644 --- a/README.md +++ b/README.md @@ -13,8 +13,8 @@ to configure various parameters. Compiling and running ndn-traffic-generator requires the following dependencies: -1. [ndn-cxx and its dependencies](https://named-data.net/doc/ndn-cxx/current/INSTALL.html) -2. [NDN Forwarding Daemon (NFD)](https://named-data.net/doc/NFD/current/INSTALL.html) +1. [ndn-cxx and its dependencies](https://docs.named-data.net/ndn-cxx/current/INSTALL.html) +2. [NDN Forwarding Daemon (NFD)](https://docs.named-data.net/NFD/current/INSTALL.html) ## Compilation & Installation @@ -75,3 +75,8 @@ Start the traffic client: ```shell ndn-traffic-client ndn-traffic-client.conf ``` + +## License + +ndn-traffic-generator is free software distributed under the GNU General Public License version 3. +See [`COPYING.md`](COPYING.md) for details.