Skip to content
Permalink

Comparing changes

This is a direct comparison between two commits made in this repository or its related repositories. View the default comparison for this range or learn more about diff comparisons.

Open a pull request

Create a new pull request by comparing changes across two branches. If you need to, you can also . Learn more about diff comparisons here.
base repository: kubernetes-sigs/cluster-api
Failed to load repositories. Confirm that selected base ref is valid, then try again.
Loading
base: 7d0e44f53fa73e59646faf8acf5c0eed7c94807e
Choose a base ref
..
head repository: kubernetes-sigs/cluster-api
Failed to load repositories. Confirm that selected head ref is valid, then try again.
Loading
compare: 09bb93b20ac5aeb535d724ed712955bd93e248d9
Choose a head ref
Showing with 8 additions and 2 deletions.
  1. +6 −0 Makefile
  2. +1 −1 scripts/ci-build.sh
  3. +1 −1 test/framework/go.mod
6 changes: 6 additions & 0 deletions Makefile
Original file line number Diff line number Diff line change
@@ -38,6 +38,7 @@ export DOCKER_CLI_EXPERIMENTAL := enabled
TOOLS_DIR := hack/tools
TOOLS_BIN_DIR := $(TOOLS_DIR)/bin
BIN_DIR := bin
E2E_FRAMEWORK_DIR := test/framework
RELEASE_NOTES_BIN := bin/release-notes
RELEASE_NOTES := $(TOOLS_DIR)/$(RELEASE_NOTES_BIN)

@@ -105,6 +106,10 @@ $(CONVERSION_GEN): $(TOOLS_DIR)/go.mod
$(RELEASE_NOTES) : $(TOOLS_DIR)/go.mod
cd $(TOOLS_DIR) && go build -o $(RELEASE_NOTES_BIN) -tags tools ./release

.PHONY: e2e-framework
e2e-framework: ## Builds the CAPI e2e framework
cd $(E2E_FRAMEWORK_DIR); go build ./...

## --------------------------------------
## Linting
## --------------------------------------
@@ -157,6 +162,7 @@ generate-manifests: $(CONTROLLER_GEN) ## Generate manifests e.g. CRD, RBAC etc.
modules: ## Runs go mod to ensure modules are up to date.
go mod tidy
cd $(TOOLS_DIR); go mod tidy
cd $(E2E_FRAMEWORK_DIR); go mod tidy

## --------------------------------------
## Docker
2 changes: 1 addition & 1 deletion scripts/ci-build.sh
Original file line number Diff line number Diff line change
@@ -20,4 +20,4 @@ set -o pipefail

REPO_ROOT=$(dirname "${BASH_SOURCE[0]}")/..

cd "${REPO_ROOT}" && make manager clusterctl
cd "${REPO_ROOT}" && make manager clusterctl e2e-framework
2 changes: 1 addition & 1 deletion test/framework/go.mod
Original file line number Diff line number Diff line change
@@ -1,6 +1,6 @@
module sigs.k8s.io/cluster-api/test/framework

go 1.13
go 1.12

require (
github.com/onsi/ginkgo v1.10.3