[CI] Checkout main repo before any shell command

arceos-org · Oct 18, 2024 · 76c51dc · 76c51dc
1 parent 2a2e8b2
commit 76c51dc
Show file tree

Hide file tree

Showing 2 changed files with 10 additions and 10 deletions.
diff --git a/.github/workflows/build.yml b/.github/workflows/build.yml
@@ -108,8 +108,6 @@ jobs:
         toolchain: ${{ matrix.rust-toolchain }}
         components: rust-src, llvm-tools
         targets: x86_64-unknown-none, riscv64gc-unknown-none-elf, aarch64-unknown-none, aarch64-unknown-none-softfloat
-    - uses: Swatinem/rust-cache@v2
-    - run: cargo install cargo-binutils
     - uses: actions/checkout@v4
       if: inputs.CallerPackage != ''
       with:
@@ -124,6 +122,8 @@ jobs:
           -n ${{ inputs.CallerPackage }} \
           -t git --git-repo ${{ github.repository }} \
           --commit ${{ github.sha }}
+    - uses: Swatinem/rust-cache@v2
+    - run: cargo install cargo-binutils
     - name: Build helloworld
       continue-on-error: ${{ matrix.rust-toolchain == 'nightly' }}
       run: make ARCH=${{ matrix.arch }} A=examples/helloworld

diff --git a/.github/workflows/test.yml b/.github/workflows/test.yml
@@ -80,14 +80,6 @@ jobs:
       with:
         toolchain: ${{ env.rust-toolchain }}
         components: rust-src
-    - uses: Swatinem/rust-cache@v2
-    - run: cargo install cargo-binutils
-    - uses: ./.github/workflows/actions/setup-qemu
-      with:
-        qemu-version: ${{ env.qemu-version }}
-    - uses: ./.github/workflows/actions/setup-musl
-      with:
-        arch: ${{ matrix.arch }}
     - uses: actions/checkout@v4
       if: inputs.CallerPackage != ''
       with:
@@ -102,6 +94,14 @@ jobs:
           -n ${{ inputs.CallerPackage }} \
           -t git --git-repo ${{ github.repository }} \
           --commit ${{ github.sha }}
+    - uses: Swatinem/rust-cache@v2
+    - run: cargo install cargo-binutils
+    - uses: ./.github/workflows/actions/setup-qemu
+      with:
+        qemu-version: ${{ env.qemu-version }}
+    - uses: ./.github/workflows/actions/setup-musl
+      with:
+        arch: ${{ matrix.arch }}
     - name: Run app tests
       working-directory: ${{ env.WORKING_DIRECTORY }}
       run: |