From a22080c1bcb9989a8cc58c15bb3a7fee2be33cf3 Mon Sep 17 00:00:00 2001
From: Gertjan van den Burg <gertjanvandenburg@gmail.com>
Date: Wed, 16 Dec 2020 01:20:26 +0000
Subject: Merge workflows

---
 .github/workflows/action-v1.yml       |  5 +++++
 .github/workflows/action.yml          |  5 -----
 .github/workflows/validate.yml        | 39 +++++++++++++++++++++++++++++++++++
 .github/workflows/validate_direct.yml | 29 --------------------------
 .github/workflows/validate_docker.yml | 14 -------------
 5 files changed, 44 insertions(+), 48 deletions(-)
 create mode 100644 .github/workflows/action-v1.yml
 delete mode 100644 .github/workflows/action.yml
 create mode 100644 .github/workflows/validate.yml
 delete mode 100644 .github/workflows/validate_direct.yml
 delete mode 100644 .github/workflows/validate_docker.yml

(limited to '.github')

diff --git a/.github/workflows/action-v1.yml b/.github/workflows/action-v1.yml
new file mode 100644
index 0000000..1a63d5c
--- /dev/null
+++ b/.github/workflows/action-v1.yml
@@ -0,0 +1,5 @@
+name: 'TCPD Docker'
+description: 'Runs the TCPD build script in a Docker container'
+runs:
+  using: 'docker'
+  image: '../../Dockerfile'
diff --git a/.github/workflows/action.yml b/.github/workflows/action.yml
deleted file mode 100644
index 1a63d5c..0000000
--- a/.github/workflows/action.yml
+++ /dev/null
@@ -1,5 +0,0 @@
-name: 'TCPD Docker'
-description: 'Runs the TCPD build script in a Docker container'
-runs:
-  using: 'docker'
-  image: '../../Dockerfile'
diff --git a/.github/workflows/validate.yml b/.github/workflows/validate.yml
new file mode 100644
index 0000000..c7be5df
--- /dev/null
+++ b/.github/workflows/validate.yml
@@ -0,0 +1,39 @@
+name: Validate TCPD (direct)
+
+on: push
+
+jobs:
+  tcpd-ubuntu:
+    name: check TCPD
+    runs-on: ubuntu-latest
+
+    steps:
+      - name: Install dependencies
+        run: sudo apt-get update && sudo apt-get install build-essential
+        shell: bash
+
+      - name: Install Python 3.6
+        uses: actions/setup-python@v2
+        with:
+          python-version: '3.6'
+
+      - name: Checkout code
+        uses: actions/checkout@v2
+
+      - name: Ensure clean
+        run: make clean
+        shell: bash
+
+      - name: Build and verify
+        run: make test
+        shell: bash
+
+  tcpd-docker:
+    runs-on: ubuntu-latest
+    name: validate tcpd in docker
+    steps:
+      - name: Checkout
+        uses: actions/checkout@v2
+
+      - name: TCPD docker check
+        uses: ./.github/workflows/
diff --git a/.github/workflows/validate_direct.yml b/.github/workflows/validate_direct.yml
deleted file mode 100644
index cdf25b5..0000000
--- a/.github/workflows/validate_direct.yml
+++ /dev/null
@@ -1,29 +0,0 @@
-name: Validate TCPD (direct)
-
-on: push
-
-jobs:
-  tcpd-ubuntu:
-    name: check TCPD
-    runs-on: ubuntu-latest
-
-    steps:
-      - name: Install dependencies
-        run: sudo apt-get update && sudo apt-get install build-essential
-        shell: bash
-
-      - name: Install Python 3.6
-        uses: actions/setup-python@v2
-        with:
-          python-version: '3.6'
-
-      - name: Checkout code
-        uses: actions/checkout@v2
-
-      - name: Ensure clean
-        run: make clean
-        shell: bash
-
-      - name: Build and verify
-        run: make test
-        shell: bash
diff --git a/.github/workflows/validate_docker.yml b/.github/workflows/validate_docker.yml
deleted file mode 100644
index 7d5fcbb..0000000
--- a/.github/workflows/validate_docker.yml
+++ /dev/null
@@ -1,14 +0,0 @@
-name: Validate TCPD (docker)
-
-on: push
-
-jobs:
-  tcpd-docker:
-    runs-on: ubuntu-latest
-    name: validate tcpd in docker
-    steps:
-      - name: Checkout
-        uses: actions/checkout@v2
-
-      - name: TCPD docker check
-        uses: ./.github/workflows/
-- 
cgit v1.2.3