Skip to content

Commit 160a6c2

Browse files
committed
corrected workflow to extract the correct branch name
Signed-off-by: swastik959 <swastik.gour@suse.com>
1 parent 86b2189 commit 160a6c2

1 file changed

Lines changed: 15 additions & 12 deletions

File tree

.github/workflows/release.yaml

Lines changed: 15 additions & 12 deletions
Original file line numberDiff line numberDiff line change
@@ -52,7 +52,7 @@ jobs:
5252
- name: Publish images
5353
uses: rancher/ecm-distro-tools/actions/publish-image@master
5454
with:
55-
image: gke-operator
55+
image: eks-operator
5656
tag: ${{ github.ref_name }}${{ matrix.tag-suffix }}
5757
platforms: ${{ matrix.platforms }}
5858
public-registry: docker.io
@@ -78,7 +78,7 @@ jobs:
7878
uses: actions/checkout@v4
7979
with:
8080
fetch-depth: 0
81-
ref: ${{ github.ref_name }}
81+
ref: ${{ github.ref_name}}
8282
- name: Create release
8383
env:
8484
GITHUB_TOKEN: ${{ secrets.GITHUB_TOKEN }} # required for creating GH release
@@ -106,7 +106,6 @@ jobs:
106106
gh release upload $TAG $f
107107
done
108108
echo "Charts successfully uploaded to GitHub release $TAG"
109-
110109
- name: Add charts to branch
111110
env:
112111
GITHUB_TOKEN: ${{ secrets.GITHUB_TOKEN }}
@@ -115,15 +114,15 @@ jobs:
115114
branch_version=v$(echo "$version" | cut -d'.' -f1,2)
116115
charts_branch=charts/$branch_version
117116
if [ ! -e ~/.gitconfig ]; then
118-
git config --global user.name "gke-operator-bot"
119-
git config --global user.email gke-operator@suse.de
117+
git config --global user.name "eks-operator-bot"
118+
git config --global user.email eks-operator@suse.de
120119
fi
121120
echo "Publishing helm chart in the branch $charts_branch"
122121
if ! git ls-remote --exit-code --heads origin "$charts_branch"; then
123122
git checkout --orphan "$charts_branch"
124123
git rm -rf .
125-
echo "# GKE Operator Helm Charts for $branch_version versions" > README.md
126-
echo "The documentation is centralized in a unique place, checkout https://github.com/rancher/gke-operator." >> README.md
124+
echo "# EKS Operator Helm Charts for $branch_version versions" > README.md
125+
echo "The documentation is centralized in a unique place, checkout https://github.com/rancher/eks-operator." >> README.md
127126
git checkout origin/main -- License .gitignore
128127
git add README.md License .gitignore
129128
git commit -m "Initial commit for $charts_branch"
@@ -139,7 +138,7 @@ jobs:
139138
git commit -m "Update charts to version $version"
140139
git remote set-url origin https://x-access-token:${GITHUB_TOKEN}@github.com/${{ github.repository }}.git
141140
git push origin "$charts_branch"
142-
141+
143142
dispatch-chart-release:
144143
permissions:
145144
contents: read
@@ -165,12 +164,16 @@ jobs:
165164
owner: ${{ github.repository_owner }}
166165
- name: Dispatch to rancher/charts
167166
env:
168-
GITHUB_TOKEN: ${{ steps.app-token.outputs.token }}
167+
GH_TOKEN: ${{ steps.app-token.outputs.token }}
169168
run: |
169+
CURRENT_BRANCH="${{ github.ref_name }}"
170+
BASE_VERSION=$(echo "$CURRENT_BRANCH" | sed -E 's/^[^v]*(v[0-9]+\.[0-9]+).*/\1/')
171+
TRANSFORMED_VERSION="${BASE_VERSION/v1./v2.}"
172+
TARGET_BRANCH="dev-${TRANSFORMED_VERSION}"
170173
VERSION_OVERRIDE="minor"
171174
gh workflow run "Manual Trigger for Auto Bump" \
172175
--repo rancher/charts \
173-
--ref dev-v2.11 \
176+
--ref "$TARGET_BRANCH" \
174177
-F chart=rancher-gke-operator \
175-
-F branch=dev-v2.11 \
176-
-F version-override=$VERSION_OVERRIDE
178+
-F branch="$TARGET_BRANCH" \
179+
-F version-override=$VERSION_OVERRIDE

0 commit comments

Comments
 (0)