[pull] master from erlang:master

.github/scripts/build-base-image.sh

@@ -67,19 +67,21 @@ else
     if [ "${BASE_USE_CACHE}" != "false" ]; then
         if docker pull "${BASE_TAG}:${BASE_BRANCH}"; then
             docker tag "${BASE_TAG}:${BASE_BRANCH}" "${BASE_TAG}:latest"
-            BASE_CACHE="--cache-from ${BASE_TAG}"
         fi
+        BASE_CACHE="--cache-from type=registry,ref=${BASE_TAG}:${BASE_BRANCH}"
     fi
 
     BASE_IMAGE_ID=$(docker images -q "${BASE_TAG}:latest")
 
-    docker build --pull --tag "${BASE_TAG}:latest" \
+    DOCKER_BUILDKIT=1 docker build --pull --tag "${BASE_TAG}:latest" \
        ${BASE_CACHE} \
        --file ".github/dockerfiles/Dockerfile.${BASE_TYPE}" \
-       --build-arg MAKEFLAGS=-j$(($(nproc) + 2)) \
+       --build-arg MAKEFLAGS=-j6 \
        --build-arg USER=otptest --build-arg GROUP=uucp \
        --build-arg uid="$(id -u)" \
-       --build-arg BASE="${BASE}" .github/
+       --build-arg BASE="${BASE}" \
+       --build-arg BUILDKIT_INLINE_CACHE=1 \
+       .github/
 
     NEW_BASE_IMAGE_ID=$(docker images -q "${BASE_TAG}:latest")
     if [ "${BASE_IMAGE_ID}" = "${NEW_BASE_IMAGE_ID}" ]; then

.github/scripts/pr-comment.js

@@ -102,8 +102,8 @@ To speed up review, make sure that you have read [Contributing to Erlang/OTP](${
 See the [TESTING](${repoURL}/blob/master/HOWTO/TESTING.md) and [DEVELOPMENT](${repoURL}/blob/master/HOWTO/DEVELOPMENT.md) HowTo guides for details about how to run test locally.
 
 ## Artifacts
-* ` + (ct_logs ? `[Complete CT logs](https://erlang.github.io/prs/${pr_number}/ct_logs/index.html) ([Download Logs](${nightlyURL(ct_logs)}))` : "No CT logs found") + `
-* ` + (html_docs ? `[HTML Documentation](https://erlang.github.io/prs/${pr_number}/doc/index.html) ([Download HTML Docs](${nightlyURL(html_docs)}))` : "No HTML docs found") + `
+* ` + (ct_logs ? `[Complete CT logs](https://erlang.org/github-pr/${pr_number}/ct_logs/index.html) ([Download Logs](${nightlyURL(ct_logs)}))` : "No CT logs found") + `
+* ` + (html_docs ? `[HTML Documentation](https://erlang.org/github-pr/${pr_number}/doc/index.html) ([Download HTML Docs](${nightlyURL(html_docs)}))` : "No HTML docs found") + `
 * ` + (win_exe ? `[Windows Installer](${nightlyURL(win_exe)})` : "No Windows Installer found") + `
 
 // Erlang/OTP Github Action Bot

.github/workflows/pr-comment.yaml

@@ -109,12 +109,6 @@ jobs:
              echo "HAS_TEST_ARTIFACTS=false" >> $GITHUB_OUTPUT
            fi
 
-      - uses: actions/checkout@11bd71901bbe5b1630ceea73d27597364c9af683 # ratchet:actions/[email protected]
-        with:
-          token: ${{ secrets.ERLANG_TOKEN }}
-          repository: 'erlang/erlang.github.io'
-          path: erlang.github.io
-
       - name: Publish CT Test Results
         uses: EnricoMi/publish-unit-test-result-action@170bf24d20d201b842d7a52403b73ed297e6645b # ratchet:EnricoMi/[email protected]
         if: steps.extract.outputs.HAS_TEST_ARTIFACTS == 'true'
@@ -125,31 +119,6 @@ jobs:
           check_name: "CT Test Results"
           files: "artifacts/**/*.xml"
 
-      - name: Upload PR to github pages
-        env:
-          GITHUB_TOKEN: ${{secrets.GITHUB_TOKEN}}
-        run: |
-           git clone https://github.com/talentdeficit/jsx
-           (cd jsx && rebar3 compile)
-           mkdir -p "${GITHUB_WORKSPACE}/erlang.github.io/prs/"
-           .github/scripts/sync-github-prs.es erlang/otp \
-             "${GITHUB_WORKSPACE}/erlang.github.io/prs/" \
-             "${{ needs.pr-number.outputs.result }}"
-
-      - name: Deploy to github pages 🚀
-        run: |
-          cd erlang.github.io
-          set -x
-          git config user.name github-actions
-          git config user.email [email protected]
-          git add .
-          git add -u
-          git update-index --refresh
-          if ! git diff-index --quiet HEAD --; then
-            git commit -m "Update github pages content"
-            git push origin master
-          fi
-
         ## Append some useful links and tips to the test results posted by
         ## Publish CT Test Results
       - uses: actions/github-script@60a0d83039c74a4aee543508d2ffcb1c3799cdea # ratchet:actions/[email protected]