diff options
| author | Gertjan van den Burg <gertjanvandenburg@gmail.com> | 2020-12-16 01:27:11 +0000 |
|---|---|---|
| committer | Gertjan van den Burg <gertjanvandenburg@gmail.com> | 2020-12-16 01:27:11 +0000 |
| commit | 0bda7985e0bbfc8d14df8befd87e2bbfa4dda6be (patch) | |
| tree | 375da44b8e4cfe7df42b49369a107f5bc5dd10f6 | |
| parent | Merge branch 'feature/gh_actions' (diff) | |
| parent | Merge branch 'master' into feature/gh_actions (diff) | |
| download | TCPD-0bda7985e0bbfc8d14df8befd87e2bbfa4dda6be.tar.gz TCPD-0bda7985e0bbfc8d14df8befd87e2bbfa4dda6be.zip | |
Merge branch 'feature/gh_actions'
| -rw-r--r-- | .github/workflows/action.yml | 5 | ||||
| -rw-r--r-- | .github/workflows/validate.yml | 17 | ||||
| -rw-r--r-- | Dockerfile | 7 |
3 files changed, 25 insertions, 4 deletions
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' diff --git a/.github/workflows/validate.yml b/.github/workflows/validate.yml index d18a3c6..849e89b 100644 --- a/.github/workflows/validate.yml +++ b/.github/workflows/validate.yml @@ -4,7 +4,7 @@ on: push jobs: tcpd-ubuntu: - name: check TCPD + name: check TCPD (direct) runs-on: ubuntu-latest steps: @@ -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 @@ -23,3 +28,13 @@ jobs: run: make test shell: bash + tcpd-docker: + name: check TCPD (docker) + runs-on: ubuntu-latest + + steps: + - name: Checkout + uses: actions/checkout@v2 + + - name: TCPD docker check + uses: ./.github/workflows/ @@ -8,12 +8,13 @@ RUN apt-get update && \ build-essential \ python3 \ python3-dev \ - python3-pip && \ + python3-pip \ + 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 && \ - 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 |