Skip to content

Commit 144e38b

Browse files
committed
Pull remaining changes from apache#2179
1 parent 73f0eb5 commit 144e38b

File tree

5 files changed

+45
-6
lines changed

5 files changed

+45
-6
lines changed

.github/workflows/release-2-update-release-candidate.yml

Lines changed: 1 addition & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -217,6 +217,4 @@ jobs:
217217
exec_process git tag "${release_tag}" "${new_tag_ref}"
218218
exec_process git push origin "${release_tag}"
219219
220-
print_success "🎉 RC tag ${release_tag} created successfully at commit ${new_tag_ref}!"
221-
222-
220+
print_success "🎉 RC tag ${release_tag} created successfully at commit ${new_tag_ref}!"

.github/workflows/release-4-build-and-publish-docker.yml renamed to .github/workflows/release-4-build-docker.yml.yml

Lines changed: 0 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -122,8 +122,6 @@ jobs:
122122
distribution: 'temurin'
123123
java-version: '21'
124124

125-
126-
127125
- name: Build Polaris Server Docker image
128126
run: |
129127
releasey_dir="$(pwd)/releasey"

.github/workflows/release-5-build-and-stage-helm-chart.yml

Lines changed: 5 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -121,6 +121,11 @@ jobs:
121121
with:
122122
version: 'latest'
123123

124+
- name: Install Helm GPG plugin
125+
run: |
126+
helm plugin install https://github.com/technosophos/helm-gpg || true
127+
helm plugin list
128+
124129
- name: Import GPG key
125130
uses: crazy-max/ghaction-import-gpg@v6
126131
with:

.github/workflows/release-6-publish-release.yml

Lines changed: 38 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -176,6 +176,44 @@ jobs:
176176
177177
print_success "Distribution copied from dev to release space successfully"
178178
179+
- name: Set up Helm
180+
uses: azure/setup-helm@fe7b79cd5ee1e45176fcad797de68ecaf3ca4814 # v4
181+
with:
182+
version: 'latest'
183+
184+
- name: Update Helm index in release space
185+
env:
186+
SVN_USERNAME: ${{ secrets.APACHE_USERNAME }}
187+
SVN_PASSWORD: ${{ secrets.APACHE_PASSWORD }}
188+
run: |
189+
releasey_dir="$(pwd)/releasey"
190+
LIBS_DIR="${releasey_dir}/libs"
191+
192+
source "${LIBS_DIR}/_log.sh"
193+
source "${LIBS_DIR}/_constants.sh"
194+
source "${LIBS_DIR}/_exec.sh"
195+
196+
print_info "Updating Helm index in release space..."
197+
198+
# Checkout the release Helm chart directory
199+
release_helm_dir="${releasey_dir}/polaris-dist-release-helm-chart"
200+
release_helm_url="${APACHE_DIST_URL}/release/incubator/polaris/helm-chart"
201+
202+
print_info "Checking out ${release_helm_url} to ${release_helm_dir}..."
203+
exec_process svn checkout --username "$SVN_USERNAME" --password "$SVN_PASSWORD" --non-interactive "${release_helm_url}" "${release_helm_dir}"
204+
205+
print_info "Updating Helm index..."
206+
exec_process cd "${release_helm_dir}"
207+
exec_process helm repo index .
208+
209+
print_info "Adding updated index to SVN..."
210+
exec_process svn add index.yaml
211+
212+
print_info "Committing Helm index update..."
213+
exec_process svn commit --username "$SVN_USERNAME" --password "$SVN_PASSWORD" --non-interactive -m "Update Helm index for ${version_without_rc} release"
214+
215+
print_success "Helm index updated in release space successfully"
216+
179217
- name: Create final release tag and push to Git repository
180218
run: |
181219
releasey_dir="$(pwd)/releasey"

releasey/README.md

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -24,7 +24,7 @@ The release automation is implemented through the following GitHub workflows:
2424
1. **[Create Release Branch](../.github/workflows/release-1-create-release-branch.yml)** - Creates a new release branch from a specified Git SHA
2525
2. **[Update Release Candidate](../.github/workflows/release-2-update-release-candidate.yml)** - Updates version files, finalizes changelog, and creates RC tags
2626
3. **[Build and Publish Artifacts](../.github/workflows/release-3-build-and-publish-artifacts.yml)** - Builds source/binary artifacts and publishes to Nexus staging
27-
4. **[Build Docker](../.github/workflows/release-4-build-and-publish-docker.yml)** - Builds Docker images locally (without publishing to DockerHub)
27+
4. **[Build Docker](../.github/workflows/release-4-build-docker.yml)** - Builds Docker images locally (without publishing to DockerHub)
2828
5. **[Build and Stage Helm Chart](../.github/workflows/release-5-build-and-stage-helm-chart.yml)** - Builds Helm charts and stages them to dist dev repository
2929
6. **[Publish Release](../.github/workflows/release-6-publish-release.yml)** - Finalizes the release by copying to dist release, creating final tags, creating the GitHub release, and publishing Docker images to DockerHub
3030

0 commit comments

Comments
 (0)