From 66a97a57af77cac15172c88f7901143393ab42e5 Mon Sep 17 00:00:00 2001 From: Jiahao XU Date: Sun, 5 May 2024 00:33:45 +1000 Subject: [PATCH 1/6] Fix regenerate-target-info.yml: install nightly rust toolchain --- .github/workflows/regenerate-target-info.yml | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/.github/workflows/regenerate-target-info.yml b/.github/workflows/regenerate-target-info.yml index f1d1ccb1..cc349efa 100644 --- a/.github/workflows/regenerate-target-info.yml +++ b/.github/workflows/regenerate-target-info.yml @@ -20,7 +20,7 @@ jobs: - name: Install rust run: | - rustup toolchain install stable --no-self-update --profile minimal + rustup toolchain install stable nightly --no-self-update --profile minimal - name: Regenerate target info run: cargo run -p gen-target-info From 2961e30ae272951ca9e72e639510ece1e912e221 Mon Sep 17 00:00:00 2001 From: Jiahao XU Date: Sun, 5 May 2024 00:36:24 +1000 Subject: [PATCH 2/6] Fix branch created in regenerate-target-info.yml Make it less confusing for gh --- .github/workflows/regenerate-target-info.yml | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/.github/workflows/regenerate-target-info.yml b/.github/workflows/regenerate-target-info.yml index cc349efa..5d7a326f 100644 --- a/.github/workflows/regenerate-target-info.yml +++ b/.github/workflows/regenerate-target-info.yml @@ -16,7 +16,7 @@ jobs: - name: Generate branch name run: | - git checkout -b regenerate-target-info/${{ github.run_id }} + git checkout -b regenerate-target-info-${{ github.run_id }} - name: Install rust run: | From d8bd758386bcaf83878764a73674b8787f76ec74 Mon Sep 17 00:00:00 2001 From: Jiahao XU Date: Sun, 5 May 2024 00:37:13 +1000 Subject: [PATCH 3/6] Add rust-cache to regenerate-target-info.yml --- .github/workflows/regenerate-target-info.yml | 3 ++- 1 file changed, 2 insertions(+), 1 deletion(-) diff --git a/.github/workflows/regenerate-target-info.yml b/.github/workflows/regenerate-target-info.yml index 5d7a326f..261048dd 100644 --- a/.github/workflows/regenerate-target-info.yml +++ b/.github/workflows/regenerate-target-info.yml @@ -21,7 +21,8 @@ jobs: - name: Install rust run: | rustup toolchain install stable nightly --no-self-update --profile minimal - + + - uses: Swatinem/rust-cache@v2 - name: Regenerate target info run: cargo run -p gen-target-info From 84941919e7c9a9395a2d6c213dd524b5d5ff4143 Mon Sep 17 00:00:00 2001 From: Jiahao XU Date: Sun, 5 May 2024 00:41:52 +1000 Subject: [PATCH 4/6] Fix creating PR in regenerate-target-info.yml --- .github/workflows/regenerate-target-info.yml | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/.github/workflows/regenerate-target-info.yml b/.github/workflows/regenerate-target-info.yml index 261048dd..813e2118 100644 --- a/.github/workflows/regenerate-target-info.yml +++ b/.github/workflows/regenerate-target-info.yml @@ -46,4 +46,4 @@ jobs: env: GH_TOKEN: ${{ secrets.GITHUB_TOKEN }} run: | - gh pr create --base main --fill + gh pr create --base main --title "Update `src/target_info.rs`" From 736ab5a6355d654c3e9d4246929e8a7ba77cb059 Mon Sep 17 00:00:00 2001 From: Jiahao XU Date: Sun, 5 May 2024 00:43:34 +1000 Subject: [PATCH 5/6] Fix creating PR in regenerate-target-info.yml Pass `--body` to `gh pr create` --- .github/workflows/regenerate-target-info.yml | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/.github/workflows/regenerate-target-info.yml b/.github/workflows/regenerate-target-info.yml index 813e2118..35ed4654 100644 --- a/.github/workflows/regenerate-target-info.yml +++ b/.github/workflows/regenerate-target-info.yml @@ -46,4 +46,4 @@ jobs: env: GH_TOKEN: ${{ secrets.GITHUB_TOKEN }} run: | - gh pr create --base main --title "Update `src/target_info.rs`" + gh pr create --base main --title "Update `src/target_info.rs`" --body "Automatically regenerated in CI" From 427f77830a3e526958db925fc7e7443b7e00a212 Mon Sep 17 00:00:00 2001 From: Jiahao XU Date: Sun, 5 May 2024 00:45:18 +1000 Subject: [PATCH 6/6] Fix title of PR generated by regenerate-target-info.yml --- .github/workflows/regenerate-target-info.yml | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/.github/workflows/regenerate-target-info.yml b/.github/workflows/regenerate-target-info.yml index 35ed4654..731358bb 100644 --- a/.github/workflows/regenerate-target-info.yml +++ b/.github/workflows/regenerate-target-info.yml @@ -46,4 +46,4 @@ jobs: env: GH_TOKEN: ${{ secrets.GITHUB_TOKEN }} run: | - gh pr create --base main --title "Update `src/target_info.rs`" --body "Automatically regenerated in CI" + gh pr create --base main --title "Update src/target_info.rs" --body "Automatically regenerated in CI"