.github/actions/build-base-image/action.yaml

@@ -16,7 +16,7 @@ runs:
     using: composite
     steps:
       - name: Cleanup GH Runner
-        shell: bash -euxo pipefail {0}
+        shell: bash -euo pipefail {0}
         run: |
             ## Delete large files from runner to get more disk space
             ## See https://github.com/actions/runner-images/issues/2840
@@ -26,14 +26,14 @@ runs:
             sudo rm -rf "$AGENT_TOOLSDIRECTORY"
 
       - name: Cache BASE image
-        uses: actions/cache@v3
+        uses: actions/cache@v4.0.0
         if: inputs.TYPE == '64-bit' || inputs.TYPE == 'clang'
         with:
             path: otp_docker_base.tar
             key: ${{ runner.os }}-${{ hashFiles('.github/dockerfiles/Dockerfile.ubuntu-base', '.github/scripts/build-base-image.sh') }}-${{ hashFiles('OTP_VERSION') }}
 
       - name: Docker login
-        uses: docker/login-action@v2
+        uses: docker/login-action@v3.0.0
         with:
           registry: ghcr.io
           username: ${{ github.repository_owner }}
@@ -45,19 +45,19 @@ runs:
 
       - name: Cache pre-built src
         if: inputs.BUILD_IMAGE == 'true'
-        uses: actions/cache@v3
+        uses: actions/cache@v4.0.0
         with:
             path: otp_src.tar.gz
             key: prebuilt-src-${{ github.ref_name }}-${{ github.sha }}
       - name: Cache pre-built binaries
         if: inputs.BUILD_IMAGE == 'true'
-        uses: actions/cache@v3
+        uses: actions/cache@v4.0.0
         with:
             path: otp_cache.tar.gz
             key: prebuilt-cache-${{ inputs.TYPE }}-${{ github.ref_name }}-${{ github.sha }}
       - name: Build image
         if: inputs.BUILD_IMAGE == 'true'
-        shell: bash -euxo pipefail {0}
+        shell: bash -eo pipefail {0}
         run: |
           .github/scripts/restore-from-prebuilt.sh `pwd` .github/otp.tar.gz
           rm -f otp_{src,cache}.tar.gz

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

@@ -1,5 +1,7 @@
 #!/bin/bash
 
+set -eo pipefail
+
 BASE_BRANCH="$1"
 
 case "${BASE_BRANCH}" in

.github/scripts/restore-from-prebuilt.sh

@@ -32,6 +32,7 @@ ARCHIVE="$3"
 if [ ! -f "${CACHE_SOURCE_DIR}/otp_src.tar.gz" ] || [ "${NO_CACHE}" = "true" ]; then
     cp "${ARCHIVE}" "${TARGET}"
     cp "${ARCHIVE}" "${CACHE_SOURCE_DIR}/otp_src.tar.gz"
+    rm -f "${CACHE_SOURCE_DIR}/otp_cache.tar.gz" || true
     exit 0
 fi
 
@@ -49,9 +50,12 @@ tar -C "${CACHE_DIR}/" -xzf "${CACHE_SOURCE_DIR}/otp_src.tar.gz"
 
 ## If we have a binary cache
 if [ -f "${CACHE_SOURCE_DIR}/otp_cache.tar.gz" ]; then
-    ## If configure scripts have NOT changed, we can restore configure and other C/java programs
+    ## If configure scripts or .in files have NOT changed, we can restore
+    ## makefiles and other C/java programs
     if [ -z "${CONFIGURE}" ] || [ "${CONFIGURE}" = "false" ]; then
         tar -C "${CACHE_DIR}/" -xzf "${CACHE_SOURCE_DIR}/otp_cache.tar.gz"
+    else
+        rm -f "${CACHE_SOURCE_DIR}/otp_cache.tar.gz"
     fi
 fi
 
@@ -147,6 +151,11 @@ if [ -n "${ARCHIVE}" ]; then
             fi
         done
 
+        ## The cache was deleted, so break and don't use it
+        if [ ! -d "${CACHE_DIR}" ]; then
+            break;
+        fi
+
         echo "::group::{Run ${i}: yecc}"
         ### if yecc has changed, need to recompile all .yrl files
         if grep "yecc.erl$" "${CHANGES}"; then

.github/workflows/actions-updater.yaml

@@ -14,10 +14,10 @@ jobs:
     steps:
       - name: Generate token
         id: generate_token
