From 30b778de4192b1985b253364d9e4882137b6954d Mon Sep 17 00:00:00 2001
From: Daniel Baumann <daniel.baumann@progress-linux.org>
Date: Mon, 25 Sep 2023 10:22:11 +0200
Subject: Merging upstream version 2.3.

Signed-off-by: Daniel Baumann <daniel.baumann@progress-linux.org>
---
 .github/workflows/docker-publish.yml | 8 ++++----
 .github/workflows/docker-test.yml    | 6 ++++--
 .github/workflows/meson-test.yml     | 3 ++-
 .github/workflows/pylint.yml         | 7 ++++---
 4 files changed, 14 insertions(+), 10 deletions(-)

(limited to '.github/workflows')

diff --git a/.github/workflows/docker-publish.yml b/.github/workflows/docker-publish.yml
index a94e7b3..3e183c0 100644
--- a/.github/workflows/docker-publish.yml
+++ b/.github/workflows/docker-publish.yml
@@ -32,13 +32,13 @@ jobs:
 
     steps:
       - name: Checkout repository
-        uses: actions/checkout@v3
+        uses: actions/checkout@v4
 
       # Login against a Docker registry except on PR
       # https://github.com/docker/login-action
       - name: Log into registry ${{ env.REGISTRY }}
         if: github.event_name != 'pull_request'
-        uses: docker/login-action@465a07811f14bebb1938fbed4728c6a1ff8901fc
+        uses: docker/login-action@343f7c4344506bcbf9b4de18042ae17996df046d
         with:
           registry: ${{ env.REGISTRY }}
           username: ${{ github.actor }}
@@ -48,14 +48,14 @@ jobs:
       # https://github.com/docker/metadata-action
       - name: Extract Docker metadata
         id: meta
-        uses: docker/metadata-action@818d4b7b91585d195f67373fd9cb0332e31a7175
+        uses: docker/metadata-action@96383f45573cb7f253c731d3b3ab81c87ef81934
         with:
           images: ${{ env.REGISTRY }}/${{ env.IMAGE_NAME }}
 
       # Build and push Docker image with Buildx (don't push on PR)
       # https://github.com/docker/build-push-action
       - name: Build and push Docker image
-        uses: docker/build-push-action@2eb1c1961a95fc15694676618e422e8ba1d63825
+        uses: docker/build-push-action@0565240e2d4ab88bba5387d719585280857ece09
         with:
           context: .
           push: ${{ github.event_name != 'pull_request' }}
diff --git a/.github/workflows/docker-test.yml b/.github/workflows/docker-test.yml
index 92284c0..42a871c 100644
--- a/.github/workflows/docker-test.yml
+++ b/.github/workflows/docker-test.yml
@@ -13,11 +13,13 @@ jobs:
     if: ${{ !github.event.act }} # skip during local actions testing
     runs-on: ubuntu-latest
     steps:
-      - uses: actions/checkout@v3
+      - uses: actions/checkout@v4
 
       - name: Install requirements
         # make sure nvme-cli installed (we need it for /etc/nvme/hostnqn and /etc/nvme/hostid)
-        run: sudo apt-get install --yes --quiet nvme-cli
+        run: |
+          sudo apt update
+          sudo apt-get install --yes --quiet nvme-cli
 
       - name: Load Kernel drivers
         run: sudo modprobe -v nvme-fabrics
diff --git a/.github/workflows/meson-test.yml b/.github/workflows/meson-test.yml
index eff6df1..4b9662d 100644
--- a/.github/workflows/meson-test.yml
+++ b/.github/workflows/meson-test.yml
@@ -13,10 +13,11 @@ jobs:
     runs-on: ubuntu-latest
     steps:
       - name: "CHECKOUT: nvme-stas"
-        uses: actions/checkout@v3
+        uses: actions/checkout@v4
 
       - name: "INSTALL: Overall dependencies"
         run: |
+          sudo apt update
           sudo apt-get install --yes --quiet python3-pip cmake iproute2
           sudo python3 -m pip install --upgrade pip
           sudo python3 -m pip install --upgrade wheel meson ninja
diff --git a/.github/workflows/pylint.yml b/.github/workflows/pylint.yml
index cd200f9..9af1819 100644
--- a/.github/workflows/pylint.yml
+++ b/.github/workflows/pylint.yml
@@ -14,7 +14,7 @@ jobs:
     if: ${{ !github.event.act }} # skip during local actions testing
     runs-on: ubuntu-20.04
     steps:
-      - uses: actions/checkout@v3
+      - uses: actions/checkout@v4
       - uses: hadolint/hadolint-action@v3.1.0
         with:
           recursive: true
@@ -30,7 +30,7 @@ jobs:
 
     steps:
       - name: "CHECKOUT: nvme-stas"
-        uses: actions/checkout@v3
+        uses: actions/checkout@v4
 
       - name: Set up Python ${{ matrix.python-version }}
         uses: actions/setup-python@v4
@@ -39,6 +39,7 @@ jobs:
 
       - name: "INSTALL: additional packages"
         run: |
+          sudo apt update
           sudo apt-get install --yes --quiet python3-pip cmake libgirepository1.0-dev libsystemd-dev python3-systemd swig libjson-c-dev || true
           sudo python3 -m pip install --upgrade pip wheel meson ninja
           python3 -m pip install --upgrade dasbus pylint pyflakes PyGObject lxml pyudev
@@ -77,7 +78,7 @@ jobs:
     runs-on: ubuntu-latest
     steps:
       - name: "CHECKOUT: nvme-stas"
-        uses: actions/checkout@v3
+        uses: actions/checkout@v4
 
       - name: "BLACK"
         uses: psf/black@stable
-- 
cgit v1.2.3