Try again.

cross-rs · Jun 28, 2022 · 1d272a7 · 1d272a7
1 parent fbfb7a0
commit 1d272a7
Showing 1 changed file with 4 additions and 17 deletions.
diff --git a/.github/workflows/ci.yml b/.github/workflows/ci.yml
@@ -204,22 +204,7 @@ jobs:
             - { target: thumbv7em-none-eabi,              os: ubuntu-latest,                    std: 1 }
             - { target: thumbv7em-none-eabihf,            os: ubuntu-latest,                    std: 1 }
             - { target: thumbv7m-none-eabi,               os: ubuntu-latest,                    std: 1 }
-
-  build-cross:
-    name: Build Cross
-    runs-on: ubuntu-latest
-    needs: [shellcheck, test, generate-matrix, check]
-    steps:
-      - uses: actions/checkout@v3
-      - uses: ./.github/actions/setup-rust
-
-      - name: Build xtask
-        run: cargo build -p xtask
-
-      - name: Build Docker image
-        id: build-docker-image
-        timeout-minutes: 15
-        run: cargo xtask build-docker-image cross
+            - { target: cross,                            os: ubuntu-latest }
 
   build:
     name: target (${{ matrix.pretty }},${{ matrix.os }})
@@ -278,6 +263,7 @@ jobs:
         shell: bash
       - name: Set Docker image for test
         if: steps.prepare-meta.outputs.has-image
+        if: ${{ matrix.target != 'cross' }}
         run: |
           TARGET_VAR="cross_target_${TARGET//-/_}_image"
           echo "${TARGET_VAR^^}=${IMAGE}" | tee -a "${GITHUB_ENV}"
@@ -287,6 +273,7 @@ jobs:
         shell: bash
       - name: Test Image
         if: steps.prepare-meta.outputs.has-image && (github.ref == 'refs/heads/staging' || github.ref == 'refs/heads/trying')
+        if: ${{ matrix.target != 'cross' }}
         run: ./ci/test.sh
         env:
           TARGET: ${{ matrix.target }}
@@ -325,7 +312,7 @@ jobs:
         shell: bash
 
   publish:
-    needs: [build, check, build-cross]
+    needs: [build, check]
     runs-on: ubuntu-latest
     steps:
       - uses: actions/checkout@v3