Skip to content
New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

fix ci #83

Merged
merged 1 commit into from
Oct 15, 2020
Merged
Show file tree
Hide file tree
Changes from all commits
Commits
File filter

Filter by extension

Filter by extension


Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
6 changes: 3 additions & 3 deletions .github/workflows/build-pr.yml
Original file line number Diff line number Diff line change
Expand Up @@ -16,11 +16,11 @@ jobs:
with:
go-version: '1.15.3'
- name: run unit tests
run: make test
run: sudo pip install virtualenv && make test
- name: build binary
run: make build_linux
run: make build_linux link_linux
- name: run acceptance tests
run: sudo pip install virtualenv && make acceptance
run: make acceptance
- name: upload coverage report
uses: actions/upload-artifact@master
with:
Expand Down
6 changes: 3 additions & 3 deletions .github/workflows/build.yml
Original file line number Diff line number Diff line change
Expand Up @@ -15,11 +15,11 @@ jobs:
with:
go-version: '1.15.3'
- name: run unit tests
run: make test
run: sudo pip install virtualenv && make test
- name: build binary
run: make build_linux
run: make build_linux link_linux
- name: run acceptance tests
run: sudo pip install virtualenv && make acceptance
run: make acceptance
- name: upload coverage report
uses: actions/upload-artifact@master
with:
Expand Down
11 changes: 7 additions & 4 deletions acceptance_tests/lib/common.py
Original file line number Diff line number Diff line change
Expand Up @@ -43,8 +43,11 @@ def run_command(self, command, detach=False):
stdout=subprocess.PIPE,
stderr=subprocess.STDOUT)
if not detach:
stdout = process.communicate()[0].strip()
print(stdout)
stdout = process.communicate()[0].strip().decode()
self.rc = process.returncode
# Remove debug lines that start with "+ "
self.stdout = '\n'.join(filter(lambda x: not x.startswith('+ '), stdout.split('\n')))
tmp = []
for x in stdout.split('\n'):
print(x)
if not x.startswith('+ '): # Remove debug lines that start with "+ "
tmp.append(x)
self.stdout = '\n'.join(tmp)
2 changes: 1 addition & 1 deletion scripts/acceptance.sh
Original file line number Diff line number Diff line change
Expand Up @@ -22,7 +22,7 @@ export TEST_V3_XDG_CONFIG_HOME="$PWD/.helm3/xdg/config"
export TEST_V3_XDG_DATA_HOME="$PWD/.helm3/xdg/data"

if [ ! -d .venv/ ]; then
virtualenv -p $(which python2.7) .venv/
virtualenv -p $(which python3) .venv/
.venv/bin/python .venv/bin/pip install $PY_REQUIRES
fi

Expand Down