From 2e650c1f5f2f79e7db10dec5dcdd1cffcaf47891 Mon Sep 17 00:00:00 2001
From: Daniel Baumann <daniel.baumann@progress-linux.org>
Date: Tue, 26 Jul 2022 07:11:40 +0200
Subject: Merging upstream version 2.1~rc0 (Closes: #1015722).

Signed-off-by: Daniel Baumann <daniel.baumann@progress-linux.org>
---
 .github/workflows/meson.yml   | 40 +++++++++++++++++++++++++++++++++++++---
 .github/workflows/release.yml | 19 +++++++++++++++++++
 2 files changed, 56 insertions(+), 3 deletions(-)
 create mode 100644 .github/workflows/release.yml

(limited to '.github/workflows')

diff --git a/.github/workflows/meson.yml b/.github/workflows/meson.yml
index 0d6350f..c49470b 100644
--- a/.github/workflows/meson.yml
+++ b/.github/workflows/meson.yml
@@ -9,14 +9,16 @@ on:
   workflow_dispatch:
 
 jobs:
-  meson-build:
+  build-disto:
     runs-on: ubuntu-latest
 
     steps:
       - name: install libraries
         run: sudo apt-get install libjson-c-dev libhugetlbfs-dev
-      - uses: actions/checkout@v2
-      - uses: actions/setup-python@v1
+      - uses: actions/checkout@v3
+      - uses: actions/setup-python@v4
+        with:
+          python-version: '3.x'
       # - name: install python dependencies
       #   run: |
       #     python -m pip install --upgrade pip
@@ -25,3 +27,35 @@ jobs:
         with:
           setup-options: --werror
           action: build
+
+  build-fallback:
+    runs-on: ubuntu-latest
+    steps:
+      - name: install libraries
+        run: sudo apt-get install -y libpam-dev libcap-ng-dev
+      - uses: actions/checkout@v3
+      - uses: actions/setup-python@v4
+        with:
+          python-version: '3.x'
+      - uses: BSFishy/meson-build@v1.0.3
+        with:
+          setup-options: --werror -Duuid:werror=false --wrap-mode=forcefallback
+          options: --verbose
+          action: build
+          meson-version: 0.61.2
+
+  build-static:
+    runs-on: ubuntu-latest
+    steps:
+      - name: install libraries
+        run: sudo apt-get install -y libpam-dev libcap-ng-dev
+      - uses: actions/checkout@v3
+      - uses: actions/setup-python@v4
+        with:
+          python-version: '3.x'
+      - uses: BSFishy/meson-build@v1.0.3
+        with:
+          setup-options: --werror -Duuid:werror=false --wrap-mode=forcefallback --default-library=static
+          options: --verbose
+          action: build
+          meson-version: 0.61.2
diff --git a/.github/workflows/release.yml b/.github/workflows/release.yml
new file mode 100644
index 0000000..db84ef5
--- /dev/null
+++ b/.github/workflows/release.yml
@@ -0,0 +1,19 @@
+name: Releases
+
+on:
+  push:
+    branches: [ master ]
+    tags:
+      - '**'
+
+jobs:
+  build:
+    runs-on: ubuntu-latest
+    if: startsWith(github.ref, 'refs/tags/v')
+    permissions:
+      contents: write
+    steps:
+    - uses: actions/checkout@v2
+    - uses: ncipollo/release-action@v1
+      with:
+        token: ${{ secrets.GITHUB_TOKEN }}
-- 
cgit v1.2.3