Skip to content
This repository has been archived by the owner on Jul 18, 2019. It is now read-only.

Commit

Permalink
Must use make build in spec file to build ginkgo
Browse files Browse the repository at this point in the history
The OS_OUTPUT_GOPATH value is only set by the makefile, and an RPM build
environment won't have it set otherwise. This resulted in the RPM build
failing because the GOPATH didn't match the repo.

Include a requires against openssl-devel to support use of packaged
versions of golang that don't take the dependency properly.
  • Loading branch information
smarterclayton committed Jul 12, 2018
1 parent dab335c commit 5d7adfd
Show file tree
Hide file tree
Showing 2 changed files with 8 additions and 4 deletions.
4 changes: 4 additions & 0 deletions Makefile
Expand Up @@ -62,6 +62,10 @@ build-router-e2e-test:
hack/build-go.sh test/end-to-end/end-to-end.test
.PHONY: build-router-e2e-test

build-docs:
hack/generate-docs.sh
.PHONY: build-docs

# Run core verification and all self contained tests.
#
# Example:
Expand Down
8 changes: 4 additions & 4 deletions origin.spec
Expand Up @@ -13,7 +13,7 @@
# this is the version we obsolete up to. The packaging changed for Origin
# 1.0.6 and OSE 3.1 such that 'openshift' package names were no longer used.
%global package_refactor_version 3.0.2.900
%global golang_version 1.9.1
%global golang_version 1.10
# %commit and %os_git_vars are intended to be set by tito custom builders provided
# in the .tito/lib directory. The values in this spec file will not be kept up to date.
%{!?commit:
Expand Down Expand Up @@ -229,7 +229,7 @@ of docker. Exclude those versions of docker.
%if 0%{make_redistributable}
# Create Binaries for all supported arches
%{os_git_vars} OS_BUILD_RELEASE_ARCHIVES=n make build-cross
%{os_git_vars} hack/build-go.sh vendor/github.com/onsi/ginkgo/ginkgo
%{os_git_vars} OS_BUILD_RELEASE_ARCHIVES=n make build WHAT=vendor/github.com/onsi/ginkgo/ginkgo
%else
# Create Binaries only for building arch
%ifarch x86_64
Expand All @@ -248,11 +248,11 @@ of docker. Exclude those versions of docker.
BUILD_PLATFORM="linux/s390x"
%endif
OS_ONLY_BUILD_PLATFORMS="${BUILD_PLATFORM}" %{os_git_vars} OS_BUILD_RELEASE_ARCHIVES=n make build-cross
OS_ONLY_BUILD_PLATFORMS="${BUILD_PLATFORM}" %{os_git_vars} hack/build-go.sh vendor/github.com/onsi/ginkgo/ginkgo
OS_ONLY_BUILD_PLATFORMS="${BUILD_PLATFORM}" %{os_git_vars} OS_BUILD_RELEASE_ARCHIVES=n make build WHAT=vendor/github.com/onsi/ginkgo/ginkgo
%endif

# Generate man pages
%{os_git_vars} hack/generate-docs.sh
%{os_git_vars} make build-docs
%endif

%install
Expand Down

0 comments on commit 5d7adfd

Please sign in to comment.