-        uses: actions/create-github-app-token@v1.6.1
+        uses: actions/create-github-app-token@v1.7.0
         with:
-          app_id: ${{ secrets.APP_ID }}
-          private_key: ${{ secrets.APP_PEM }}
+          app-id: ${{ secrets.APP_ID }}
+          private-key: ${{ secrets.APP_PEM }}
 
       - uses: actions/checkout@v4.1.1
         with:
@@ -28,3 +28,4 @@ jobs:
         with:
           token: ${{ steps.generate_token.outputs.token }}
           pull_request_branch: "github/actions-update"
+          extra_workflow_locations: ".github/actions/build-base-image"

.github/workflows/add-to-project.yaml

@@ -16,7 +16,7 @@ jobs:
     steps:
       - name: Generate token
         id: generate_token
-        uses: actions/create-github-app-token@v1.6.1
+        uses: actions/create-github-app-token@v1.7.0
         with:
           app_id: ${{ secrets.APP_ID }}
           private_key: ${{ secrets.APP_PEM }}

.github/workflows/main.yaml

@@ -54,7 +54,7 @@ jobs:
           ALL_APPS=$(grep '^[a-z_]*:' .github/scripts/path-filters.yaml | sed 's/:.*$//')
           ALL_APPS=$(jq -n --arg inarr "${ALL_APPS}" '$inarr | split("\n")' | tr '\n' ' ')
           echo "all=${ALL_APPS}" >> $GITHUB_OUTPUT
-      - uses: dorny/paths-filter@v2.11.1
+      - uses: dorny/paths-filter@v3.0.0
         id: app-changes
         with:
           filters: .github/scripts/path-filters.yaml
@@ -70,14 +70,14 @@ jobs:
               echo "changes=${CHANGED_APPS}" >> "$GITHUB_OUTPUT"
           fi
       - name: Cache pre-built src
-        uses: actions/cache@v3.3.2
+        uses: actions/cache@v4.0.0
         with:
             path: otp_src.tar.gz
             key: prebuilt-src-${{ github.ref_name }}-${{ github.sha }}
             restore-keys: |
                 prebuilt-src-${{ github.base_ref }}-${{ github.event.pull_request.base.sha }}
       - name: Cache pre-built binaries
-        uses: actions/cache@v3.3.2
+        uses: actions/cache@v4.0.0
         with:
             path: otp_cache.tar.gz
             key: prebuilt-cache-64-bit-${{ github.ref_name }}-${{ github.sha }}
@@ -86,16 +86,17 @@ jobs:
       - name: Create initial pre-release tar
         run: .github/scripts/init-pre-release.sh otp_archive.tar.gz otp_src.tar.gz
       - name: Upload source tar archive
-        uses: actions/upload-artifact@v3.1.3
+        uses: actions/upload-artifact@v4.3.0
         with:
           name: otp_git_archive
           path: otp_archive.tar.gz
-      - uses: dorny/paths-filter@v2.11.1
+      - uses: dorny/paths-filter@v3.0.0
         id: cache
         with:
           filters: |
               no-cache:
                   - '.github/**'
+                  - deleted: '**/*.h'
               deleted:
                   - deleted: '**'
               bootstrap:
@@ -104,9 +105,21 @@ jobs:
                   - '**.ac'
                   - '**.in'
           list-files: shell
+      - name: "Check '@github-action disable-cache' in PR Comment"
+        id: issue_comment
+        env:
+          GITHUB_TOKEN: ${{secrets.GITHUB_TOKEN}}
+        shell: /usr/bin/bash {0}
+        run: |
+            ISSUE_COMMENTS=$(gh api -H "Accept: application/vnd.github+json" /repos/${{ github.repository }}/issues/${{ github.event.pull_request.number }}/comments | jq ".[] | .body")
+            if echo "${ISSUE_COMMENTS}" | grep "@github-actions disable-cache"; then
+              echo "DISABLE_CACHE=true" >> $GITHUB_OUTPUT
+            else
+              echo "DISABLE_CACHE=false" >> $GITHUB_OUTPUT
+            fi
       - name: Restore from cache
         env:
-            NO_CACHE: ${{ steps.cache.outputs.no-cache || steps.cache.outputs.deleted_count > 20 }}
+            NO_CACHE: ${{ fromJson(steps.cache.outputs.no-cache) || fromJson(steps.issue_comment.outputs.DISABLE_CACHE) || fromJson(steps.cache.outputs.deleted_count) > 20 }}
             BOOTSTRAP: ${{ steps.cache.outputs.bootstrap }}
             CONFIGURE: ${{ steps.cache.outputs.configure }}
             EVENT: ${{ github.event_name }}
