[CI] Abstarct an independent action to checkout and patch

arceos-org · Oct 19, 2024 · 5d9f19e · 5d9f19e
1 parent 3ae4e1e
commit 5d9f19e
Show file tree

Hide file tree

Showing 3 changed files with 34 additions and 32 deletions.
diff --git a/.github/workflows/actions/ext-patch/action.yml b/.github/workflows/actions/ext-patch/action.yml
@@ -0,0 +1,22 @@
+name: Checkout repo and patch dependencies
+
+inputs:
+  package:
+    description: 'The package that triggers the external test'
+    required: true
+    type: string
+
+runs:
+  using: "composite"
+  steps:
+  - name: Install patch tool
+    if: inputs.package != ''
+    shell: bash
+    run: cargo install dependencies-patch
+  - name: Patch for the commit to be tested
+    if: inputs.package != ''
+    shell: bash
+    run: dependencies-patch -c . \
+        -n ${{ inputs.package }} \
+        -t git --git-repo ${{ github.repository }} \
+        --commit ${{ github.sha }}
diff --git a/.github/workflows/build.yml b/.github/workflows/build.yml
@@ -35,14 +35,9 @@ jobs:
       with:
         repository: ${{ env.prj-repo }}
         ref: ${{ inputs.ref }}
-    - name: Patch for the commit to be tested
-      if: inputs.package != ''
-      run: |
-        cargo install dependencies-patch
-        dependencies-patch -c . \
-          -n ${{ inputs.package }} \
-          -t git --git-repo ${{ github.repository }} \
-          --commit ${{ github.sha }}
+    - uses: ./.github/workflows/actions/ext-patch
+      with:
+        package: ${{ inputs.package }}
     - uses: dtolnay/rust-toolchain@stable
       with:
         toolchain: ${{ matrix.rust-toolchain }}
@@ -84,14 +79,9 @@ jobs:
       with:
         repository: ${{ env.prj-repo }}
         ref: ${{ inputs.ref }}
-    - name: Patch for the commit to be tested
-      if: inputs.package != ''
-      run: |
-        cargo install dependencies-patch
-        dependencies-patch -c . \
-          -n ${{ inputs.package }} \
-          -t git --git-repo ${{ github.repository }} \
-          --commit ${{ github.sha }}
+    - uses: ./.github/workflows/actions/ext-patch
+      with:
+        package: ${{ inputs.package }}
     - uses: dtolnay/rust-toolchain@stable
       with:
         toolchain: ${{ matrix.rust-toolchain }}

diff --git a/.github/workflows/test.yml b/.github/workflows/test.yml
@@ -32,14 +32,9 @@ jobs:
       with:
         repository: ${{ env.prj-repo }}
         ref: ${{ inputs.ref }}
-    - name: Patch for the commit to be tested
-      if: inputs.package != ''
-      run: |
-        cargo install dependencies-patch
-        dependencies-patch -c . \
-          -n ${{ inputs.package }} \
-          -t git --git-repo ${{ github.repository }} \
-          --commit ${{ github.sha }}
+    - uses: ./.github/workflows/actions/ext-patch
+      with:
+        package: ${{ inputs.package }}
     - uses: dtolnay/rust-toolchain@stable
       with:
         toolchain: ${{ env.rust-toolchain }}
@@ -62,14 +57,9 @@ jobs:
       with:
         repository: ${{ env.prj-repo }}
         ref: ${{ inputs.ref }}
-    - name: Patch for the commit to be tested
-      if: inputs.package != ''
-      run: |
-        cargo install dependencies-patch
-        dependencies-patch -c . \
-          -n ${{ inputs.package }} \
-          -t git --git-repo ${{ github.repository }} \
-          --commit ${{ github.sha }}
+    - uses: ./.github/workflows/actions/ext-patch
+      with:
+        package: ${{ inputs.package }}
     - uses: dtolnay/rust-toolchain@stable
       with:
         toolchain: ${{ env.rust-toolchain }}