Skip to content

Commit 24b4445

Browse files
Refactor Github Action per b/485167538 (#4491)
Co-authored-by: Ben Knutson <benknutson@google.com>
1 parent c43ab07 commit 24b4445

File tree

2 files changed

+33
-21
lines changed

2 files changed

+33
-21
lines changed

.github/workflows/jib-cli-release.yml

Lines changed: 15 additions & 9 deletions
Original file line numberDiff line numberDiff line change
@@ -30,32 +30,38 @@ jobs:
3030

3131
- name: Build project
3232
run: |
33-
if [[ ! "${{ github.event.inputs.release_version }}" =~ ^[0-9]+\.[0-9]+\.[0-9]+$ ]]; then
34-
echo 'version "${{ github.event.inputs.release_version }}" not in ###.###.### format'
33+
if [[ ! "${GITHUB_EVENT_INPUTS_RELEASE_VERSION}" =~ ^[0-9]+\.[0-9]+\.[0-9]+$ ]]; then
34+
echo 'version "${GITHUB_EVENT_INPUTS_RELEASE_VERSION}" not in ###.###.### format'
3535
exit 1
3636
fi
3737
# TODO: run integration test? (Requries auth with GCP.)
3838
./gradlew clean build --stacktrace
39+
env:
40+
GITHUB_EVENT_INPUTS_RELEASE_VERSION: ${{ github.event.inputs.release_version }}
3941

4042
- name: Run Gradle release
4143
run: |
42-
git checkout -b cli-release-v${{ github.event.inputs.release_version }}
43-
git config user.email ${{ github.actor }}@users.noreply.github.com
44-
git config user.name ${{ github.actor }}
44+
git checkout -b cli-release-v${GITHUB_EVENT_INPUTS_RELEASE_VERSION}
45+
git config user.email ${GITHUB_ACTOR}@users.noreply.github.com
46+
git config user.name ${GITHUB_ACTOR}
4547
# This creates the tag (e.g., "v0.1.0-cli") and pushes the updated
4648
# branch (e.g., "cli-release-v0.1.0") and the new tag.
4749
./gradlew jib-cli:release \
4850
-Prelease.useAutomaticVersion=true \
49-
-Prelease.releaseVersion=${{ github.event.inputs.release_version }}
51+
-Prelease.releaseVersion=${GITHUB_EVENT_INPUTS_RELEASE_VERSION}
52+
env:
53+
GITHUB_EVENT_INPUTS_RELEASE_VERSION: ${{ github.event.inputs.release_version }}
5054

5155
- name: Build Jib CLI release binaries
5256
run: |
53-
git checkout v${{ github.event.inputs.release_version }}-cli
57+
git checkout v${GITHUB_EVENT_INPUTS_RELEASE_VERSION}-cli
5458
./gradlew jib-cli:instDist --stacktrace
5559
5660
cd jib-cli/build/distributions
57-
mv jib-${{ github.event.inputs.release_version }}.zip jib-jre-${{ github.event.inputs.release_version }}.zip
58-
sha256sum jib-jre-${{ github.event.inputs.release_version }}.zip > zip.sha256
61+
mv jib-${GITHUB_EVENT_INPUTS_RELEASE_VERSION}.zip jib-jre-${GITHUB_EVENT_INPUTS_RELEASE_VERSION}.zip
62+
sha256sum jib-jre-${GITHUB_EVENT_INPUTS_RELEASE_VERSION}.zip > zip.sha256
63+
env:
64+
GITHUB_EVENT_INPUTS_RELEASE_VERSION: ${{ github.event.inputs.release_version }}
5965

6066
- name: Generate SLSA subject for Jib CLI release binaries
6167
id: hash

.github/workflows/prepare-release.yml

Lines changed: 18 additions & 12 deletions
Original file line numberDiff line numberDiff line change
@@ -29,18 +29,21 @@ jobs:
2929
distribution: 'temurin'
3030
- name: Check input
3131
run: |
32-
echo '* input project: "${{ github.event.inputs.project }}"'
32+
echo '* input project: "${GITHUB_EVENT_INPUTS_PROJECT}"'
3333
34-
case ${{ github.event.inputs.project }} in
34+
case ${GITHUB_EVENT_INPUTS_PROJECT} in
3535
build-plan|core|maven|gradle|extension-common|maven-extension|gradle-extension) ;;
36-
*) echo 'invalid input project name "${{ github.event.inputs.project }}"'
36+
*) echo 'invalid input project name "${GITHUB_EVENT_INPUTS_PROJECT}"'
3737
exit 1
3838
;;
3939
esac
40-
if [[ ! "${{ github.event.inputs.release_version }}" =~ ^[0-9]+\.[0-9]+\.[0-9]+$ ]]; then
41-
echo 'version "${{ github.event.inputs.release_version }}" not in ###.###.### format'
40+
if [[ ! "${GITHUB_EVENT_INPUTS_RELEASE_VERSION}" =~ ^[0-9]+\.[0-9]+\.[0-9]+$ ]]; then
41+
echo 'version "${GITHUB_EVENT_INPUTS_RELEASE_VERSION}" not in ###.###.### format'
4242
exit 1
4343
fi
44+
env:
45+
GITHUB_EVENT_INPUTS_PROJECT: ${{ github.event.inputs.project }}
46+
GITHUB_EVENT_INPUTS_RELEASE_VERSION: ${{ github.event.inputs.release_version }}
4447

