From c941a87118b8e1686b77d5837d59aa1cb479f4c9 Mon Sep 17 00:00:00 2001 From: Gertjan van den Burg Date: Wed, 16 Dec 2020 00:15:20 +0000 Subject: Install python --- .github/workflows/validate.yml | 5 +++++ 1 file changed, 5 insertions(+) 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 Date: Wed, 16 Dec 2020 00:19:32 +0000 Subject: Add docker check --- .github/workflows/validate.yml | 3 +++ 1 file changed, 3 insertions(+) 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 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(-) 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 Date: Wed, 16 Dec 2020 00:42:36 +0000 Subject: Split docker action in separate file --- .github/workflows/validate.yml | 34 ---------------------------------- .github/workflows/validate_direct.yml | 29 +++++++++++++++++++++++++++++ .github/workflows/validate_docker.yml | 5 +++++ 3 files changed, 34 insertions(+), 34 deletions(-) delete mode 100644 .github/workflows/validate.yml create mode 100644 .github/workflows/validate_direct.yml create mode 100644 .github/workflows/validate_docker.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' diff --git a/.github/workflows/validate_direct.yml b/.github/workflows/validate_direct.yml new file mode 100644 index 0000000..cdf25b5 --- /dev/null +++ b/.github/workflows/validate_direct.yml @@ -0,0 +1,29 @@ +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 new file mode 100644 index 0000000..e645469 --- /dev/null +++ b/.github/workflows/validate_docker.yml @@ -0,0 +1,5 @@ +name: Validate TCPD (docker) + +runs: + using: 'docker' + image: 'Dockerfile' -- cgit v1.2.3 From 3b44746b9cda64821dbba6f842fc04d62d2c0207 Mon Sep 17 00:00:00 2001 From: Gertjan van den Burg Date: Wed, 16 Dec 2020 00:44:37 +0000 Subject: add trigger for docker action --- .github/workflows/validate_docker.yml | 2 ++ 1 file changed, 2 insertions(+) diff --git a/.github/workflows/validate_docker.yml b/.github/workflows/validate_docker.yml index e645469..98a4c5c 100644 --- a/.github/workflows/validate_docker.yml +++ b/.github/workflows/validate_docker.yml @@ -1,5 +1,7 @@ name: Validate TCPD (docker) +on: push + runs: using: 'docker' image: 'Dockerfile' -- cgit v1.2.3 From 84bb18cc20f5760187aaa58c7a8881306eed2ace Mon Sep 17 00:00:00 2001 From: Gertjan van den Burg Date: Wed, 16 Dec 2020 00:52:13 +0000 Subject: Create an action for docker image and use that --- .github/workflows/action.yml | 5 +++++ .github/workflows/validate_docker.yml | 13 ++++++++++--- 2 files changed, 15 insertions(+), 3 deletions(-) create mode 100644 .github/workflows/action.yml diff --git a/.github/workflows/action.yml b/.github/workflows/action.yml new file mode 100644 index 0000000..eb68aea --- /dev/null +++ b/.github/workflows/action.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/validate_docker.yml b/.github/workflows/validate_docker.yml index 98a4c5c..d6314a7 100644 --- a/.github/workflows/validate_docker.yml +++ b/.github/workflows/validate_docker.yml @@ -2,6 +2,13 @@ name: Validate TCPD (docker) on: push -runs: - using: 'docker' - image: 'Dockerfile' +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 From f5091ff79dac0b082b342263f773c53d46a843f7 Mon Sep 17 00:00:00 2001 From: Gertjan van den Burg Date: Wed, 16 Dec 2020 00:54:27 +0000 Subject: specify action name --- .github/workflows/validate_docker.yml | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/.github/workflows/validate_docker.yml b/.github/workflows/validate_docker.yml index d6314a7..c36e176 100644 --- a/.github/workflows/validate_docker.yml +++ b/.github/workflows/validate_docker.yml @@ -11,4 +11,4 @@ jobs: uses: actions/checkout@v2 - name: TCPD docker check - uses: .github/workflows/ + uses: .github/workflows/action -- cgit v1.2.3 From ecdfb94ad6d8e3bba6bc2f630aec7e2cc51ec341 Mon Sep 17 00:00:00 2001 From: Gertjan van den Burg Date: Wed, 16 Dec 2020 00:56:50 +0000 Subject: try to fix parsing error --- .github/workflows/validate_docker.yml | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/.github/workflows/validate_docker.yml b/.github/workflows/validate_docker.yml index c36e176..167d04b 100644 --- a/.github/workflows/validate_docker.yml +++ b/.github/workflows/validate_docker.yml @@ -11,4 +11,4 @@ jobs: uses: actions/checkout@v2 - name: TCPD docker check - uses: .github/workflows/action + uses: ./.github/workflows/action -- cgit v1.2.3 From 5d43bcb77eb75698598502f16434502ca34c6a00 Mon Sep 17 00:00:00 2001 From: Gertjan van den Burg Date: Wed, 16 Dec 2020 00:59:32 +0000 Subject: next attempt --- .github/workflows/validate_docker.yml | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/.github/workflows/validate_docker.yml b/.github/workflows/validate_docker.yml index 167d04b..7d5fcbb 100644 --- a/.github/workflows/validate_docker.yml +++ b/.github/workflows/validate_docker.yml @@ -11,4 +11,4 @@ jobs: uses: actions/checkout@v2 - name: TCPD docker check - uses: ./.github/workflows/action + uses: ./.github/workflows/ -- cgit v1.2.3 From 2b37067a6a6baecbc08e620312d5ead34872bb6d Mon Sep 17 00:00:00 2001 From: Gertjan van den Burg Date: Wed, 16 Dec 2020 01:02:31 +0000 Subject: fix dockerfile path --- .github/workflows/action.yml | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/.github/workflows/action.yml b/.github/workflows/action.yml index eb68aea..1a63d5c 100644 --- a/.github/workflows/action.yml +++ b/.github/workflows/action.yml @@ -2,4 +2,4 @@ name: 'TCPD Docker' description: 'Runs the TCPD build script in a Docker container' runs: using: 'docker' - image: 'Dockerfile' + image: '../../Dockerfile' -- cgit v1.2.3 From 73a435f70a7f5df20dff5eaa93df4a6880b12d4c Mon Sep 17 00:00:00 2001 From: Gertjan van den Burg Date: Wed, 16 Dec 2020 01:06:12 +0000 Subject: Install venv instead of virtualenv in docker --- Dockerfile | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/Dockerfile b/Dockerfile index b242e8c..4febb1c 100644 --- a/Dockerfile +++ b/Dockerfile @@ -9,11 +9,11 @@ RUN apt-get update && \ python3 \ python3-dev \ python3-pip && \ + python3-venv && \ echo "alias python='python3'" >> /root/.bash_aliases && \ echo "alias pip='pip3'" >> /root/.bash_aliases && \ cd /usr/local/bin && ln -s /usr/bin/python3 python && \ - cd /usr/local/bin && ln -s /usr/bin/pip3 pip && \ - pip install virtualenv + cd /usr/local/bin && ln -s /usr/bin/pip3 pip # Make bash the default shell RUN mv /bin/sh /bin/sh.old && cp /bin/bash /bin/sh -- cgit v1.2.3 From c6f2a39423a82bf08115c2c80581d722822ac524 Mon Sep 17 00:00:00 2001 From: Gertjan van den Burg Date: Wed, 16 Dec 2020 01:10:04 +0000 Subject: fix dockerfile --- Dockerfile | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/Dockerfile b/Dockerfile index 4febb1c..9f9a2d6 100644 --- a/Dockerfile +++ b/Dockerfile @@ -8,7 +8,7 @@ RUN apt-get update && \ build-essential \ python3 \ python3-dev \ - python3-pip && \ + python3-pip \ python3-venv && \ echo "alias python='python3'" >> /root/.bash_aliases && \ echo "alias pip='pip3'" >> /root/.bash_aliases && \ -- cgit v1.2.3 From 1ce2cd13d49157f7f8a178de592bfc6d9afafc84 Mon Sep 17 00:00:00 2001 From: Gertjan van den Burg Date: Wed, 16 Dec 2020 01:13:23 +0000 Subject: Install wheel package too --- Dockerfile | 3 ++- 1 file changed, 2 insertions(+), 1 deletion(-) diff --git a/Dockerfile b/Dockerfile index 9f9a2d6..974e402 100644 --- a/Dockerfile +++ b/Dockerfile @@ -9,7 +9,8 @@ RUN apt-get update && \ python3 \ python3-dev \ python3-pip \ - python3-venv && \ + python3-venv \ + python3-wheel && \ echo "alias python='python3'" >> /root/.bash_aliases && \ echo "alias pip='pip3'" >> /root/.bash_aliases && \ cd /usr/local/bin && ln -s /usr/bin/python3 python && \ -- cgit v1.2.3 From a22080c1bcb9989a8cc58c15bb3a7fee2be33cf3 Mon Sep 17 00:00:00 2001 From: Gertjan van den Burg 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 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 From 56606b5a0ceb4e7be83f856e5faeaf5967f3382f Mon Sep 17 00:00:00 2001 From: Gertjan van den Burg Date: Wed, 16 Dec 2020 01:21:38 +0000 Subject: rename back to action.yml --- .github/workflows/action-v1.yml | 5 ----- .github/workflows/action.yml | 5 +++++ 2 files changed, 5 insertions(+), 5 deletions(-) delete mode 100644 .github/workflows/action-v1.yml create mode 100644 .github/workflows/action.yml diff --git a/.github/workflows/action-v1.yml b/.github/workflows/action-v1.yml deleted file mode 100644 index 1a63d5c..0000000 --- a/.github/workflows/action-v1.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/action.yml b/.github/workflows/action.yml new file mode 100644 index 0000000..1a63d5c --- /dev/null +++ b/.github/workflows/action.yml @@ -0,0 +1,5 @@ +name: 'TCPD Docker' +description: 'Runs the TCPD build script in a Docker container' +runs: + using: 'docker' + image: '../../Dockerfile' -- cgit v1.2.3 From 81c4fe61596d318719fd5015d6760606c9284e7d Mon Sep 17 00:00:00 2001 From: Gertjan van den Burg 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(-) 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