From 77e715e12023a53233d33958299b063c97f7a836 Mon Sep 17 00:00:00 2001 From: James Mortensen Date: Sun, 10 Apr 2022 00:18:54 +0530 Subject: [PATCH] Image hashes in release notes don't match pushed images. Try pulling them to build release notes. [deploy] --- .circleci/config.yml | 2 +- generate_multi-arch-release_notes.sh | 8 +++++++- 2 files changed, 8 insertions(+), 2 deletions(-) diff --git a/.circleci/config.yml b/.circleci/config.yml index ac03c79f1..dec68ab36 100644 --- a/.circleci/config.yml +++ b/.circleci/config.yml @@ -198,7 +198,7 @@ jobs: NAME=${NAMESPACE} VERSION=${BRANCH} BUILD_DATE=${BUILD_DATE} PLATFORMS=${PLATFORMS} BUILD_ARGS=${BUILD_ARGS} make build_multi - run: | echo "Generate release notes" - NAME=${NAMESPACE} VERSION=${BRANCH} BUILD_DATE=${BUILD_DATE} PLATFORMS=linux/arm64 BUILD_ARGS=--load make build_multi + #NAME=${NAMESPACE} VERSION=${BRANCH} BUILD_DATE=${BUILD_DATE} PLATFORMS=linux/arm64 BUILD_ARGS=--load make build_multi export LATEST_TAG=$(git describe --tags --abbrev=0) sh generate_multi-arch-release_notes.sh $LATEST_TAG $CIRCLE_BRANCH $BRANCH $BUILD_DATE cat release_notes.md diff --git a/generate_multi-arch-release_notes.sh b/generate_multi-arch-release_notes.sh index 44a8a9a5f..5f1ffb738 100755 --- a/generate_multi-arch-release_notes.sh +++ b/generate_multi-arch-release_notes.sh @@ -11,13 +11,19 @@ echo "" >> release_notes.md echo "### Changelog" > release_notes.md git --no-pager log "${LATEST_TAG}...${HEAD_BRANCH}" --pretty=format:"* [\`%h\`](http://github.com/seleniumhq-community/docker-seleniarm/commit/%H) - %s :: %an" --reverse >> release_notes.md +# Pull the other images so we populate the release notes +docker pull seleniarm/base:${TAG_VERSION} +docker pull seleniarm/hub:${TAG_VERSION} +docker pull seleniarm/node-base:${TAG_VERSION} +docker pull seleniarm/standalone-chromium:${TAG_VERSION} +docker pull seleniarm/standalone-firefox:${TAG_VERSION} + CHROMIUM_VERSION=$(docker run --rm seleniarm/node-chromium:${TAG_VERSION} chromium --version | awk '{print $2}') CHROMEDRIVER_VERSION=$(docker run --rm seleniarm/node-chromium:${TAG_VERSION} chromedriver --version | awk '{print $2}') FIREFOX_VERSION=$(docker run --rm seleniarm/node-firefox:${TAG_VERSION} firefox --version | awk '{print $3}') GECKODRIVER_VERSION=$(docker run --rm seleniarm/node-firefox:${TAG_VERSION} geckodriver --version | awk 'NR==1{print $2}') - echo "" >> release_notes.md echo "### Released versions" >> release_notes.md echo "* Selenium: ${GRID_VERSION}" >> release_notes.md