Skip to content

Commit

Permalink
Merge pull request #473 from rancher/update-support-versions
Browse files Browse the repository at this point in the history
update CI k8s version support, based on rancher support matrix
  • Loading branch information
ericpromislow committed May 13, 2024
2 parents e20ad24 + bf5a5cf commit daa3426
Show file tree
Hide file tree
Showing 4 changed files with 7 additions and 12 deletions.
6 changes: 3 additions & 3 deletions .github/workflows/scripts/supported-versions.sh
Original file line number Diff line number Diff line change
Expand Up @@ -7,15 +7,15 @@ set -x

if git merge-base --is-ancestor origin/release/v5.0 HEAD
then
echo -n "[\"v1.23.9-k3s1\", \"v1.29.3-k3s1\"]"
printf '["%s", "%s"]' v1.23.9-k3s1 v1.29.4-k3s1
exit 0
elif git merge-base --is-ancestor origin/release/v4.0 HEAD
then
echo -n "[\"v1.23.9-k3s1\", \"v1.28.8-k3s1\"]"
printf '["%s", "%s"]' v1.25.9-k3s1 v1.28.8-k3s1
exit 0
elif git merge-base --is-ancestor origin/release/v3.0 HEAD
then
echo -n "[\"v1.16.9-k3s1\", \"v1.27.9-k3s1\"]"
printf '["%s", "%s"]' v1.23.9-k3s1 v1.27.9-k3s1
exit 0
fi

Expand Down
7 changes: 0 additions & 7 deletions .goreleaser.yaml
Original file line number Diff line number Diff line change
@@ -1,8 +1,6 @@
# This is an example .goreleaser.yml file with some sensible defaults.
# Make sure to check the documentation at https://goreleaser.com
before:
hooks:
# You may remove this if you don't use go modules.
- go mod tidy
builds:
- id: backup-restore-operator
Expand Down Expand Up @@ -39,8 +37,3 @@ changelog:
exclude:
- '^docs:'
- '^test:'

# The lines beneath this are called `modelines`. See `:help modeline`
# Feel free to remove those if you don't want/use them.
# yaml-language-server: $schema=https://goreleaser.com/static/schema.json
# vim: set ts=2 sw=2 tw=0 fo=cnqoj
2 changes: 1 addition & 1 deletion scripts/hull
Original file line number Diff line number Diff line change
Expand Up @@ -18,6 +18,6 @@ cd $(dirname $0)/..

cd tests
echo "Running Hull Tests on Chart Version: $CHART_VERSION"
go test -timeout 30s -run ^TestChart$ github.com/rancher/backup-restore-operator/tests/hull
go test -race -timeout 30s -run ^TestChart$ github.com/rancher/backup-restore-operator/tests/hull

cd ..
4 changes: 3 additions & 1 deletion scripts/package-helm
Original file line number Diff line number Diff line change
@@ -1,6 +1,7 @@
#!/bin/bash
set -e


function edit-charts() {
sed -i \
-e 's/^version:.*/version: '${1}'/' \
Expand Down Expand Up @@ -29,7 +30,8 @@ if ! hash helm 2>/dev/null; then
fi

cd $(dirname $0)/..
. ./scripts/version
source ./scripts/version


rm -rf build/charts
mkdir -p build dist/artifacts
Expand Down

0 comments on commit daa3426

Please sign in to comment.