@@ -116,7 +129,7 @@ jobs:
               "`pwd`/.github/otp.tar.gz" \
               "`pwd`/otp_archive.tar.gz"
       - name: Upload restored cache
-        uses: actions/upload-artifact@v3.1.3
+        uses: actions/upload-artifact@v4.3.0
         if: runner.debug == 1
         with:
           name: restored-cache
@@ -143,7 +156,7 @@ jobs:
             bash -c 'set -x; C_APPS=$(ls -d ./lib/*/c_src); find Makefile ./make ./erts ./bin/`erts/autoconf/config.guess` ./lib/erl_interface ./lib/jinterface ${C_APPS} `echo "${C_APPS}" | sed -e 's:c_src$:priv:'` -type f -newer README.md \! -name "*.beam" \! -path "*/doc/*" | xargs tar --transform "s:^./:otp/:" -uvf /github/otp_cache.tar'
           gzip otp_cache.tar
       - name: Upload pre-built tar archives
-        uses: actions/upload-artifact@v3.1.3
+        uses: actions/upload-artifact@v4.3.0
         with:
           name: otp_prebuilt
           path: |
@@ -160,13 +173,13 @@ jobs:
       - uses: actions/checkout@v4.1.1
 
       - name: Download source archive
-        uses: actions/download-artifact@v3.0.2
+        uses: actions/download-artifact@v4.1.1
         with:
           name: otp_prebuilt
 
       - name: Cache wxWidgets
         id: wxwidgets-cache
-        uses: actions/cache@v3.3.2
+        uses: actions/cache@v4.0.0
         with:
           path: wxWidgets
           key: wxWidgets-${{ env.WXWIDGETS_VERSION }}-${{ runner.os }}-12
@@ -192,7 +205,7 @@ jobs:
           ./bin/erl -noshell -eval '{wx_ref,_,_,_} = wx:new(), io:format("wx ok~n"), halt().'
 
       - name: Upload tarball
-        uses: actions/upload-artifact@v3.1.3
+        uses: actions/upload-artifact@v4.3.0
         with:
           name: otp_prebuilt_macos_x86-64
           path: otp/otp_macos_*_x86-64.tar.gz
@@ -207,7 +220,7 @@ jobs:
     steps:
       - uses: actions/checkout@v4.1.1
       - name: Download source archive
-        uses: actions/download-artifact@v3.0.2
+        uses: actions/download-artifact@v4.1.1
         with:
           name: otp_prebuilt
 
@@ -226,7 +239,7 @@ jobs:
           xcodebuild -create-xcframework -output ./liberlang.xcframework -library liberlang.a
 
       - name: Upload framework
-        uses: actions/upload-artifact@v3.1.3
+        uses: actions/upload-artifact@v4.3.0
         with:
           name: ios_framework_${{ env.TARGET_ARCH }}
           path: otp/liberlang.xcframework
@@ -251,11 +264,11 @@ jobs:
       - name: Install openssl
         shell: cmd
         run: |
-          choco install openssl
+          choco install openssl --version=3.1.1
           IF EXIST "c:\\Program Files\\OpenSSL-Win64" (move "c:\\Program Files\\OpenSSL-Win64" "c:\\OpenSSL-Win64") ELSE (move "c:\\Program Files\\OpenSSL" "c:\\OpenSSL-Win64")
 
       - name: Cache wxWidgets
-        uses: actions/cache@v3.3.2
+        uses: actions/cache@v4.0.0
         with:
           path: wxWidgets
           key: wxWidgets-${{ env.WXWIDGETS_VERSION }}-${{ runner.os }}
@@ -297,7 +310,7 @@ jobs:
           nmake TARGET_CPU=amd64 BUILD=release SHARED=0 DIR_SUFFIX_CPU= -f makefile.vc
 
       - name: Download source archive
-        uses: actions/download-artifact@v3.0.2
+        uses: actions/download-artifact@v4.1.1
         with:
           name: otp_prebuilt
 
@@ -325,7 +338,7 @@ jobs:
           ./otp_build installer_win32
 
       - name: Upload installer
-        uses: actions/upload-artifact@v3.1.3
+        uses: actions/upload-artifact@v4.3.0
         with:
           name: otp_win32_installer
           path: otp/release/win32/otp*.exe
