From fb01ab16d4ca027f1bfa22e82aad81cc20b79e0a Mon Sep 17 00:00:00 2001 From: Jamie Snape Date: Fri, 6 Jan 2023 21:57:21 -0500 Subject: [PATCH] Update CI scripts --- .circleci/config.yml | 21 ++++++++++------- .github/workflows/ci.yml | 51 +++++++++++++++++++++++++++++++++++----- Brewfile | 1 + 3 files changed, 58 insertions(+), 15 deletions(-) diff --git a/.circleci/config.yml b/.circleci/config.yml index 1530c4b..d4d6e8f 100644 --- a/.circleci/config.yml +++ b/.circleci/config.yml @@ -37,7 +37,7 @@ version: 2.1 jobs: ubuntu: machine: - image: ubuntu-2004:202201-02 + image: ubuntu-2204:2022.10.2 resource_class: arm.medium steps: - run: @@ -51,17 +51,18 @@ jobs: git \ gnupg \ make \ - pkgconf \ + pkg-config \ wget wget -qO- https://apt.kitware.com/keys/kitware-archive-latest.asc 2>/dev/null \ | gpg --dearmor - \ | sudo tee /usr/share/keyrings/kitware-archive-keyring.gpg >/dev/null - echo 'deb [arch=amd64 signed-by=/usr/share/keyrings/kitware-archive-keyring.gpg] https://apt.kitware.com/ubuntu/ focal main' \ + echo 'deb [arch=arm64 signed-by=/usr/share/keyrings/kitware-archive-keyring.gpg] https://apt.kitware.com/ubuntu/ jammy main' \ | sudo tee /etc/apt/sources.list.d/kitware.list >/dev/null sudo apt-get -qq -o APT::Acquire::Retries=4 update \ || (sleep 15; apt-get -qq -o APT::Acquire::Retries=4 update) sudo apt-get -qq -o APT::Acquire::Retries=4 -o Dpkg::Use-Pty=0 --no-install-recommends install \ cmake + sudo apt-get -qq -o Dpkg::Use-Pty=0 autoremove sudo rm -rf /var/lib/apt/lists/* environment: DEBIAN_FRONTEND: noninteractive @@ -70,8 +71,8 @@ jobs: name: build test command: | mkdir _build - cd _build cmake \ + -B _build \ -DBUILD_DOCUMENTATION:BOOL=OFF \ -DBUILD_TESTING:BOOL=ON \ -DCMAKE_INSTALL_PREFIX:PATH=install \ @@ -81,11 +82,13 @@ jobs: -DOUTPUT_TIME_AND_POSITIONS:BOOL=OFF \ -DSEED_RANDOM_NUMBER_GENERATOR:BOOL=OFF \ -DWARNINGS_AS_ERRORS:BOOL=ON \ - --warn-uninitialized \ - .. - cmake --build . - ctest -E Roadmap --repeat after-timeout:3 . - cmake --install . + -S . \ + --warn-uninitialized + cmake --build _build + ctest -E Roadmap --output-junit out.xml --test-dir _build --repeat after-timeout:3 . + cmake --install _build + - store_test_results: + path: _build/out.xml workflows: version: 2 diff --git a/.github/workflows/ci.yml b/.github/workflows/ci.yml index 8116c4a..228ba73 100644 --- a/.github/workflows/ci.yml +++ b/.github/workflows/ci.yml @@ -77,9 +77,26 @@ jobs: uses: actions/checkout@v3 - name: setup run: | - rm -f /usr/local/bin/*3.11* - brew update -q + rm -f \ + /usr/local/bin/2to3 \ + /usr/local/bin/2to3-3.* \ + /usr/local/bin/idle3 \ + /usr/local/bin/idle3.* \ + /usr/local/bin/pydoc3 \ + /usr/local/bin/pydoc3.* \ + /usr/local/bin/python3 \ + /usr/local/bin/python3.* \ + /usr/local/bin/python3-config \ + /usr/local/bin/python3.*-config + brew update-reset -q + brew upgrade -q brew bundle install -q --no-lock + brew cleanup -q + rm -rf $(brew --cache) + env: + HOMEBREW_NO_ANALYTICS: 1 + HOMEBREW_NO_AUTO_UPDATE: 1 + HOMEBREW_NO_INSTALL_CLEANUP: 1 shell: zsh -efuo pipefail {0} - name: build test package run: bazel test --flaky_test_attempts=3 ... @@ -94,6 +111,8 @@ jobs: run: | apt-get -qq -o APT::Acquire::Retries=4 update \ || (sleep 15; apt-get -qq -o APT::Acquire::Retries=4 update) + apt-get -qq -o APT::Acquire::Retries=4 -o Dpkg::Use-Pty=0 \ + upgrade apt-get -qq -o APT::Acquire::Retries=4 -o Dpkg::Use-Pty=0 \ --no-install-recommends install \ ca-certificates \ @@ -111,6 +130,7 @@ jobs: apt-get -qq -o APT::Acquire::Retries=4 -o Dpkg::Use-Pty=0 \ --no-install-recommends install \ bazel + apt-get -qq -o Dpkg::Use-Pty=0 autoremove rm -rf /var/lib/apt/lists/* env: DEBIAN_FRONTEND: noninteractive @@ -128,7 +148,8 @@ jobs: steps: - name: setup run: | - apk add --no-cache \ + apk upgrade -q --no-cache + apk add -q --no-cache \ ca-certificates \ cmake \ doxygen \ @@ -216,6 +237,7 @@ jobs: - name: setup run: | dnf makecache -q --refresh || (sleep 15; dnf makecache -q --refresh) + dnf upgrade -q -y dnf install -q -y \ ca-certificates \ cmake \ @@ -263,9 +285,22 @@ jobs: uses: actions/checkout@v3 - name: setup run: | - rm -f /usr/local/bin/*3.11* - brew update -q + rm -f \ + /usr/local/bin/2to3 \ + /usr/local/bin/2to3-3.* \ + /usr/local/bin/idle3 \ + /usr/local/bin/idle3.* \ + /usr/local/bin/pydoc3 \ + /usr/local/bin/pydoc3.* \ + /usr/local/bin/python3 \ + /usr/local/bin/python3.* \ + /usr/local/bin/python3-config \ + /usr/local/bin/python3.*-config + brew update-reset -q + brew upgrade -q brew bundle install -q --no-lock + brew cleanup -q + rm -rf $(brew --cache) env: HOMEBREW_NO_ANALYTICS: 1 HOMEBREW_NO_AUTO_UPDATE: 1 @@ -302,6 +337,7 @@ jobs: - name: setup run: | dnf makecache -q --refresh || (sleep 15; dnf makecache -q --refresh) + dnf upgrade -q -y dnf install -q -y \ ca-certificates \ cmake \ @@ -352,6 +388,8 @@ jobs: run: | apt-get -qq -o APT::Acquire::Retries=4 update \ || (sleep 15; apt-get -qq -o APT::Acquire::Retries=4 update) + apt-get -qq -o APT::Acquire::Retries=4 -o Dpkg::Use-Pty=0 \ + upgrade apt-get -qq -o APT::Acquire::Retries=4 -o Dpkg::Use-Pty=0 \ --no-install-recommends install \ ca-certificates \ @@ -365,7 +403,7 @@ jobs: gnupg \ graphviz \ make \ - pkgconf \ + pkg-config \ wget wget -qO- https://apt.kitware.com/keys/kitware-archive-latest.asc 2>/dev/null \ | gpg --dearmor - > /usr/share/keyrings/kitware-archive-keyring.gpg @@ -375,6 +413,7 @@ jobs: || (sleep 15; apt-get -qq -o APT::Acquire::Retries=4 update) apt-get -qq -o Dpkg::Use-Pty=0 --no-install-recommends --no-install-recommends install \ cmake + apt-get -qq -o Dpkg::Use-Pty=0 autoremove rm -rf /var/lib/apt/lists/* env: DEBIAN_FRONTEND: noninteractive diff --git a/Brewfile b/Brewfile index 3c353a7..b202ccf 100644 --- a/Brewfile +++ b/Brewfile @@ -41,6 +41,7 @@ brew 'cppcheck' brew 'cpplint' brew 'doxygen' brew 'gcc' +brew 'git' brew 'graphviz' brew 'include-what-you-use' brew 'jsonlint'