Merge pull request #52 from VCTLabs/bionic-cleanup

cleanup ci workflows
VCTLabs · May 11, 2023 · 7fc022a · 7fc022a
2 parents aac2960 + 7bc3d3b
commit 7fc022a
Show file tree

Hide file tree

Showing 5 changed files with 13 additions and 16 deletions.
diff --git a/.github/workflows/choke.yml b/.github/workflows/choke.yml
@@ -20,7 +20,7 @@ jobs:
     strategy:
       fail-fast: false
       matrix:
-        os: [ubuntu-18.04, ubuntu-20.04]
+        os: [ubuntu-22.04, ubuntu-20.04]
 
     steps:
     - uses: actions/checkout@v3

diff --git a/.github/workflows/codeql.yml b/.github/workflows/codeql.yml
@@ -11,7 +11,7 @@ on:
 jobs:
   analyze:
     name: Analyze C++
-    runs-on: ubuntu-18.04
+    runs-on: ubuntu-20.04
 
     strategy:
       fail-fast: false

diff --git a/.github/workflows/conda-dev.yml b/.github/workflows/conda-dev.yml
@@ -14,10 +14,10 @@ jobs:
     strategy:
       fail-fast: false
       matrix:
-        os: ['ubuntu-18.04', 'ubuntu-20.04']
+        os: ['ubuntu-22.04', 'ubuntu-20.04']
         python-version: ['3.7', '3.9']
         include:
-          - os: 'ubuntu-18.04'
+          - os: 'ubuntu-22.04'
             generator: 'Ninja'
             build_type: 'Debug'
           - os: 'ubuntu-20.04'

diff --git a/.github/workflows/env.yml b/.github/workflows/env.yml
@@ -18,7 +18,7 @@ jobs:
     strategy:
       fail-fast: false
       matrix:
-        os: [ubuntu-18.04, ubuntu-20.04]
+        os: [ubuntu-22.04, ubuntu-20.04]
 
     steps:
     - uses: actions/checkout@v3
@@ -54,7 +54,7 @@ jobs:
         sudo apt-get install -y libhiredis-dev redis-server
 
     - name: Backports (bionic)
-      if: matrix.os == 'ubuntu-18.04'
+      if: matrix.os == 'ubuntu-22.04'
       run: |
         sudo apt-get install -y software-properties-common
         sudo add-apt-repository -y -s ppa:nerdboy/embedded
@@ -75,7 +75,7 @@ jobs:
         make cov || true
 
     - name: Configure and build (cmake)
-      if: matrix.os == 'ubuntu-18.04'
+      if: matrix.os == 'ubuntu-22.04'
       run: |
         cmake -S . -B build -DWITH_COVERAGE=1 -DCMAKE_BUILD_TYPE=Debug
         cmake --build build -j 2
@@ -96,7 +96,7 @@ jobs:
         gcovr --config gcovr.cfg -s -b src/.libs/ test/
 
     - name: Test (ctest)
-      if: matrix.os == 'ubuntu-18.04'
+      if: matrix.os == 'ubuntu-22.04'
       env:
         RIPC_SERVER_PATH: "${{ env.TEMP_DIR }}/socket"
       run: |

diff --git a/.github/workflows/smoke.yml b/.github/workflows/smoke.yml
@@ -18,11 +18,11 @@ jobs:
     strategy:
       fail-fast: false
       matrix:
-        os: [ubuntu-18.04, ubuntu-20.04]
+        os: [ubuntu-22.04, ubuntu-20.04]
         include:
           - os: 'ubuntu-20.04'
             test_cmd: 'auto'
-          - os: 'ubuntu-18.04'
+          - os: 'ubuntu-22.04'
             test_cmd: 'bionic'
 
     steps:
@@ -40,11 +40,8 @@ jobs:
     - name: Deps plus PPA/msg bus
       run: |
         sudo apt-get -qq update
-        sudo apt-get install -yqq software-properties-common libhiredis-dev
-        sudo apt-get install -yqq redis-server autoconf automake
-        sudo add-apt-repository -y -s ppa:nerdboy/embedded
-        sudo apt-get -qq update
-        sudo apt-get install -yqq libjson-c-dev libgtest-dev libgmock-dev lcov
+        sudo apt-get install -yqq redis-server autoconf automake lcov
+        sudo apt-get install -yqq libjson-c-dev libhiredis-dev libgtest-dev libgmock-dev
         sudo systemctl stop redis
 
     - name: Add python requirements
@@ -57,7 +54,7 @@ jobs:
         tox -e "${{ matrix.test_cmd }}"
 
     - uses: actions/upload-artifact@v3
-      if: matrix.os == 'ubuntu-18.04'
+      if: matrix.os == 'ubuntu-22.04'
       with:
         name: coverage
         path: ./coverage