@@ -397,12 +410,12 @@ jobs:
             rm -rf man
             tar czf ../otp_doc_html.tar.gz *
       - name: Upload html documentation archive
-        uses: actions/upload-artifact@v3.1.3
+        uses: actions/upload-artifact@v4.3.0
         with:
           name: otp_doc_html
           path: otp_doc_html.tar.gz
       - name: Upload man documentation archive
-        uses: actions/upload-artifact@v3.1.3
+        uses: actions/upload-artifact@v4.3.0
         with:
           name: otp_doc_man
           path: otp_doc_man.tar.gz
@@ -477,30 +490,30 @@ jobs:
             mv make_test_dir/${APP}_test "make_test_dir/${{ matrix.type }}_test"
           fi
       - name: Cleanup tests
-        if: always()
+        if: ${{ !cancelled() }}
         run: |
           rm -rf make_test_dir/otp || true
           sudo bash -c "chown -R `whoami` make_test_dir && chmod -R +r make_test_dir"
           tar czf ${{ matrix.type }}_test_results.tar.gz make_test_dir
       - name: Upload test results
-        uses: actions/upload-artifact@v3.1.3
-        if: always()
+        uses: actions/upload-artifact@v4.3.0
+        if: ${{ !cancelled() }}
         with:
           name: ${{ matrix.type }}_test_results
           path: ${{ matrix.type }}_test_results.tar.gz
 
   system-test:
     name: Test Erlang/OTP (system)
     runs-on: ubuntu-latest
-    if: always() # Run even if the need has failed
+    if: ${{ !cancelled() }} # Run even if the need has failed
     needs: test
     steps:
       - uses: actions/checkout@v4.1.1
       - uses: ./.github/actions/build-base-image
         with:
             BASE_BRANCH: ${{ env.BASE_BRANCH }}
       - name: Download test results
-        uses: actions/download-artifact@v3.0.2
+        uses: actions/download-artifact@v4.1.1
       - name: Merge test results
         run: |
           shopt -s nullglob
@@ -519,7 +532,7 @@ jobs:
             -v $PWD/make_test_dir:/buildroot/otp/erts/make_test_dir otp \
             "make system_test"
       - name: Cleanup tests
-        if: always()
+        if: ${{ !cancelled() }}
         run: |
           rm -rf make_test_dir/otp || true
           tar czf test_results.tar.gz make_test_dir
@@ -530,14 +543,14 @@ jobs:
               -e 's:\(file="erts/\)make_test_dir/[^/]*:\1test:g' \
               make_test_dir/*_junit.xml
       - name: Upload test results
-        uses: actions/upload-artifact@v3.1.3
-        if: always()
+        uses: actions/upload-artifact@v4.3.0
+        if: ${{ !cancelled() }}
         with:
           name: test_results
           path: test_results.tar.gz
       - name: Upload Test Results
-        if: always()
-        uses: actions/upload-artifact@v3.1.3
+        if: ${{ !cancelled() }}
+        uses: actions/upload-artifact@v4.3.0
         with:
           name: Unit Test Results
           path: |
@@ -565,15 +578,15 @@ jobs:
 
       ## Publish the pre-built archive and docs
       - name: Download source archive
-        uses: actions/download-artifact@v3.0.2
+        uses: actions/download-artifact@v4.1.1
         with:
           name: otp_prebuilt
       - name: Download html docs
-        uses: actions/download-artifact@v3.0.2
+        uses: actions/download-artifact@v4.1.1
         with:
           name: otp_doc_html
       - name: Download man docs
-        uses: actions/download-artifact@v3.0.2
+        uses: actions/download-artifact@v4.1.1
         with:
           name: otp_doc_man
 
@@ -611,7 +624,7 @@ jobs:
     runs-on: ubuntu-latest
     steps:
       - name: Upload
-        uses: actions/upload-artifact@v3.1.3
+        uses: actions/upload-artifact@v4.3.0
         with:
           name: Event File
           path: ${{ github.event_path }}

.github/workflows/pr-comment.yaml

@@ -95,7 +95,7 @@ jobs:
           path: erlang.github.io
 
       - name: Publish CT Test Results
-        uses: EnricoMi/publish-unit-test-result-action@v2.11.0
+        uses: EnricoMi/publish-unit-test-result-action@v2.12.0
         if: steps.extract.outputs.HAS_TEST_ARTIFACTS == 'true'
         with:
           commit: ${{ github.event.workflow_run.head_sha }}

OTP_VERSION

@@ -1 +1 @@
-26.2.1
+26.2.2