From cd7009797f422a1df7e9fc1edf633a1ec6720b13 Mon Sep 17 00:00:00 2001
From: Daniel Baumann <daniel.baumann@progress-linux.org>
Date: Fri, 16 Jun 2023 13:03:24 +0200
Subject: Merging upstream version 2.3~rc1.

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

(limited to '.github/workflows')

diff --git a/.github/workflows/docker-publish.yml b/.github/workflows/docker-publish.yml
index 75f19fd..a702e27 100644
--- a/.github/workflows/docker-publish.yml
+++ b/.github/workflows/docker-publish.yml
@@ -38,7 +38,7 @@ jobs:
       # https://github.com/docker/login-action
       - name: Log into registry ${{ env.REGISTRY }}
         if: github.event_name != 'pull_request'
-        uses: docker/login-action@f4ef78c080cd8ba55a85445d5b36e214a81df20a
+        uses: docker/login-action@465a07811f14bebb1938fbed4728c6a1ff8901fc
         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@507c2f2dc502c992ad446e3d7a5dfbe311567a96
+        uses: docker/metadata-action@2c0bd771b40637d97bf205cbccdd294a32112176
         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@3b5e8027fcad23fda98b2e3ac259d8d67585f671
+        uses: docker/build-push-action@44ea916f6c540f9302d50c2b1e5a8dc071f15cdf
         with:
           context: .
           push: ${{ github.event_name != 'pull_request' }}
diff --git a/.github/workflows/meson-test.yml b/.github/workflows/meson-test.yml
index 2909ffa..7ef26fc 100644
--- a/.github/workflows/meson-test.yml
+++ b/.github/workflows/meson-test.yml
@@ -42,7 +42,7 @@ jobs:
         run: |
           sudo apt-get install --yes --quiet swig libjson-c-dev
           meson subprojects download
-          meson setup .build subprojects/libnvme -Dlibdbus=disabled -Dopenssl=disabled -Dbuildtype=release -Dprefix=/usr -Dpython=true
+          meson setup .build subprojects/libnvme -Dlibdbus=disabled -Dopenssl=disabled -Dbuildtype=release -Dprefix=/usr -Dpython=enabled
           ninja -C .build
           sudo meson install -C .build
 
diff --git a/.github/workflows/pylint.yml b/.github/workflows/pylint.yml
index abd3c1b..fc2bd14 100644
--- a/.github/workflows/pylint.yml
+++ b/.github/workflows/pylint.yml
@@ -64,7 +64,7 @@ jobs:
         run: |
           sudo apt-get install --yes --quiet swig libjson-c-dev || true
           meson subprojects download
-          meson setup builddir subprojects/libnvme -Dlibdbus=disabled -Dopenssl=disabled -Dbuildtype=release -Dprefix=/usr -Dpython=true
+          meson setup builddir subprojects/libnvme -Dlibdbus=disabled -Dopenssl=disabled -Dbuildtype=release -Dprefix=/usr -Dpython=enabled
           ninja -C builddir
           sudo meson install -C builddir
 
-- 
cgit v1.2.3