From 33b2c43987406502ec411a474cd973908f153244 Mon Sep 17 00:00:00 2001 From: Chaoyu Date: Wed, 8 May 2024 15:48:15 -0700 Subject: [PATCH] Fix file rename in e2e test script, fix release version check in github-release script (#634) Co-authored-by: chaoyux --- .github/workflows/e2e-test.yaml | 2 +- scripts/github-release.sh | 4 ++-- 2 files changed, 3 insertions(+), 3 deletions(-) diff --git a/.github/workflows/e2e-test.yaml b/.github/workflows/e2e-test.yaml index 5dd80779..e4e8e22a 100644 --- a/.github/workflows/e2e-test.yaml +++ b/.github/workflows/e2e-test.yaml @@ -77,7 +77,7 @@ jobs: kubectl apply -f config/crds/bases/k8s-gateway-v1.0.0.yaml - name: Create Lattice GatewayClass run: | - kubectl apply -f examples/gatewayclass.yaml + kubectl apply -f files/controller-installation/gatewayclass.yaml - name: Run test run: | make e2e-test diff --git a/scripts/github-release.sh b/scripts/github-release.sh index e36daf2f..589a945e 100755 --- a/scripts/github-release.sh +++ b/scripts/github-release.sh @@ -43,12 +43,12 @@ if git rev-parse --verify release-$RELEASE_VERSION >/dev/null 2>&1; then git branch -D release-$RELEASE_VERSION fi -if git ls-remote --tags origin | grep -q "refs/tags/$RELEASE_VERSION"; then +if git ls-remote --tags origin | grep -q "refs/tags/$RELEASE_VERSION$"; then echo "Tag '$RELEASE_VERSION' exists in remote, you should manually delete it from github" exit 1 fi -if git ls-remote --heads origin | grep -q "refs/heads/release-$RELEASE_VERSION"; then +if git ls-remote --heads origin | grep -q "refs/heads/release-$RELEASE_VERSION$"; then echo "Branch 'release-$RELEASE_VERSION' exists in remote, you should manually delete it from github" exit 1 fi