From 9ff0583b33259b965bd11f3bc228cd2a30e7c814 Mon Sep 17 00:00:00 2001
From: Peter Oschwald <oschwaldp@objectcomputing.com>
Date: Fri, 21 Jul 2023 09:51:56 -0500
Subject: [PATCH 1/2] Ubuntu documents apt-get install or dpkg -i as acceptable
 paths for .deb installs.

Use apt-get instead of apt.
---
 .github/workflows/build.yaml | 7 ++++---
 1 file changed, 4 insertions(+), 3 deletions(-)

diff --git a/.github/workflows/build.yaml b/.github/workflows/build.yaml
index 286d3de481..037bff97c4 100644
--- a/.github/workflows/build.yaml
+++ b/.github/workflows/build.yaml
@@ -91,8 +91,8 @@ jobs:
           cpack
       - name: Install dev package
         run: |
-          apt update && apt upgrade -y
-          apt install -y ./build/leap_*.deb ./build/leap-dev*.deb
+          apt-get update
+          apt-get install -y ./build/leap_*.deb ./build/leap-dev*.deb
       - name: Test using TestHarness
         run: |
           python3 -c "from TestHarness import Cluster"
@@ -255,7 +255,8 @@ jobs:
           token: ${{github.token}}
       - name: Install cdt Packages
         run: |
-          apt install -y ./*.deb
+          apt-get update
+          apt-get install -y ./*.deb
           rm ./*.deb
 
       # Reference Contracts

From be358ce3d5b0f1f222e3063e32e27c7dcd24e8b8 Mon Sep 17 00:00:00 2001
From: Peter Oschwald <oschwaldp@objectcomputing.com>
Date: Fri, 21 Jul 2023 11:32:24 -0500
Subject: [PATCH 2/2] Add upgrade step back in.

Factor out update and upgrade into own step in libtester-tests job to simplify.
---
 .github/workflows/build.yaml | 9 ++++++---
 1 file changed, 6 insertions(+), 3 deletions(-)

diff --git a/.github/workflows/build.yaml b/.github/workflows/build.yaml
index 037bff97c4..8275dea347 100644
--- a/.github/workflows/build.yaml
+++ b/.github/workflows/build.yaml
@@ -91,7 +91,7 @@ jobs:
           cpack
       - name: Install dev package
         run: |
-          apt-get update
+          apt-get update && apt-get upgrade -y
           apt-get install -y ./build/leap_*.deb ./build/leap-dev*.deb
       - name: Test using TestHarness
         run: |
@@ -200,6 +200,11 @@ jobs:
     runs-on:  ["self-hosted", "enf-x86-midtier"]
     container: ${{ matrix.test != 'deb-install' && fromJSON(needs.build-base.outputs.p)[matrix.platform].image || matrix.platform == 'ubuntu20' && 'ubuntu:focal' || 'ubuntu:jammy' }}
     steps:
+      - name: Update Package Index & Upgrade Packages
+        run: |
+          apt-get update
+          apt-get upgrade -y
+
       # LEAP
       - if: ${{ matrix.test != 'deb-install' }}
         name: Clone leap
@@ -236,7 +241,6 @@ jobs:
       - if: ${{ matrix.test == 'deb-install' }}
         name: Install leap-dev Package
         run: |
-          apt-get update
           export DEBIAN_FRONTEND='noninteractive'
           export TZ='Etc/UTC'
           apt-get install -y ./*.deb
@@ -255,7 +259,6 @@ jobs:
           token: ${{github.token}}
       - name: Install cdt Packages
         run: |
-          apt-get update
           apt-get install -y ./*.deb
           rm ./*.deb