workflow fix

This commit is contained in:
Devaev Maxim 2020-05-11 06:08:03 +03:00
parent 2e28ad2ee4
commit 4109f1c8e4
2 changed files with 14 additions and 14 deletions

View File

@ -1,20 +1,20 @@
name: Docker Image CI name: CI
on: on:
push: push:
branches: [ master ] branches: [master]
pull_request: pull_request:
branches: [ master ] branches: [master]
jobs: jobs:
build:
runs-on: ubuntu-latest
build: steps:
- uses: actions/checkout@v2
runs-on: ubuntu-latest - name: Building testenv ...
run: make testenv
steps: - name: Running tests ...
- uses: actions/checkout@v2 run: make tox
- name: Build testenv
run: make testenv
- name: Toxing
run: make tox

View File

@ -54,7 +54,7 @@ tox: testenv
--volume `pwd`/extras:/usr/share/kvmd/extras:ro \ --volume `pwd`/extras:/usr/share/kvmd/extras:ro \
--volume `pwd`/configs:/usr/share/kvmd/configs.default:ro \ --volume `pwd`/configs:/usr/share/kvmd/configs.default:ro \
--volume `pwd`/contrib/keymaps:/usr/share/kvmd/keymaps: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/*.yaml /etc/kvmd \
&& cp /usr/share/kvmd/configs.default/kvmd/*passwd /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 \ && cp /usr/share/kvmd/configs.default/kvmd/main/$(if $(P),$(P),$(DEFAULT_PLATFORM)).yaml /etc/kvmd/main.yaml \