chore: add tools for commit patch

.github/workflows/build.yml

@@ -6,9 +6,21 @@ on:
   workflow_call:
     inputs:
       TopTestDirectory:
+        description: 'The directory where the main repository will be placed'
+        required: true
+        type: string
+      CallerPackage:
+        description: 'The package to call the workflow'
+        required: true
+        type: string
+      CallerRepository:
+        description: 'The repository to call the workflow'
+        required: true
+        type: string
+      CallerCommit:
+        description: 'The commit of the repository to call the workflow'
         required: true
         type: string
-
 
 jobs:
   prepare_for_external_test:
@@ -89,8 +101,7 @@ jobs:
       if: github.repository != 'Starry-OS/Starry'
       run: |
         git clone https://github.com/Starry-OS/Starry.git ${{ env.WORKING_DIRECTORY }}
-        mkdir .github/workflows/actions
-        mv ${{ env.WORKING_DIRECTORY }}/.github/workflows/actions/setup-musl .github/workflows/actions/setup-musl
+        sh ${{ env.WORKING_DIRECTORY }}/scripts/test/external_test.sh ${{ inputs.CallerPackage }} ${{ inputs.CallerRepository }} ${{ inputs.CallerCommit }}
     - name: Build helloworld
       working-directory: ${{ env.WORKING_DIRECTORY }}
       run: make ARCH=${{ matrix.arch }} A=apps/helloworld
@@ -187,8 +198,7 @@ jobs:
       if: github.repository != 'Starry-OS/Starry'
       run: |
         git clone https://github.com/Starry-OS/Starry.git ${{ env.WORKING_DIRECTORY }}
-        mkdir .github/workflows/actions
-        mv ${{ env.WORKING_DIRECTORY }}/.github/workflows/actions/setup-musl .github/workflows/actions/setup-musl
+        sh ${{ env.WORKING_DIRECTORY }}/scripts/test/external_test.sh ${{ inputs.CallerPackage }} ${{ inputs.CallerRepository }} ${{ inputs.CallerCommit }}
     - uses: ./.github/workflows/actions/setup-musl
       with:
         arch: x86_64
@@ -235,7 +245,9 @@ jobs:
         toolchain: ${{ matrix.rust-toolchain }}
     - name: Clone Top Repository
       if: github.repository != 'Starry-OS/Starry'
-      run: git clone https://github.com/Starry-OS/Starry.git ${{ env.WORKING_DIRECTORY }}
+      run: |
+        git clone https://github.com/Starry-OS/Starry.git ${{ env.WORKING_DIRECTORY }}
+        sh ${{ env.WORKING_DIRECTORY }}/scripts/test/external_test.sh ${{ inputs.CallerPackage }} ${{ inputs.CallerRepository }} ${{ inputs.CallerCommit }}
     - name: Build helloworld
       working-directory: ${{ env.WORKING_DIRECTORY }}
       run: cargo build -p arceos-helloworld
@@ -299,7 +311,9 @@ jobs:
     - run: cargo install cargo-binutils
     - name: Clone Top Repository
       if: github.repository != 'Starry-OS/Starry'
-      run: git clone https://github.com/Starry-OS/Starry.git ${{ env.WORKING_DIRECTORY }}
+      run: |
+        git clone https://github.com/Starry-OS/Starry.git ${{ env.WORKING_DIRECTORY }}
+        sh ${{ env.WORKING_DIRECTORY }}/scripts/test/external_test.sh ${{ inputs.CallerPackage }} ${{ inputs.CallerRepository }} ${{ inputs.CallerCommit }}
     - name: Bulld monolithic-userboot
       working-directory: ${{ env.WORKING_DIRECTORY }}
       run: |

.github/workflows/test.yml

@@ -6,6 +6,19 @@ on:
   workflow_call:
     inputs:
       TopTestDirectory:
+        description: 'The directory where the main repository will be placed'
+        required: true
+        type: string
+      CallerPackage:
+        description: 'The package to call the workflow'
+        required: true
+        type: string
+      CallerRepository:
+        description: 'The repository to call the workflow'
+        required: true
+        type: string
+      CallerCommit:
+        description: 'The commit of the repository to call the workflow'
         required: true
         type: string
 
@@ -51,9 +64,7 @@ jobs:
       if: github.repository != 'Starry-OS/Starry'
       run: |
         git clone https://github.com/Starry-OS/Starry.git ${{ env.WORKING_DIRECTORY }}
