From d1c82efb011912c971b80d9480121e4b7c24296d Mon Sep 17 00:00:00 2001 From: Nick Boldt Date: Mon, 6 May 2024 23:40:29 -0300 Subject: [PATCH] chore: metadata: RHIDP-1502 generate build metadata (repo, pull req #, commit SHA and build time) while creating the docker images Signed-off-by: Nick Boldt --- .github/workflows/next-docker-build.yaml | 11 +++++++++++ .github/workflows/pr-docker-build.yaml | 6 ++++++ .husky/pre-commit | 1 - scripts/update-metadata.mjs | 2 +- 4 files changed, 18 insertions(+), 2 deletions(-) diff --git a/.github/workflows/next-docker-build.yaml b/.github/workflows/next-docker-build.yaml index 67209c44dd..98c5b9afea 100644 --- a/.github/workflows/next-docker-build.yaml +++ b/.github/workflows/next-docker-build.yaml @@ -40,6 +40,17 @@ jobs: with: fetch-depth: 0 + - name: Get the last commit short SHA + run: | + SHORT_SHA=$(git rev-parse --short HEAD) + echo "SHORT_SHA=$SHORT_SHA" >> $GITHUB_ENV + if [[ -f packages/app/src/build-metadata.json ]]; then + repo="${{ github.repository }}" + now="$(date -u +%FT%TZ)" + sed -i packages/app/src/build-metadata.json -r \ + -e 's|("Last Commit:.+)|"Last Commit: '$repo' @ '$SHORT_SHA'"|' + fi + - name: Build and Push with Buildx uses: ./.github/actions/docker-build with: diff --git a/.github/workflows/pr-docker-build.yaml b/.github/workflows/pr-docker-build.yaml index 4370bca65b..f46cf4e948 100644 --- a/.github/workflows/pr-docker-build.yaml +++ b/.github/workflows/pr-docker-build.yaml @@ -51,6 +51,12 @@ jobs: run: | SHORT_SHA=$(git rev-parse --short ${{ github.event.pull_request.head.sha }}) echo "SHORT_SHA=$SHORT_SHA" >> $GITHUB_ENV + if [[ -f packages/app/src/build-metadata.json ]]; then + repoPR="${{ github.repository }}/pull/${{ github.event.number }}" + now="$(date -u +%FT%TZ)" + sed -i packages/app/src/build-metadata.json -r \ + -e 's|("Last Commit:.+)|"Last Commit: '$repoPR' @ '$SHORT_SHA'"|' + fi - name: Build and Push with Buildx uses: ./.github/actions/docker-build diff --git a/.husky/pre-commit b/.husky/pre-commit index 7f352ec37a..7e154687b6 100755 --- a/.husky/pre-commit +++ b/.husky/pre-commit @@ -1,5 +1,4 @@ #!/usr/bin/env sh . "$(dirname -- "$0")/_/husky.sh" -npm run versions:metadata npm run lint-staged diff --git a/scripts/update-metadata.mjs b/scripts/update-metadata.mjs index 7195381184..ad432364b6 100644 --- a/scripts/update-metadata.mjs +++ b/scripts/update-metadata.mjs @@ -31,7 +31,7 @@ export function updateBuildMetadata(backstageVersion) { const card = [ `RHDH Version: ${rhdhVersion}`, `Backstage Version: ${backstageVersion}`, - `Last Commit: ${commitTime}`, + `Last Commit: repo @ ${commitTime}`, ]; buildMetadata.card = card;