Skip to content

Refactor Github Action per b/485167538 #4489

New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Closed
google-admin wants to merge 1 commit into from
+33 −21
Closed

Refactor Github Action per b/485167538 #4489

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
1 commit
Select commit
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
24 changes: 15 additions & 9 deletions .github/workflows/jib-cli-release.yml
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -30,32 +30,38 @@ jobs:

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

- name: Run Gradle release
run: |
git checkout -b cli-release-v${{ github.event.inputs.release_version }}
git config user.email ${{ github.actor }}@users.noreply.github.com
git config user.name ${{ github.actor }}
git checkout -b cli-release-v${GITHUB_EVENT_INPUTS_RELEASE_VERSION}
git config user.email ${GITHUB_ACTOR}@users.noreply.github.com
git config user.name ${GITHUB_ACTOR}
# This creates the tag (e.g., "v0.1.0-cli") and pushes the updated
# branch (e.g., "cli-release-v0.1.0") and the new tag.
./gradlew jib-cli:release \
-Prelease.useAutomaticVersion=true \
-Prelease.releaseVersion=${{ github.event.inputs.release_version }}
-Prelease.releaseVersion=${GITHUB_EVENT_INPUTS_RELEASE_VERSION}
env:
GITHUB_EVENT_INPUTS_RELEASE_VERSION: ${{ github.event.inputs.release_version }}

- name: Build Jib CLI release binaries
run: |
git checkout v${{ github.event.inputs.release_version }}-cli
git checkout v${GITHUB_EVENT_INPUTS_RELEASE_VERSION}-cli
./gradlew jib-cli:instDist --stacktrace

cd jib-cli/build/distributions
mv jib-${{ github.event.inputs.release_version }}.zip jib-jre-${{ github.event.inputs.release_version }}.zip
sha256sum jib-jre-${{ github.event.inputs.release_version }}.zip > zip.sha256
mv jib-${GITHUB_EVENT_INPUTS_RELEASE_VERSION}.zip jib-jre-${GITHUB_EVENT_INPUTS_RELEASE_VERSION}.zip
sha256sum jib-jre-${GITHUB_EVENT_INPUTS_RELEASE_VERSION}.zip > zip.sha256
env:
GITHUB_EVENT_INPUTS_RELEASE_VERSION: ${{ github.event.inputs.release_version }}

- name: Generate SLSA subject for Jib CLI release binaries
id: hash
Expand Down
30 changes: 18 additions & 12 deletions .github/workflows/prepare-release.yml
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -29,18 +29,21 @@ jobs:
distribution: 'temurin'
- name: Check input
run: |
echo '* input project: "${{ github.event.inputs.project }}"'
echo '* input project: "${GITHUB_EVENT_INPUTS_PROJECT}"'

case ${{ github.event.inputs.project }} in
case ${GITHUB_EVENT_INPUTS_PROJECT} in
build-plan|core|maven|gradle|extension-common|maven-extension|gradle-extension) ;;
*) echo 'invalid input project name "${{ github.event.inputs.project }}"'
*) echo 'invalid input project name "${GITHUB_EVENT_INPUTS_PROJECT}"'
exit 1
;;
esac
if [[ ! "${{ github.event.inputs.release_version }}" =~ ^[0-9]+\.[0-9]+\.[0-9]+$ ]]; then
echo 'version "${{ github.event.inputs.release_version }}" not in ###.###.### format'
if [[ ! "${GITHUB_EVENT_INPUTS_RELEASE_VERSION}" =~ ^[0-9]+\.[0-9]+\.[0-9]+$ ]]; then
echo 'version "${GITHUB_EVENT_INPUTS_RELEASE_VERSION}" not in ###.###.### format'
exit 1
fi
env:
GITHUB_EVENT_INPUTS_PROJECT: ${{ github.event.inputs.project }}
GITHUB_EVENT_INPUTS_RELEASE_VERSION: ${{ github.event.inputs.release_version }}

- name: Build project
run: |
Expand All @@ -49,22 +52,25 @@ jobs:

- name: Run Gradle release
run: |
git checkout -b ${{ github.event.inputs.project }}-release-v${{ github.event.inputs.release_version }}
git config user.email ${{ github.actor }}@users.noreply.github.com
git config user.name ${{ github.actor }}
git checkout -b ${GITHUB_EVENT_INPUTS_PROJECT}-release-v${GITHUB_EVENT_INPUTS_RELEASE_VERSION}
git config user.email ${GITHUB_ACTOR}@users.noreply.github.com
git config user.name ${GITHUB_ACTOR}

PROJECT=$( case ${{ github.event.inputs.project }} in
PROJECT=$( case ${GITHUB_EVENT_INPUTS_PROJECT} in
extension-common) echo jib-plugins-extension-common ;;
maven-extension) echo jib-maven-plugin-extension-api ;;
gradle-extension) echo jib-gradle-plugin-extension-api ;;
maven|gradle) echo jib-${{ github.event.inputs.project }}-plugin ;;
*) echo jib-${{ github.event.inputs.project }} ;;
maven|gradle) echo jib-${GITHUB_EVENT_INPUTS_PROJECT}-plugin ;;
*) echo jib-${GITHUB_EVENT_INPUTS_PROJECT} ;;
esac )
# This creates the tag (e.g., "v0.1.0-gradle") and pushes the updated
# branch (e.g., "gradle-release-v0.1.0") and the new tag.
./gradlew "${PROJECT}":release \
-Prelease.useAutomaticVersion=true \
-Prelease.releaseVersion=${{ github.event.inputs.release_version }}
-Prelease.releaseVersion=${GITHUB_EVENT_INPUTS_RELEASE_VERSION}
env:
GITHUB_EVENT_INPUTS_PROJECT: ${{ github.event.inputs.project }}
GITHUB_EVENT_INPUTS_RELEASE_VERSION: ${{ github.event.inputs.release_version }}

- name: Create pull request
uses: repo-sync/pull-request@v2.12.1
Expand Down
Loading