-        mkdir .github/workflows/actions
-        mv ${{ env.WORKING_DIRECTORY }}/.github/workflows/actions/setup-musl .github/workflows/actions/setup-musl
-        mv ${{ env.WORKING_DIRECTORY }}/.github/workflows/actions/setup-qemu .github/workflows/actions/setup-qemu
+        sh ${{ env.WORKING_DIRECTORY }}/scripts/test/external_test.sh ${{ inputs.CallerPackage }} ${{ inputs.CallerRepository }} ${{ inputs.CallerCommit }}
     - uses: ./.github/workflows/actions/setup-qemu
       with:
         qemu-version: ${{ env.qemu-version }}
@@ -88,9 +99,7 @@ jobs:
       if: github.repository != 'Starry-OS/Starry'
       run: |
         git clone https://github.com/Starry-OS/Starry.git ${{ env.WORKING_DIRECTORY }}
-        mkdir .github/workflows/actions
-        mv ${{ env.WORKING_DIRECTORY }}/.github/workflows/actions/setup-musl .github/workflows/actions/setup-musl
-        mv ${{ env.WORKING_DIRECTORY }}/.github/workflows/actions/setup-qemu .github/workflows/actions/setup-qemu
+        sh ${{ env.WORKING_DIRECTORY }}/scripts/test/external_test.sh ${{ inputs.CallerPackage }} ${{ inputs.CallerRepository }} ${{ inputs.CallerCommit }}
     - uses: ./.github/workflows/actions/setup-qemu
       with:
         qemu-version: ${{ env.qemu-version }}
@@ -124,9 +133,7 @@ jobs:
       if: github.repository != 'Starry-OS/Starry'
       run: |
         git clone https://github.com/Starry-OS/Starry.git ${{ env.WORKING_DIRECTORY }}
-        mkdir .github/workflows/actions
-        mv ${{ env.WORKING_DIRECTORY }}/.github/workflows/actions/setup-musl .github/workflows/actions/setup-musl
-        mv ${{ env.WORKING_DIRECTORY }}/.github/workflows/actions/setup-qemu .github/workflows/actions/setup-qemu
+        sh ${{ env.WORKING_DIRECTORY }}/scripts/test/external_test.sh ${{ inputs.CallerPackage }} ${{ inputs.CallerRepository }} ${{ inputs.CallerCommit }}
     - uses: ./.github/workflows/actions/setup-qemu
       with:
         qemu-version: ${{ env.qemu-version }}

scripts/test/external_test.sh

@@ -0,0 +1,22 @@
+# The directory of the main repo
+WORK_DIR=$1
+
+PATCH_TOOL_DIR=$WORK_DIR/tools/patch_tool
+
+# The package which needs to be patched
+# It always be the package which triggers the test
+PATCH_PACKAGE=$2
+
+# The URL of the patch points to
+PATCH_TARGET_URL=$3
+
+# The commit hash of the patch
+PATCH_COMMIT_HASH=$4
+
+# To run the main repo actions
+mkdir .github/workflows/actions
+mv $WORK_DIR/.github/workflows/actions/* .github/workflows/actions
+
+# To do the patch for current commit
+cd $PATCH_TOOL_DIR
+cargo run -- $WORK_DIR $PATCH_PACKAGE $PATCH_TARGET_URL $PATCH_COMMIT_HASH

tools/patch_tool/.gitignore

@@ -0,0 +1 @@
+/target

tools/patch_tool/Cargo.toml

@@ -0,0 +1,14 @@
+[dependencies]
+anyhow = "1.0"
+toml = "0.8"
+
+[dependencies.serde]
+features = ["derive"]
+version = "1.0"
+
+[package]
+edition = "2021"
+name = "patch_tool"
+version = "0.1.0"
+
+[workspace]

tools/patch_tool/src/main.rs

@@ -0,0 +1,12 @@
+mod patch;
+#[macro_use]
+extern crate anyhow;
+fn main() {
+    let args: Vec<String> = std::env::args().collect();
+    let cargo_path = &args[1];
+    let patch_name = &args[2];
+    // 默认服务端是 github，后续可能需要根据默认参数来传递
+    let patch_repo_name = &args[3];
+    let commit = &args[4];
+    patch::do_patch(cargo_path, patch_name, patch_repo_name, commit).unwrap();
+}