From 30bc300a67b832a636e4bc2f5d598f245467a5aa Mon Sep 17 00:00:00 2001 From: Paul Sajna Date: Sat, 6 Jan 2024 17:45:28 -0800 Subject: [PATCH 1/3] windows ci --- ci/concourse/build-rust-windows.yml | 14 ++++++++++++++ ci/concourse/build-rust.bat | 26 ++++++++++++++++++++++++++ 2 files changed, 40 insertions(+) create mode 100644 ci/concourse/build-rust-windows.yml create mode 100755 ci/concourse/build-rust.bat diff --git a/ci/concourse/build-rust-windows.yml b/ci/concourse/build-rust-windows.yml new file mode 100644 index 00000000..df881d75 --- /dev/null +++ b/ci/concourse/build-rust-windows.yml @@ -0,0 +1,14 @@ +platform: windows + +params: + RUSTUP_TOOLCHAIN: nightly-2023-09-26 + +inputs: + - name: repo + +caches: + - path: repo/ci/tests/target/ + - path: repo/target/ + +run: + path: repo/ci/concourse/build-rust.sh diff --git a/ci/concourse/build-rust.bat b/ci/concourse/build-rust.bat new file mode 100755 index 00000000..c5c7c6e5 --- /dev/null +++ b/ci/concourse/build-rust.bat @@ -0,0 +1,26 @@ +rustup set profile minimal +rustup update --no-self-update %RUSTUP_TOOLCHAIN% + +rustup component add rust-src + +# Test formatting +rustup component add rustfmt +cd repo/ +cargo fmt --check +cd .. + +# build cargo-psp +cd repo/cargo-psp/ +cargo build +cd ../.. + +# build the test project +cd repo/ci/tests +cargo psp +cd ../../.. + +# Make the output directory, in case it is not specified as an output for this +# concourse task. +mkdir rust-build-dir + +copy repo/ci/tests/target/mipsel-sony-psp/debug/* rust-build-dir From fe3d969eae94d83ab668ae77aebfb77a672695df Mon Sep 17 00:00:00 2001 From: Paul Sajna Date: Sun, 7 Jan 2024 01:48:00 +0000 Subject: [PATCH 2/3] Update build-rust-windows.yml --- ci/concourse/build-rust-windows.yml | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/ci/concourse/build-rust-windows.yml b/ci/concourse/build-rust-windows.yml index df881d75..bdc9870a 100644 --- a/ci/concourse/build-rust-windows.yml +++ b/ci/concourse/build-rust-windows.yml @@ -11,4 +11,4 @@ caches: - path: repo/target/ run: - path: repo/ci/concourse/build-rust.sh + path: repo/ci/concourse/build-rust.bat From b234ce88f58d385fba4f8ed6310f1c067fc2923b Mon Sep 17 00:00:00 2001 From: Paul Sajna Date: Sun, 7 Jan 2024 02:01:53 +0000 Subject: [PATCH 3/3] Update build-rust.bat --- ci/concourse/build-rust.bat | 3 +++ 1 file changed, 3 insertions(+) diff --git a/ci/concourse/build-rust.bat b/ci/concourse/build-rust.bat index c5c7c6e5..07aeee12 100755 --- a/ci/concourse/build-rust.bat +++ b/ci/concourse/build-rust.bat @@ -14,6 +14,9 @@ cd repo/cargo-psp/ cargo build cd ../.. +# Add cargo-psp to path +set PATH=%cd%/repo/target/debug/;%PATH% + # build the test project cd repo/ci/tests cargo psp