From c941a87118b8e1686b77d5837d59aa1cb479f4c9 Mon Sep 17 00:00:00 2001
From: Gertjan van den Burg <gertjanvandenburg@gmail.com>
Date: Wed, 16 Dec 2020 00:15:20 +0000
Subject: Install python

---
 .github/workflows/validate.yml | 5 +++++
 1 file changed, 5 insertions(+)

(limited to '.github/workflows/validate.yml')

diff --git a/.github/workflows/validate.yml b/.github/workflows/validate.yml
index d18a3c6..4bec4c8 100644
--- a/.github/workflows/validate.yml
+++ b/.github/workflows/validate.yml
@@ -12,6 +12,11 @@ jobs:
         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
 
-- 
cgit v1.2.3


From c39efa3cd3174976aaaf39f9d2cb537570b3337f Mon Sep 17 00:00:00 2001
From: Gertjan van den Burg <gertjanvandenburg@gmail.com>
Date: Wed, 16 Dec 2020 00:19:32 +0000
Subject: Add docker check

---
 .github/workflows/validate.yml | 3 +++
 1 file changed, 3 insertions(+)

(limited to '.github/workflows/validate.yml')

diff --git a/.github/workflows/validate.yml b/.github/workflows/validate.yml
index 4bec4c8..c423810 100644
--- a/.github/workflows/validate.yml
+++ b/.github/workflows/validate.yml
@@ -28,3 +28,6 @@ jobs:
         run: make test
         shell: bash
 
+  tcpd-docker:
+    - uses: 'docker'
+      image: 'Dockerfile'
-- 
cgit v1.2.3


From f6e4ba5ad5e31a6d52a868e7ff6f2019d9283ec7 Mon Sep 17 00:00:00 2001
From: Gertjan van den Burg <gertjanvandenburg@gmail.com>
Date: Wed, 16 Dec 2020 00:24:42 +0000
Subject: fix workflow script

---
 .github/workflows/validate.yml | 3 ++-
 1 file changed, 2 insertions(+), 1 deletion(-)

(limited to '.github/workflows/validate.yml')

diff --git a/.github/workflows/validate.yml b/.github/workflows/validate.yml
index c423810..d35e682 100644
--- a/.github/workflows/validate.yml
+++ b/.github/workflows/validate.yml
@@ -29,5 +29,6 @@ jobs:
         shell: bash
 
   tcpd-docker:
-    - uses: 'docker'
+    runs:
+      using: 'docker'
       image: 'Dockerfile'
-- 
cgit v1.2.3


From b4800f730b129df9fe439d4b7185570863ae4452 Mon Sep 17 00:00:00 2001
From: Gertjan van den Burg <gertjanvandenburg@gmail.com>
Date: Wed, 16 Dec 2020 00:42:36 +0000
Subject: Split docker action in separate file

---
 .github/workflows/validate.yml | 34 ----------------------------------
 1 file changed, 34 deletions(-)
 delete mode 100644 .github/workflows/validate.yml

(limited to '.github/workflows/validate.yml')

diff --git a/.github/workflows/validate.yml b/.github/workflows/validate.yml
deleted file mode 100644
index d35e682..0000000
--- a/.github/workflows/validate.yml
+++ /dev/null
@@ -1,34 +0,0 @@
-name: Validate TCPD
-
-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:
-      using: 'docker'
-      image: 'Dockerfile'
-- 
cgit v1.2.3


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/validate.yml | 39 +++++++++++++++++++++++++++++++++++++++
 1 file changed, 39 insertions(+)
 create mode 100644 .github/workflows/validate.yml

(limited to '.github/workflows/validate.yml')

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/
-- 
cgit v1.2.3


From 81c4fe61596d318719fd5015d6760606c9284e7d Mon Sep 17 00:00:00 2001
From: Gertjan van den Burg <gertjanvandenburg@gmail.com>
Date: Wed, 16 Dec 2020 01:24:57 +0000
Subject: clean up naming

---
 .github/workflows/validate.yml | 7 ++++---
 1 file changed, 4 insertions(+), 3 deletions(-)

(limited to '.github/workflows/validate.yml')

diff --git a/.github/workflows/validate.yml b/.github/workflows/validate.yml
index c7be5df..849e89b 100644
--- a/.github/workflows/validate.yml
+++ b/.github/workflows/validate.yml
@@ -1,10 +1,10 @@
-name: Validate TCPD (direct)
+name: Validate TCPD
 
 on: push
 
 jobs:
   tcpd-ubuntu:
-    name: check TCPD
+    name: check TCPD (direct)
     runs-on: ubuntu-latest
 
     steps:
@@ -29,8 +29,9 @@ jobs:
         shell: bash
 
   tcpd-docker:
+    name: check TCPD (docker)
     runs-on: ubuntu-latest
-    name: validate tcpd in docker
+
     steps:
       - name: Checkout
         uses: actions/checkout@v2
-- 
cgit v1.2.3