jamesfredley commented on code in PR #16486:
URL: https://github.com/apache/grails-core/pull/16486#discussion_r4174932563
##########
.github/workflows/release.yml:
##########
@@ -594,33 +640,36 @@ jobs:
sudo rm -rf /opt/hostedtoolcache/CodeQL
df -h
- - name: "📥 Checkout repository"
- uses: actions/[email protected]
- with:
- fetch-depth: 0 # needed for docs release dropdown, (fetch-tags: true
with fetch-depth: 1 does not work;
https://github.com/actions/checkout/issues/1471)
- filter: tree:0 # limit size, keeping tags for docs release dropdown
- token: ${{ secrets.GITHUB_TOKEN }}
- ref: ${{ env.TAG }}
- - name: "📅 Ensure Common Build Date" # to ensure a reproducible build
- run: echo "SOURCE_DATE_EPOCH=$(git log -1 --pretty=%ct)" >>
"$GITHUB_ENV"
- - name: "☕️ Setup JDK"
- uses: actions/[email protected]
- with:
- distribution: ${{ env.JAVA_DISTRIBUTION }}
- java-version: ${{ env.JAVA_VERSION }}
- - name: "🐘 Setup Gradle"
- uses:
gradle/actions/setup-gradle@9c971963bec38e04b3d30dcc455b5382be2fdbfb # v6.3.0
- with:
- cache-provider: basic # 'basic' uses the MIT-licensed, open-source
cache provider; the default 'enhanced' provider (v6+) is proprietary (Gradle
commercial Terms of Use)
- develocity-access-key: ${{ secrets.DEVELOCITY_ACCESS_KEY }}
- - name: "📖 Generate Documentation"
- run: ./gradlew grails-doc:build -PgithubBranch=${TARGET_BRANCH}
+ - name: "📥 Download the voted documentation distribution"
+ # The vote approved this exact ZIP, so it is published as-is instead
of rebuilt. It is in
+ # the release area once releaseDistributions.sh has promoted it, and
in dev until then.
+ run: |
+ DOCS_ZIP="${DIST_NAME}-${VERSION}-docs.zip"
+ for area in release dev; do
+
base_url="https://dist.apache.org/repos/dist/${area}/${SVN_PROJECT}/${SVN_FOLDER}/${VERSION}/distribution";
+ if curl -f -s -L -O "${base_url}/${DOCS_ZIP}"; then
+ curl -f -L -O "${base_url}/${DOCS_ZIP}.sha512"
+ curl -f -L -O "${base_url}/${DOCS_ZIP}.asc"
+ echo "Downloaded ${DOCS_ZIP} from ${base_url}"
+ exit 0
+ fi
+ done
+ echo "❌ ${DOCS_ZIP} was found in neither the release nor the dev
distribution area" >&2
+ exit 1
+ - name: "🔐 Verify the documentation distribution"
+ run: |
+ sha512sum -c "${DIST_NAME}-${VERSION}-docs.zip.sha512"
+ export GNUPGHOME="$(mktemp -d)"
+ curl -f -L
"https://dist.apache.org/repos/dist/release/${SVN_PROJECT}/KEYS"; | gpg --batch
--import
+ gpg --batch --verify "${DIST_NAME}-${VERSION}-docs.zip.asc"
"${DIST_NAME}-${VERSION}-docs.zip"
+ - name: "📦 Extract the documentation distribution"
+ run: unzip -q "${DIST_NAME}-${VERSION}-docs.zip"
- name: "🚀 Publish to GitHub Pages"
uses: apache/grails-github-actions/deploy-github-pages@asf
env:
GH_TOKEN: ${{ secrets.GRAILS_GHTOKEN }} # To be able to push to
grails-website repo
GRADLE_PUBLISH_RELEASE: 'true'
- SOURCE_FOLDER: grails-doc/build/docs
+ SOURCE_FOLDER: ${{ env.DIST_NAME }}-${{ env.VERSION }}-docs/html
Review Comment:
Yes. `docs/8.0.0-RC2` is the HTML tree only. There is no `LICENSE`,
`NOTICE`, or `licenses/` directory there, and the Font Awesome files are
already in `fonts/`. The previous publish step copied `grails-doc/build/docs`,
which is that same tree. This step copies `apache-grails-<version>-docs/html`,
so the website payload does not change.
The new legal files belong at the root of the voted zip, which is what this
change does. They were never part of the website payload, so this is not a
regression. Resolving this thread.
--
This is an automated message from the Apache Git Service.
To respond to the message, please log on to GitHub and use the
URL above to go to the specific comment.
To unsubscribe, e-mail: [email protected]
For queries about this service, please contact Infrastructure at:
[email protected]
