miri subtree update

Cargo.lock

@@ -2562,7 +2562,6 @@ dependencies = [
  "ipc-channel",
  "libc",
  "libffi",
- "libffi-sys",
  "libloading",
  "measureme",
  "mio",

src/tools/miri/.github/workflows/ci.yml

@@ -7,6 +7,7 @@ on:
       - 'master'
   schedule:
     - cron: '14 4 * * *' # At 4:14 UTC every day.
+  workflow_dispatch: {}
 
 defaults:
   run:
@@ -30,10 +31,6 @@ jobs:
             gcc_cross: i686-linux-gnu
           - host_target: aarch64-unknown-linux-gnu
             os: ubuntu-24.04-arm
-          - host_target: armv7-unknown-linux-gnueabihf
-            os: ubuntu-24.04-arm
-            multiarch: armhf
-            gcc_cross: arm-linux-gnueabihf
           # Ubuntu mirrors are not reliable enough for these architectures
           # (see <https://bugs.launchpad.net/ubuntu/+bug/2130309>).
           # - host_target: riscv64gc-unknown-linux-gnu
@@ -67,25 +64,29 @@ jobs:
         run: |
           set -x
           lscpu
-      - uses: actions/checkout@v6
+      - uses: actions/checkout@d23441a48e516b6c34aea4fa41551a30e30af803 # v6.1.0
+        with:
+          persist-credentials: false
       - name: install multiarch
         if: ${{ matrix.multiarch != '' }}
         run: |
           set -x
-          # armhf, s390x, ppc64el, riscv64 need Ubuntu Ports to be in the mirror list
-          sudo bash -c "echo 'https://ports.ubuntu.com/	priority:4' >> /etc/apt/apt-mirrors.txt"
+          # s390x, ppc64el, riscv64 need Ubuntu Ports to be in the mirror list
+          #sudo bash -c "echo 'https://ports.ubuntu.com/	priority:0' >> /etc/apt/apt-mirrors.txt"
           # Add architecture
-          sudo dpkg --add-architecture ${{ matrix.multiarch }}
+          sudo dpkg --add-architecture ${MULTIARCH}
           # Ubuntu Ports often has outdated mirrors so try a few times to get the apt repo
           for TRY in $(seq 3); do
             { sudo apt update -o APT::Update::Error-Mode=any && break; } || sleep 60
           done
           # Install needed packages
-          sudo apt install $(echo "libatomic1: zlib1g-dev:" | sed 's/:/:${{ matrix.multiarch }}/g')
+          sudo apt install $(echo "libatomic1: zlib1g-dev:" | sed "s/:/:${MULTIARCH}/g")
+        env:
+          MULTIARCH: ${{ matrix.multiarch }}
       - name: install qemu
         if: ${{ matrix.qemu }}
         run: sudo apt install qemu-user qemu-user-binfmt
-      - uses: ./.github/workflows/setup
+      - uses: $/.github/workflows/setup
         with:
           toolchain_flags: "--host ${{ matrix.host_target }}"
 
@@ -94,13 +95,15 @@ jobs:
       - name: install gcc-cross
         if: ${{ matrix.gcc_cross != '' }}
         run: |
-          sudo apt install gcc-${{ matrix.gcc_cross }}
+          sudo apt install gcc-${GCC_CROSS}
           echo "Setting environment variables:"
-          echo "CC_${{ matrix.host_target }}=${{ matrix.gcc_cross }}-gcc" | tee -a $GITHUB_ENV
-          TARGET_UPPERCASE=$(echo ${{ matrix.host_target }} | tr '[:lower:]-' '[:upper:]_')
-          echo "CARGO_TARGET_${TARGET_UPPERCASE}_LINKER=${{ matrix.gcc_cross }}-gcc" | tee -a $GITHUB_ENV
-          echo "CARGO_HOST_${TARGET_UPPERCASE}_LINKER=${{ matrix.gcc_cross }}-gcc" | tee -a $GITHUB_ENV
+          echo "CC_${HOST_TARGET}=${GCC_CROSS}-gcc" | tee -a $GITHUB_ENV
+          TARGET_UPPERCASE=$(echo ${HOST_TARGET} | tr '[:lower:]-' '[:upper:]_')
+          echo "CARGO_TARGET_${TARGET_UPPERCASE}_LINKER=${GCC_CROSS}-gcc" | tee -a $GITHUB_ENV
+          echo "CARGO_HOST_${TARGET_UPPERCASE}_LINKER=${GCC_CROSS}-gcc" | tee -a $GITHUB_ENV
           echo "MIRI_TESTS_CROSS_COMPILED=1" | tee -a $GITHUB_ENV
+        env:
+          GCC_CROSS: ${{ matrix.gcc_cross }}
 
       # The main test job! We don't run this in qemu as that is quite slow,
       # so those targets only get the clippy check below.
@@ -119,8 +122,10 @@ jobs:
       HOST_TARGET: x86_64-unknown-freebsd
     runs-on: ubuntu-latest
     steps:
-      - uses: actions/checkout@v6
-      - uses: vmactions/freebsd-vm@v1
+      - uses: actions/checkout@d23441a48e516b6c34aea4fa41551a30e30af803 # v6.1.0
+        with:
+          persist-credentials: false
+      - uses: vmactions/freebsd-vm@c46abacb49f09938ca4e1702d15d836285d694cc # v1.5.9
         with:
             # Use FreeBSD 15.x
             release: "15"
@@ -138,8 +143,10 @@ jobs:
     name: style checks
     runs-on: ubuntu-latest
     steps:
-      - uses: actions/checkout@v6
-      - uses: ./.github/workflows/setup
+      - uses: actions/checkout@d23441a48e516b6c34aea4fa41551a30e30af803 # v6.1.0
+        with:
+          persist-credentials: false
+      - uses: $/.github/workflows/setup
 
       - name: rustfmt
         run: ./miri fmt --check
@@ -154,11 +161,13 @@ jobs:
     name: bootstrap build
     runs-on: ubuntu-latest
     steps:
-      - uses: actions/checkout@v6
+      - uses: actions/checkout@d23441a48e516b6c34aea4fa41551a30e30af803 # v6.1.0
+        with:
+          persist-credentials: false
       # Deliberately skipping `./.github/workflows/setup` as we do our own setup
       - name: Add cache for cargo
         id: cache
-        uses: actions/cache@v5
+        uses: actions/cache@caa296126883cff596d87d8935842f9db880ef25 # v5.1.0
         with:
           path: |
             # Taken from <https://doc.rust-lang.org/nightly/cargo/guide/cargo-home.html#caching-the-cargo-home-in-ci>.
@@ -192,8 +201,10 @@ jobs:
     name: priroda
     runs-on: ubuntu-latest
     steps:
-      - uses: actions/checkout@v6
-      - uses: ./.github/workflows/setup
+      - uses: actions/checkout@d23441a48e516b6c34aea4fa41551a30e30af803 # v6.1.0
+        with:
+          persist-credentials: false
+      - uses: $/.github/workflows/setup
       - name: clippy Priroda
         run: CARGO_EXTRA_FLAGS=--locked ./miri clippy --features priroda -- -D warnings
       - name: test Priroda
@@ -203,8 +214,10 @@ jobs:
     name: coverage report
     runs-on: ubuntu-latest
     steps:
-      - uses: actions/checkout@v6
-      - uses: ./.github/workflows/setup
+      - uses: actions/checkout@d23441a48e516b6c34aea4fa41551a30e30af803 # v6.1.0
+        with:
+          persist-credentials: false
+      - uses: $/.github/workflows/setup
       - name: coverage
         run: ./miri test --coverage
 
@@ -224,23 +237,21 @@ jobs:
       - name: Conclusion
         run: |
             # Print the dependent jobs to see them in the CI log
-            jq -C <<< '${{ toJson(needs) }}'
+            jq -C <<< "${JSON_NEEDS}"
             # Check if all jobs that we depend on (in the needs array) were successful.
-            jq --exit-status 'all(.result == "success")' <<< '${{ toJson(needs) }}'
+            jq --exit-status 'all(.result == "success")' <<< "${JSON_NEEDS}"
+        env:
+          JSON_NEEDS: ${{ toJson(needs) }}
 
   cron-rustc-pull:
     name: automatic pull from rustc
     runs-on: ubuntu-latest
-    permissions:
-        # The cronjob needs to be able to push to the repo...
-        contents: write
-        # ... and create a PR.
-        pull-requests: write
-    if: ${{ github.event_name == 'schedule' }}
+    if: ${{ github.event_name == 'schedule' || github.event_name == 'workflow_dispatch' }}
     steps:
-      - uses: actions/checkout@v6
+      - uses: actions/checkout@d23441a48e516b6c34aea4fa41551a30e30af803 # v6.1.0
         with:
           fetch-depth: 256 # get a bit more of the history
+          persist-credentials: false
       - name: install josh-sync
         run: cargo +stable install --locked --git https://github.com/rust-lang/josh-sync
       - name: setup bot git name and email
@@ -252,9 +263,11 @@ jobs:
       - name: Install rustup-toolchain-install-master
         run: cargo install --locked -f rustup-toolchain-install-master
       # Create a token for the next step so it can create a PR that actually runs CI.
-      - uses: actions/create-github-app-token@v3
+      - uses: actions/create-github-app-token@64ab729a6294000f5aa4a4bc0b73d1f32bc45510 # v3.3.0
         id: app-token
         with:
+          permission-contents: write # The cronjob needs to be able to push to the repo...
+          permission-pull-requests: write # ... and create a PR.
           app-id: ${{ vars.APP_CLIENT_ID }}
           private-key: ${{ secrets.APP_PRIVATE_KEY }}
       - name: pull changes from rustc and create PR
@@ -284,6 +297,9 @@ jobs:
           # Format changes
           ./miri toolchain
           ./miri fmt --check || (./miri fmt && git commit -am "fmt")
+
+          # Configure remote URL to use the GitHub App token
+          git config remote.origin.url "https://git:${GITHUB_TOKEN}@github.com/${GITHUB_REPOSITORY}.git"
 
           # Create a PR
           BRANCH="rustup-$(date -u +%Y-%m-%d)"
@@ -297,7 +313,7 @@ jobs:
     name: cronjob failure notification
     runs-on: ubuntu-latest
     needs: [test, test-vm-freebsd, style, bootstrap, coverage, priroda]
-    if: ${{ github.event_name == 'schedule' && failure() }}
+    if: ${{ ( github.event_name == 'schedule' || github.event_name == 'workflow_dispatch' ) && failure() }}
     steps:
       # Send a Zulip notification
       - name: Install zulip-send

src/tools/miri/.github/workflows/setup/action.yml

@@ -20,7 +20,7 @@ runs:
       # over time).
       - name: Add cache for cargo
         id: cache
-        uses: actions/cache@v5
+        uses: actions/cache@caa296126883cff596d87d8935842f9db880ef25 # v5.1.0
         with:
           path: |
             # Taken from <https://doc.rust-lang.org/nightly/cargo/guide/cargo-home.html#caching-the-cargo-home-in-ci>.
@@ -43,12 +43,15 @@ runs:
 
       - name: Install "master" toolchain
         run: |
-          if [[ ${{ github.event_name }} == 'schedule' ]]; then
+          if [[ "${GH_EVENT_NAME}" == 'schedule' || "${GH_EVENT_NAME}" == "workflow_dispatch" ]]; then
             echo "Building against latest rustc git version"
             git ls-remote https://github.com/rust-lang/rust/ HEAD | cut -f 1 > rust-version
           fi
-          ./miri toolchain ${{ inputs.toolchain_flags }}
+          ./miri toolchain ${INPUTS_TOOLCHAIN_FLAGS}
         shell: bash
+        env:
+          INPUTS_TOOLCHAIN_FLAGS: ${{ inputs.toolchain_flags }}
+          GH_EVENT_NAME: ${{ github.event_name }}
 
       - name: Show Rust version (miri toolchain)
         run: |

src/tools/miri/.github/workflows/sysroots.yml

@@ -16,7 +16,9 @@ jobs:
     name: Build the sysroots
     runs-on: ubuntu-latest
     steps:
-      - uses: actions/checkout@v6
+      - uses: actions/checkout@d23441a48e516b6c34aea4fa41551a30e30af803 # v6.1.0
+        with:
+          persist-credentials: false
       - name: Build the sysroots
         run: |
           rustup toolchain install nightly
@@ -28,7 +30,7 @@ jobs:
       - name: Upload build errors
         # We don't want to skip this step on failure
         if: always()
-        uses: actions/upload-artifact@v7
+        uses: actions/upload-artifact@cf430e030ddbb5b0abf93d22962f4752f3646cd9 # v7.0.2
         with:
           name: failures
           path: failures.tar.gz
@@ -41,7 +43,7 @@ jobs:
     steps:
       # Download our build error logs
       - name: Download build errors
-        uses: actions/download-artifact@v8
+        uses: actions/download-artifact@9000827ccba6bdab643e8b6fd33ac0654aef8333 # v8.0.2
         with:
           name: failures
       # Send a Zulip notification

src/tools/miri/CONTRIBUTING.md

@@ -27,25 +27,19 @@ for a list of Miri maintainers.
 
 ### PR review process
 
-When you get a review, please take care of the requested changes in new commits. Do not amend
-existing commits. Generally avoid force-pushing. The only time you should force push is when there
-is a conflict with the master branch (in that case you should rebase across master, not merge), and
-all the way at the end of the review process when the reviewer tells you that the PR is done and you
-should squash the commits. (All this is to work around the fact that Github is quite bad at
-dealing with force pushes and does not support `git range-diff`.)
-
-The recommended way to squash commits is to use `./miri squash`, which will make everything into a
-single commit. You will be asked for the commit message; please ensure it describes the entire PR.
-You can also use `git rebase` manually if you need more control (e.g. if there should be more than
-one commit at the end), but then please use `--keep-base` to ensure the PR remains based on the same
-upstream commit.
-
 Most PRs bounce back and forth between the reviewer and the author several times, so it is good to
 keep track of who is expected to take the next step. We are using the `S-waiting-for-review` and
 `S-waiting-for-author` labels for that. If a reviewer asked you to do some changes and you think
 they are all taken care of, post a comment saying `@rustbot ready` to mark a PR as ready for the
 next round of review.
 
+When you are making significant changes to a PR, it is often easier to review them as a separate
+commit, rather than as force-pushed changes to existing commits. Wait until the end of the review
+process before squashing the git history. To squash everything into a single commit, you can use
+`./miri squash`. You will be asked for the commit message; please ensure it describes the entire PR.
+You can also use `git rebase` manually if you need more control (e.g. if there should be more than
+one commit at the end).
+
 ### Larger-scale contributions
 
 If you are thinking about making a larger-scale contribution -- in particular anything that needs