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

Use the latest version in matrix as a default from Makefile #218

Merged
merged 3 commits into from
May 19, 2024
Merged

Use the latest version in matrix as a default from Makefile #218

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
3 commits
Select commit Hold shift + click to select a range
bb36d47
Use the latest version in matrix as a default from Makefile
hiddenmarten May 19, 2024
5f67f32
Fix test-e2e
hiddenmarten May 19, 2024
90074e0
Merge branch 'main' into fix/pipeline-default-version-makefile
hiddenmarten May 19, 2024
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
12 changes: 9 additions & 3 deletions .github/workflows/make-test-e2e.yaml
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -19,7 +19,7 @@ jobs:
attribute: penultimate
- version: 1.29.3
attribute: previous
- version: 1.30.0
- version: default
attribute: latest
runs-on: ubuntu-22.04
steps:
Expand All @@ -30,7 +30,13 @@ jobs:
- uses: docker/setup-buildx-action@v3.3.0
- uses: tale/kubectl-action@v1.4.0
with:
kubectl-version: v1.30.0
kubectl-version: v1.30.1
# Empty kubeconfig file
base64-kube-config: "YXBpVmVyc2lvbjogdjEKa2luZDogQ29uZmlnCnByZWZlcmVuY2VzOiB7fQo="
- run: ENVTEST_K8S_VERSION=${{ matrix.k8s.version }} make test-e2e
- run: |
if [ "${{ matrix.k8s.version }}" = "default" ]; then
# For latest version use default from Makefile
make test-e2e
else
ENVTEST_K8S_VERSION=${{ matrix.k8s.version }} make test-e2e
fi
10 changes: 8 additions & 2 deletions .github/workflows/make-test.yaml
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -19,12 +19,18 @@ jobs:
attribute: penultimate
- version: 1.29.3
attribute: previous
- version: 1.30.0
- version: default
attribute: latest
runs-on: ubuntu-22.04
steps:
- uses: actions/checkout@v4.1.6
- uses: actions/setup-go@v5.0.1
with:
go-version: 1.22.3
- run: ENVTEST_K8S_VERSION=${{ matrix.k8s.version }} make test
- run: |
if [ "${{ matrix.k8s.version }}" = "default" ]; then
# For latest version use default from Makefile
make test
else
ENVTEST_K8S_VERSION=${{ matrix.k8s.version }} make test
fi
2 changes: 1 addition & 1 deletion Makefile
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -3,7 +3,7 @@
IMG ?= ghcr.io/aenix-io/etcd-operator:latest
# ENVTEST_K8S_VERSION refers to the version of kubebuilder assets to be downloaded by envtest binary.
# renovate: datasource=github-tags depName=kubernetes/kubernetes
ENVTEST_K8S_VERSION ?= v1.30.1
ENVTEST_K8S_VERSION ?= v1.30.0
ENVTEST_K8S_VERSION_TRIMMED_V = $(subst v,,$(ENVTEST_K8S_VERSION))

# Get the currently used golang install path (in GOPATH/bin, unless GOBIN is set)
Expand Down