Skip to content

Commit faa983d

Browse files
committed
cleanup and test
1 parent ebe6569 commit faa983d

File tree

1 file changed

+14
-23
lines changed

1 file changed

+14
-23
lines changed

.github/workflows/run-release.yml

Lines changed: 14 additions & 23 deletions
Original file line numberDiff line numberDiff line change
@@ -1,6 +1,7 @@
11
name: Release
22

33
on:
4+
pull_request:
45
workflow_dispatch:
56
inputs:
67
version-override:
@@ -11,7 +12,7 @@ on:
1112
type: boolean
1213
required: false
1314
default: false
14-
description: 'Whether the release is a KN variant of repo tools'
15+
description: 'Whether the release is a KN variant of repo tools or not'
1516

1617
permissions:
1718
id-token: write
@@ -27,8 +28,8 @@ jobs:
2728
fetch-depth: 0
2829
fetch-tags: true
2930

30-
- name: Resolve version
31-
id: resolve-version
31+
- name: Resolve new version
32+
id: resolve-new-version
3233
run: |
3334
if [ -n "${{ inputs.version-override }}" ]; then
3435
echo "NEW_VERSION=${{ inputs.version-override }}" >> "$GITHUB_OUTPUT"
@@ -38,47 +39,37 @@ jobs:
3839
if [ "${{ inputs.kn-release }}" == "true" ]; then
3940
CURRENT_VERSION=$(git tag --sort=-creatordate | grep -- '-kn$' | head -n 1)
4041
else
41-
CURRENT_VERSION=$(git tag --sort=-creatordate | head -n 1)
42+
CURRENT_VERSION=$(git tag --sort=-creatordate | grep -v -- '-kn$' | head -n 1)
4243
fi
4344
4445
IFS='.' read -r MAJOR MINOR PATCH <<< "$CURRENT_VERSION"
45-
4646
PATCH_NUMBER=${PATCH%%[^0-9]*}
47-
SUFFIX=${PATCH#$PATCH_NUMBER}
48-
((PATCH_NUMBER++))
49-
PATCH="${PATCH_NUMBER}${SUFFIX}"
50-
51-
RESOLVED_VERSION="$MAJOR.$MINOR.$PATCH"
52-
echo "NEW_VERSION=$RESOLVED_VERSION" >> "$GITHUB_OUTPUT"
47+
PATCH_SUFFIX=${PATCH#$PATCH_NUMBER}
48+
echo "NEW_VERSION=$MAJOR.$MINOR.$((PATCH_NUMBER++))$SUFFIX" >> "$GITHUB_OUTPUT"
5349
54-
- name: Configure git
50+
- name: Create new version tag
51+
env:
52+
NEW_VERSION: ${{ steps.resolve-new-version.outputs.NEW_VERSION }}
5553
run: |
5654
git config user.name aws-sdk-kotlin-ci
5755
git config user.email "[email protected]"
58-
59-
- name: Create tag
60-
env:
61-
NEW_VERSION: ${{ steps.resolve-version.outputs.NEW_VERSION }}
62-
run: |
6356
git tag "$NEW_VERSION"
6457
git push origin "$NEW_VERSION"
65-
66-
- name: Configure Gradle
67-
uses: awslabs/aws-kotlin-repo-tools/.github/actions/configure-gradle@main
58+
exit 1
6859
6960
- name: Configure AWS credentials
7061
uses: aws-actions/configure-aws-credentials@v4
7162
with:
7263
role-to-assume: ${{ secrets.PUBLISHING_ROLE_ARN }}
7364
aws-region: us-west-2
7465

75-
- name: Run CodeBuild
66+
- name: Run codebuild release job
7667
uses: aws-actions/aws-codebuild-run-build@v1
7768
with:
7869
project-name: publish-aws-kotlin-repo-tools
79-
source-version-override: ${{ steps.resolve-version.outputs.NEW_VERSION }}
70+
source-version-override: ${{ steps.resolve-new-version.outputs.NEW_VERSION }}
8071

8172
- name: Delete failed release tag
8273
if: ${{ failure() }}
8374
run: |
84-
git push --delete origin ${{ steps.resolve-version.outputs.NEW_VERSION }}
75+
git push --delete origin ${{ steps.resolve-new-version.outputs.NEW_VERSION }}

0 commit comments

Comments
 (0)