Skip to content

Commit

Permalink
fix: review rework to ratchet from main and sanitize a tag for release
Browse files Browse the repository at this point in the history
  • Loading branch information
at88mph committed Nov 22, 2024
1 parent 86b4aa8 commit baab3e2
Show file tree
Hide file tree
Showing 2 changed files with 13 additions and 1 deletion.
9 changes: 9 additions & 0 deletions .github/workflows/cd.release.build.yml
Original file line number Diff line number Diff line change
Expand Up @@ -38,6 +38,14 @@ jobs:
registry: images.opencadc.org
username: ${{ secrets.REGISTRY_USERNAME }}
password: ${{ secrets.REGISTRY_TOKEN }}
-
name: Sanitize Release Tag
id: sanitize-tag
run: |
echo "Sanitizing Tag: ${{ env.TAG_RELEASE }}"
export SANITIZED_TAG_RELEASE=$(echo ${{ env.TAG_RELEASE }} | sed 's/^v//'
echo "Sanitized Tag: $SANITIZED_TAG_RELEASE"
echo SANITIZED_TAG_RELEASE=$SANITIZED_TAG_RELEASE >> $GITHUB_ENV
-
name: Build and Push Docker Image
id: build
Expand All @@ -54,6 +62,7 @@ jobs:
tags: |
${{ env.REGISTRY }}/${{ env.IMAGE }}:${{ env.TAG }}
${{ env.REGISTRY }}/${{ env.IMAGE }}:${{ env.TAG_RELEASE }}
${{ env.REGISTRY }}/${{ env.IMAGE }}:${{ env.SANITIZED_TAG_RELEASE }}
labels: |
org.opencontainers.image.title=Science Portal
org.opencontainers.image.version=${{ env.TAG_RELEASE }}
Expand Down
5 changes: 4 additions & 1 deletion build.gradle
Original file line number Diff line number Diff line change
Expand Up @@ -18,8 +18,8 @@ node {
}

repositories {
mavenLocal()
mavenCentral()
mavenLocal()
}

dependencies {
Expand Down Expand Up @@ -78,6 +78,9 @@ assemble.dependsOn 'copyDevToDist'
clean.delete << file('src/main/webapp/dist')

spotless {
// optional: limit format enforcement to just the files changed by this feature branch
ratchetFrom 'origin/main'

java {
// Use the default importOrder configuration
importOrder()
Expand Down

0 comments on commit baab3e2

Please sign in to comment.