-
Notifications
You must be signed in to change notification settings - Fork 244
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
Making cross compile independent of gox vender package #2047
Making cross compile independent of gox vender package #2047
Conversation
You can make this cleaner by doing it in a shell script and calling it here I think |
I prefer this over the change i made. But unfortunately the syntax fix took longer time without success. If anybody fix the error please comment cc_ @mohammedzee1000 @kadel |
Makefile
Outdated
@@ -79,10 +79,27 @@ goget-tools: | |||
test-coverage: | |||
./scripts/generate-coverage.sh | |||
|
|||
# compile for linux platform |
There was a problem hiding this comment.
Choose a reason for hiding this comment
The reason will be displayed to describe this comment to others. Learn more.
Maybe set GOOS before doing it :
env GOOS=linux go build -blah
There was a problem hiding this comment.
Choose a reason for hiding this comment
The reason will be displayed to describe this comment to others. Learn more.
@mohammedzee1000 Something like ?
.PHONY: darwin-amd64
darwin-amd64:
GOARCH=amd64 GOOS=darwin go build $(BUILD_FLAGS) -o dist/bin/darwin-amd64/odo ./cmd/odo/
There was a problem hiding this comment.
Choose a reason for hiding this comment
The reason will be displayed to describe this comment to others. Learn more.
yes
Makefile
Outdated
gox -osarch="darwin/amd64 linux/amd64 windows/amd64" -output="dist/bin/{{.OS}}-{{.Arch}}/odo" $(BUILD_FLAGS) ./cmd/odo/ | ||
@for platform in linux darwin windows ; do \ | ||
if [ $$platform == "windows" ]; then \ | ||
echo "Cross compiling $$platform-amd64 and placing binary at dist/bin/$$platform-amd64/"; \ |
There was a problem hiding this comment.
Choose a reason for hiding this comment
The reason will be displayed to describe this comment to others. Learn more.
You can put the echo before if as its common
There was a problem hiding this comment.
Choose a reason for hiding this comment
The reason will be displayed to describe this comment to others. Learn more.
Could not get it. Can you please explain it
There was a problem hiding this comment.
Choose a reason for hiding this comment
The reason will be displayed to describe this comment to others. Learn more.
Got it, thanks
Will update it
There was a problem hiding this comment.
Choose a reason for hiding this comment
The reason will be displayed to describe this comment to others. Learn more.
Done
Finally able to fix the syntax error. |
Please remove gox from makefile and from other places if it is mentioned somewhere |
There was a problem hiding this comment.
Choose a reason for hiding this comment
The reason will be displayed to describe this comment to others. Learn more.
Looking good
/approve
[APPROVALNOTIFIER] This PR is APPROVED This pull-request has been approved by: mohammedzee1000 The full list of commands accepted by this bot can be found here. The pull request process is described here
Needs approval from an approver in each of these files:
Approvers can indicate their approval by writing |
It works, although as stated by @kadel remove remaining references |
3c0786a
to
0792b90
Compare
Done
|
/test integration |
/refresh |
• Failure [156.587 seconds]
odoJavaE2e
/go/src/github.com/openshift/odo/tests/integration/java_test.go:13
odo component creation
/go/src/github.com/openshift/odo/tests/integration/java_test.go:41
Should be able to deploy a spring boot uberjar file using openjdk [It]
/go/src/github.com/openshift/odo/tests/integration/java_test.go:94
Failed after 90 retries. Content in http://uberjaropenjdk-app-phppkfrfmn.apps.ci-op-dr740dig-f09f4.origin-ci-int-aws.dev.rhcloud.com doesn't include 'HTTP Booster'.
/go/src/github.com/openshift/odo/tests/helper/helper_http.go:41
------------------------------
Summarizing 1 Failure:
[Fail] odoJavaE2e odo component creation [It] Should be able to deploy a spring boot uberjar file using openjdk
/go/src/github.com/openshift/odo/tests/helper/helper_http.go:41
Ran 4 of 97 Specs in 315.104 seconds
FAIL! -- 3 Passed | 1 Failed | 0 Pending | 93 Skipped
Something up with springboot |
/retest |
/test integration |
/lgtm |
/retest |
- Lists all URLs even if they are undeployed or not (redhat-developer#2034) - Added json output for `odo project delete -o json` (redhat-developer#2037) - Fixed service integration test that was previously failing (redhat-developer#2022) - `odo push` will now only push changed files (redhat-developer#2030) - We now use relative paths within the file indexer (redhat-developer#2003) - You can now create list and edit services using --app and --project (redhat-developer#2001) - Deleted files will now propagate to the OpenShift container (redhat-developer#1999) - Added `odo service create --context` functionality (redhat-developer#1997) - Making cross-compile independant of gox vendor package (redhat-developer#2047) - `odo-supervisord-image` has been renamed to `odo-init-image` (redhat-developer#2027) - Releases now use .tar.gz (redhat-developer#2009) - If there is an error creating a service, it will fail quicker (redhat-developer#2008) - We now have a Google Group! (redhat-developer#2007) - Added documentation on how to manage environment variables(redhat-developer#2026) - Badges added to the README (redhat-developer#2060) - Updated documentation on uninstallation (redhat-developer#2053) - Added documentation for default parameters (redhat-developer#2038) - Minor update to help output (redhat-developer#2006) - Updated documentation regarding bootstrapper image (redhat-developer#1991)
- Lists all URLs even if they are undeployed or not (#2034) - Added json output for `odo project delete -o json` (#2037) - Fixed service integration test that was previously failing (#2022) - `odo push` will now only push changed files (#2030) - We now use relative paths within the file indexer (#2003) - You can now create list and edit services using --app and --project (#2001) - Deleted files will now propagate to the OpenShift container (#1999) - Added `odo service create --context` functionality (#1997) - Making cross-compile independant of gox vendor package (#2047) - `odo-supervisord-image` has been renamed to `odo-init-image` (#2027) - Releases now use .tar.gz (#2009) - If there is an error creating a service, it will fail quicker (#2008) - We now have a Google Group! (#2007) - Added documentation on how to manage environment variables(#2026) - Badges added to the README (#2060) - Updated documentation on uninstallation (#2053) - Added documentation for default parameters (#2038) - Minor update to help output (#2006) - Updated documentation regarding bootstrapper image (#1991)
What is the purpose of this change? What does it change?
Was the change discussed in an issue?
#1998 (comment)
How to test changes?
make cross