From 04db6778f7c5a662dcbd047ffb3c093027477368 Mon Sep 17 00:00:00 2001 From: Ralf Jung Date: Sun, 2 Jul 2023 14:01:22 +0200 Subject: [PATCH 1/2] cronjob auto-PR: fetch more of the history --- src/tools/miri/.github/workflows/ci.yml | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/src/tools/miri/.github/workflows/ci.yml b/src/tools/miri/.github/workflows/ci.yml index 39b49f2eaec2..c26c25e25306 100644 --- a/src/tools/miri/.github/workflows/ci.yml +++ b/src/tools/miri/.github/workflows/ci.yml @@ -188,6 +188,8 @@ jobs: --user $ZULIP_BOT_EMAIL --api-key $ZULIP_API_TOKEN --site https://rust-lang.zulipchat.com # Attempt to auto-sync with rustc - uses: actions/checkout@v3 + with: + fetch-depth: 256 # get a bit more of the history - name: install josh-proxy run: cargo +stable install josh-proxy --git https://github.com/josh-project/josh --tag r22.12.06 - name: start josh-proxy @@ -198,8 +200,6 @@ jobs: git config --global user.email 'miri@cron.bot' - name: get changes from rustc run: | - git status # just to see more of what is happening - git checkout master # by default we are not on a branch ./miri rustc-pull - name: Install rustup-toolchain-install-master run: cargo install -f rustup-toolchain-install-master From 7adf8dd3455e010c3d1a96e4b65c8edc01e6aa07 Mon Sep 17 00:00:00 2001 From: Ralf Jung Date: Sun, 2 Jul 2023 14:02:37 +0200 Subject: [PATCH 2/2] CI cleanup --- src/tools/miri/.github/workflows/ci.yml | 11 +++-------- 1 file changed, 3 insertions(+), 8 deletions(-) diff --git a/src/tools/miri/.github/workflows/ci.yml b/src/tools/miri/.github/workflows/ci.yml index c26c25e25306..747ac1f32abb 100644 --- a/src/tools/miri/.github/workflows/ci.yml +++ b/src/tools/miri/.github/workflows/ci.yml @@ -112,14 +112,10 @@ jobs: - name: Install rustup-toolchain-install-master if: ${{ steps.cache.outputs.cache-hit != 'true' }} - shell: bash - run: | - cargo install -f rustup-toolchain-install-master + run: cargo install -f rustup-toolchain-install-master - name: Install "master" toolchain - shell: bash - run: | - ./miri toolchain + run: ./miri toolchain - name: Show Rust version run: | @@ -199,8 +195,7 @@ jobs: git config --global user.name 'The Miri Conjob Bot' git config --global user.email 'miri@cron.bot' - name: get changes from rustc - run: | - ./miri rustc-pull + run: ./miri rustc-pull - name: Install rustup-toolchain-install-master run: cargo install -f rustup-toolchain-install-master - name: format changes (if any)