diff options
| author | Gertjan van den Burg <gertjanvandenburg@gmail.com> | 2020-12-16 01:20:26 +0000 |
|---|---|---|
| committer | Gertjan van den Burg <gertjanvandenburg@gmail.com> | 2020-12-16 01:20:26 +0000 |
| commit | a22080c1bcb9989a8cc58c15bb3a7fee2be33cf3 (patch) | |
| tree | ab38428f6b262ca43ffcb77f6e2ca08feb30ce22 /.github | |
| parent | Install wheel package too (diff) | |
| download | TCPD-a22080c1bcb9989a8cc58c15bb3a7fee2be33cf3.tar.gz TCPD-a22080c1bcb9989a8cc58c15bb3a7fee2be33cf3.zip | |
Merge workflows
Diffstat (limited to '.github')
| -rw-r--r-- | .github/workflows/action-v1.yml (renamed from .github/workflows/action.yml) | 0 | ||||
| -rw-r--r-- | .github/workflows/validate.yml (renamed from .github/workflows/validate_direct.yml) | 10 | ||||
| -rw-r--r-- | .github/workflows/validate_docker.yml | 14 |
3 files changed, 10 insertions, 14 deletions
diff --git a/.github/workflows/action.yml b/.github/workflows/action-v1.yml index 1a63d5c..1a63d5c 100644 --- a/.github/workflows/action.yml +++ b/.github/workflows/action-v1.yml diff --git a/.github/workflows/validate_direct.yml b/.github/workflows/validate.yml index cdf25b5..c7be5df 100644 --- a/.github/workflows/validate_direct.yml +++ b/.github/workflows/validate.yml @@ -27,3 +27,13 @@ jobs: - 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_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/ |