From 1d99999755eeded53f0cd6e910551cacf1e362c6 Mon Sep 17 00:00:00 2001 From: Joseph Angelo Date: Fri, 24 Feb 2023 16:12:55 -0800 Subject: [PATCH 1/5] Install the leap seconds header --- CMakeLists.txt | 1 + 1 file changed, 1 insertion(+) diff --git a/CMakeLists.txt b/CMakeLists.txt index 7f9f133..726fbb5 100644 --- a/CMakeLists.txt +++ b/CMakeLists.txt @@ -61,6 +61,7 @@ set(HDRS include/swiftnav/gnss_capabilities.h include/swiftnav/gnss_time.h include/swiftnav/ionosphere.h + include/swiftnav/leap_seconds.h include/swiftnav/linear_algebra.h include/swiftnav/logging.h include/swiftnav/macro_overload.h From 78b1b0787b5e25443f4be0a2565d659ffece428b Mon Sep 17 00:00:00 2001 From: Jason Mobarak Date: Mon, 24 Jul 2023 13:10:38 -0700 Subject: [PATCH 2/5] trigger build From 8f262516f4fc2400e5495d19929b48bce28c0493 Mon Sep 17 00:00:00 2001 From: Jason Mobarak Date: Mon, 24 Jul 2023 13:21:33 -0700 Subject: [PATCH 3/5] bump swift build --- Dockerfile | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/Dockerfile b/Dockerfile index b4c207e..94c9edc 100644 --- a/Dockerfile +++ b/Dockerfile @@ -1,5 +1,5 @@ # Base image is created by https://github.com/swift-nav/docker-recipes -FROM 571934480752.dkr.ecr.us-west-2.amazonaws.com/swift-build:2021-04-15 +FROM 571934480752.dkr.ecr.us-west-2.amazonaws.com/swift-build:2023-05-24 # Add anything that's specific to this repo's build environment here. COPY tools/requirements.txt /tmp/libswiftnav_requirements.txt From fd3ced44358d134e7a738dc83e9e19ddd5629c89 Mon Sep 17 00:00:00 2001 From: Jason Mobarak Date: Mon, 24 Jul 2023 13:32:58 -0700 Subject: [PATCH 4/5] ci fixes from internal repo --- .github/workflows/ci.yaml | 84 ++++++++++++++++++++------------------- Dockerfile | 2 +- 2 files changed, 44 insertions(+), 42 deletions(-) diff --git a/.github/workflows/ci.yaml b/.github/workflows/ci.yaml index 567d62d..29dca2a 100644 --- a/.github/workflows/ci.yaml +++ b/.github/workflows/ci.yaml @@ -14,9 +14,23 @@ on: jobs: ubuntu-codecov: - runs-on: ubuntu-18.04 + runs-on: ubuntu-latest + container: ubuntu:18.04 + steps: + - name: Setup container + run: | + apt-get update + apt-get install -y gpg wget curl software-properties-common unzip + add-apt-repository -y ppa:git-core/ppa + wget -O - https://apt.kitware.com/keys/kitware-archive-latest.asc 2>/dev/null | gpg --dearmor - \ + | tee /usr/share/keyrings/kitware-archive-keyring.gpg >/dev/null + echo 'deb [signed-by=/usr/share/keyrings/kitware-archive-keyring.gpg] https://apt.kitware.com/ubuntu/ bionic-rc main' \ + | tee -a /etc/apt/sources.list.d/kitware.list >/dev/null + apt-get update + apt-get install -y git cmake build-essential clang llvm + - name: Checkout source uses: actions/checkout@v2 with: @@ -24,10 +38,6 @@ jobs: submodules: recursive ssh-key: ${{ secrets.SSH_KEY }} - - name: Install llvm-cov - run: | - sudo apt-get update && sudo apt-get install llvm -y - - name: Run build env: CC: clang @@ -36,8 +46,8 @@ jobs: GITHUB_TOKEN: ${{ secrets.GITHUB_TOKEN }} SONAR_TOKEN: ${{ secrets.SONAR_TOKEN }} SONAR_ORGANIZATION: swift-nav - SONAR_PROJECT_KEY: swift-nav_libswiftnav - SONAR_PROJECT_NAME: libswiftnav + SONAR_PROJECT_KEY: swift-nav_libswiftnav-private + SONAR_PROJECT_NAME: libswiftnav-private SONAR_HOST_URL: https://sonarcloud.io SONAR_SCANNER_VERSION: 4.2.0.1873 @@ -102,49 +112,41 @@ jobs: strategy: matrix: include: - - {os: ubuntu-18.04, cc: "gcc-6", cxx: "g++-6", test_suite: "unit"} - - {os: ubuntu-18.04, cc: "clang-6.0", cxx: "clang++-6.0", test_suite: "lint"} - - {os: ubuntu-18.04, cc: "gcc-11", cxx: "g++-11", test_suite: "unit"} - - {os: macos-10.15, cc: "clang", cxx: "clang++", test_suite: "unit"} - - runs-on: ${{ matrix.os }} + - {cc: "gcc-6", cxx: "g++-6", test_suite: "unit", + package: "gcc-6 g++-6", runs_on: "ubuntu-latest", container: "ubuntu:18.04"} + - {cc: "clang-6.0", cxx: "clang++-6.0", test_suite: "lint", + package: "clang-6.0 libc++-dev libc++abi-dev clang-format-6.0 clang-tidy-6.0", + runs_on: "ubuntu-latest", container: "ubuntu:18.04"} + - {cc: "gcc-11", cxx: "g++-11", test_suite: "unit", + package: "gcc-11 g++-11", runs_on: "ubuntu-latest", container: "ubuntu:18.04"} + - {cc: "clang", cxx: "clang++", test_suite: "unit", + runs_on: "macos-11", container: ~} + + runs-on: ${{ matrix.runs_on }} + container: ${{ matrix.container }} steps: + - name: Setup container + if: matrix.container == 'ubuntu:18.04' + run: | + apt-get update + apt-get install -y gpg wget curl software-properties-common zip + add-apt-repository ppa:ubuntu-toolchain-r/test -y + add-apt-repository -y ppa:git-core/ppa + wget -O - https://apt.kitware.com/keys/kitware-archive-latest.asc 2>/dev/null \ + | gpg --dearmor - | tee /usr/share/keyrings/kitware-archive-keyring.gpg >/dev/null + echo 'deb [signed-by=/usr/share/keyrings/kitware-archive-keyring.gpg] https://apt.kitware.com/ubuntu/ bionic-rc main' \ + | tee -a /etc/apt/sources.list.d/kitware.list >/dev/null + apt-get update + apt-get install -y libeigen3-dev libserialport-dev git cmake build-essential ${{ matrix.package }} + - name: Checkout source uses: actions/checkout@v2 with: submodules: recursive ssh-key: ${{ secrets.SSH_KEY }} - - name: Add base packages and toolchain repository (Linux) - if: matrix.os == 'ubuntu-18.04' - run: | - sudo apt-get update - sudo apt-get install build-essential software-properties-common -y - sudo add-apt-repository ppa:ubuntu-toolchain-r/test -y - sudo apt-get update - - - name: Install gcc-6 (Linux) - if: matrix.os == 'ubuntu-18.04' && matrix.cc == 'gcc-6' - run: | - sudo apt-get install -y gcc-6 g++-6 - - - name: Install gcc-11 (Linux) - if: matrix.os == 'ubuntu-18.04' && matrix.cc == 'gcc-11' - run: | - sudo apt-get install -y gcc-11 g++-11 - - - name: Install clang-6.0 (Linux) - if: matrix.os == 'ubuntu-18.04' && matrix.cc == 'clang-6.0' - run: | - sudo apt-get install -y clang-6.0 libc++-dev libc++abi-dev - - - name: Install clang-{format,tidy} (Linux) - if: matrix.os == 'ubuntu-18.04' && matrix.cc == 'clang-6.0' && matrix.test_suite == 'lint' - run: | - sudo apt-get install -y clang-format-6.0 clang-tidy-6.0 - - name: Run build env: CC: ${{ matrix.cc }} diff --git a/Dockerfile b/Dockerfile index 94c9edc..0ab9022 100644 --- a/Dockerfile +++ b/Dockerfile @@ -1,5 +1,5 @@ # Base image is created by https://github.com/swift-nav/docker-recipes -FROM 571934480752.dkr.ecr.us-west-2.amazonaws.com/swift-build:2023-05-24 +FROM 571934480752.dkr.ecr.us-west-2.amazonaws.com/swift-build:2023-04-24 # Add anything that's specific to this repo's build environment here. COPY tools/requirements.txt /tmp/libswiftnav_requirements.txt From 5caa7864577147d0033dbdab4ceb2b8308fe3457 Mon Sep 17 00:00:00 2001 From: Jason Mobarak Date: Mon, 24 Jul 2023 13:48:29 -0700 Subject: [PATCH 5/5] debug --- ci-build.sh | 2 ++ 1 file changed, 2 insertions(+) diff --git a/ci-build.sh b/ci-build.sh index dacf432..1b8bd9b 100644 --- a/ci-build.sh +++ b/ci-build.sh @@ -93,6 +93,8 @@ function build_codecov() { -Dsonar.cfamily.cache.enabled=false \ -Dsonar.sourceEncoding=UTF-8" + set -x + # shellcheck disable=SC2086 sonar-scanner \ "-Dsonar.cfamily.llvm-cov.reportPath=./build/ccov/coverage.txt" \