4548
- name: Build project
4649
run: |
@@ -49,22 +52,25 @@ jobs:
4952
5053
- name: Run Gradle release
5154
run: |
52-
git checkout -b ${{ github.event.inputs.project }}-release-v${{ github.event.inputs.release_version }}
53-
git config user.email ${{ github.actor }}@users.noreply.github.com
54-
git config user.name ${{ github.actor }}
55+
git checkout -b ${GITHUB_EVENT_INPUTS_PROJECT}-release-v${GITHUB_EVENT_INPUTS_RELEASE_VERSION}
56+
git config user.email ${GITHUB_ACTOR}@users.noreply.github.com
57+
git config user.name ${GITHUB_ACTOR}
5558
56-
PROJECT=$( case ${{ github.event.inputs.project }} in
59+
PROJECT=$( case ${GITHUB_EVENT_INPUTS_PROJECT} in
5760
extension-common) echo jib-plugins-extension-common ;;
5861
maven-extension) echo jib-maven-plugin-extension-api ;;
5962
gradle-extension) echo jib-gradle-plugin-extension-api ;;
60-
maven|gradle) echo jib-${{ github.event.inputs.project }}-plugin ;;
61-
*) echo jib-${{ github.event.inputs.project }} ;;
63+
maven|gradle) echo jib-${GITHUB_EVENT_INPUTS_PROJECT}-plugin ;;
64+
*) echo jib-${GITHUB_EVENT_INPUTS_PROJECT} ;;
6265
esac )
6366
# This creates the tag (e.g., "v0.1.0-gradle") and pushes the updated
6467
# branch (e.g., "gradle-release-v0.1.0") and the new tag.
6568
./gradlew "${PROJECT}":release \
6669
-Prelease.useAutomaticVersion=true \
67-
-Prelease.releaseVersion=${{ github.event.inputs.release_version }}
70+
-Prelease.releaseVersion=${GITHUB_EVENT_INPUTS_RELEASE_VERSION}
71+
env:
72+
GITHUB_EVENT_INPUTS_PROJECT: ${{ github.event.inputs.project }}
73+
GITHUB_EVENT_INPUTS_RELEASE_VERSION: ${{ github.event.inputs.release_version }}
6874

6975
- name: Create pull request
7076
uses: repo-sync/pull-request@v2.12.1

0 commit comments

Comments
 (0)