Skip to content

Commit ef3a86c

Browse files
committed
WIP
1 parent 43c37f4 commit ef3a86c

File tree

2 files changed

+9
-5
lines changed

2 files changed

+9
-5
lines changed

.github/workflows/rustc-pull.yml

Lines changed: 7 additions & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -1,4 +1,4 @@
1-
name: rustc-pullx
1+
name: rustc-pull
22

33
on:
44
workflow_dispatch:
@@ -12,15 +12,18 @@ jobs:
1212
#if: github.repository == 'rust-lang/rustc-dev-guide'
1313
runs-on: ubuntu-latest
1414
permissions:
15-
contents: read
15+
contents: write
1616
pull-requests: write
1717
steps:
1818
- uses: actions/checkout@v4
19+
with:
20+
fetch-depth: '0'
1921
- name: Install stable Rust toolchain
2022
run: rustup update stable
2123
- uses: Swatinem/rust-cache@v2
2224
with:
2325
workspaces: "josh-sync"
26+
cache-directories: "/home/runner/.cache/rustc-dev-guide-josh"
2427
- name: Install Josh
2528
run: RUSTFLAGS="--cap-lints warn" cargo +stable install josh-proxy --git https://github.com/josh-project/josh --tag r24.10.04
2629
- name: Setup bot git name and email
@@ -37,5 +40,5 @@ jobs:
3740
- name: Create pull request
3841
run: |
3942
gh pr create -B master --title 'Rustc pull update' --body 'Latest update from rustc.'
40-
# env:
41-
# GITHUB_TOKEN: ${{ secrets.GITHUB_TOKEN }}
43+
env:
44+
GITHUB_TOKEN: ${{ secrets.GITHUB_TOKEN }}

josh-sync/src/sync.rs

Lines changed: 2 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -9,7 +9,7 @@ use xshell::{cmd, Shell};
99
/// Used for rustc syncs.
1010
const JOSH_FILTER: &str = ":/src/doc/rustc-dev-guide";
1111
const JOSH_PORT: u16 = 42042;
12-
const UPSTREAM_REPO: &str = "rust-lang/rust";
12+
const UPSTREAM_REPO: &str = "kobzol/rust";
1313

1414
pub struct GitSync {
1515
dir: PathBuf,
@@ -184,6 +184,7 @@ impl GitSync {
184184
directories::ProjectDirs::from("org", "rust-lang", "rustc-dev-guide-josh").unwrap();
185185
user_dirs.cache_dir().to_owned()
186186
};
187+
eprintln!("Using cache dir at {}", local_dir.display());
187188

188189
// Start josh, silencing its output.
189190
let mut cmd = process::Command::new("josh-proxy");

0 commit comments

Comments
 (0)