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.

Sign up for GitHub

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

Jump to bottom

fix: script call for linux #1610

Merged
merged 1 commit into from
Jul 24, 2020
Merged

fix: script call for linux #1610

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
1 commit
Select commit
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Jump to
Jump to file
Failed to load files.
Diff view
Diff view
2 changes: 1 addition & 1 deletion .travis.yml
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -10,7 +10,7 @@ os:
- osx

go:
- "1.13"
- 1.13.x
Copy link
Member Author

@camilamacedo86 camilamacedo86 Jul 24, 2020 •
edited

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

To run the script on Mac OS X we need 1.13.4 or greater


git:
depth: 3
Expand Down
2 changes: 1 addition & 1 deletion scripts/setup_envtest_bins.sh
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -31,7 +31,7 @@ ARCH=$(uname -m | sed 's/x86_64/amd64/')
ETCD_EXT="tar.gz"
TESTBIN_DIR=testbin

function setup_testenv_bin() {
setup_testenv_bin() {
# Do nothing if the $TESTBIN_DIR directory exist already.
if [ ! -d $TESTBIN_DIR ]; then
mkdir -p $TESTBIN_DIR
Expand Down
3 changes: 3 additions & 0 deletions test.sh
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -152,4 +152,7 @@ GO111MODULE=on test_project project-v3 3-alpha
GO111MODULE=on test_project project-v3-multigroup 3-alpha
GO111MODULE=on test_project project-v3-addon 3-alpha

# test script that setup envtest
./scripts/setup_envtest_bins.sh v1.18.2 v3.4.3
Copy link

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

I'm struggling to understand why we are installing the envtest binaries right before exiting the test.

Copy link
Member Author

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

It just for we ensure that the scripts are working in both platform.
The idea is to remove it in the follow-up #1600 where they will be called for each testadata sample via the makefile target instead.


exit $rc