diff options
| author | Devaev Maxim <[email protected]> | 2020-05-11 06:08:03 +0300 |
|---|---|---|
| committer | Devaev Maxim <[email protected]> | 2020-05-11 06:08:03 +0300 |
| commit | 4109f1c8e4b6bff0de68e9d2cddaeaab215f756b (patch) | |
| tree | 350f554be2dca7c1f88b2ca5b1464bb86dfd4046 | |
| parent | 2e28ad2ee40eb0a6114fc1d6be917edea6710bd7 (diff) | |
workflow fix
| -rw-r--r-- | .github/workflows/dockerimage.yml | 26 | ||||
| -rw-r--r-- | Makefile | 2 |
2 files changed, 14 insertions, 14 deletions
diff --git a/.github/workflows/dockerimage.yml b/.github/workflows/dockerimage.yml index afe4a011..b23de9c6 100644 --- a/.github/workflows/dockerimage.yml +++ b/.github/workflows/dockerimage.yml @@ -1,20 +1,20 @@ -name: Docker Image CI +name: CI on: - push: - branches: [ master ] - pull_request: - branches: [ master ] + push: + branches: [master] + pull_request: + branches: [master] jobs: + build: + runs-on: ubuntu-latest - build: + steps: + - uses: actions/checkout@v2 - runs-on: ubuntu-latest + - name: Building testenv ... + run: make testenv - steps: - - uses: actions/checkout@v2 - - name: Build testenv - run: make testenv - - name: Toxing - run: make tox + - name: Running tests ... + run: make tox @@ -54,7 +54,7 @@ tox: testenv --volume `pwd`/extras:/usr/share/kvmd/extras:ro \ --volume `pwd`/configs:/usr/share/kvmd/configs.default:ro \ --volume `pwd`/contrib/keymaps:/usr/share/kvmd/keymaps:ro \ - -it $(TESTENV_IMAGE) bash -c " \ + -t $(TESTENV_IMAGE) bash -c " \ cp /usr/share/kvmd/configs.default/kvmd/*.yaml /etc/kvmd \ && cp /usr/share/kvmd/configs.default/kvmd/*passwd /etc/kvmd \ && cp /usr/share/kvmd/configs.default/kvmd/main/$(if $(P),$(P),$(DEFAULT_PLATFORM)).yaml /etc/kvmd/main.yaml \ |