ci: reorder jobs, don't make native linux depend on tier 2 tests

rust-lang · Aug 29, 2024 · 2e4e0ed · 2e4e0ed
1 parent 4406ec2
commit 2e4e0ed
Showing 1 changed file with 76 additions and 76 deletions.
diff --git a/.github/workflows/full_ci.yml b/.github/workflows/full_ci.yml
@@ -6,21 +6,78 @@ on:
     types: [opened, synchronize, reopened]
 
 jobs:
-  docker_linux_tier1:
-    name: Docker Linux Tier1
+  style_check:
+    name: Style check
     runs-on: ubuntu-22.04
+    steps:
+      - uses: actions/checkout@v4
+      - name: Setup Rust toolchain
+        run: sh ./ci/install-rust.sh
+      - name: Check style
+        run: sh ci/style.sh
+
+  build_channels_linux:
+    name: Build Channels Linux
+    runs-on: ubuntu-22.04
+    env:
+      OS: linux
+    strategy:
+      fail-fast: true
+      max-parallel: 5
+      matrix:
+        toolchain:
+          - stable
+          - beta
+          - nightly
+          - 1.63.0
+    steps:
+      - uses: actions/checkout@v4
+      - name: Setup Rust toolchain
+        run: TOOLCHAIN=${{ matrix.toolchain }} sh ./ci/install-rust.sh
+      - name: Execute build.sh
+        run: LIBC_CI=1 TOOLCHAIN=${{ matrix.toolchain }} sh ./ci/build.sh
+
+  build_channels_macos:
+    name: Build Channels macOS
+    needs: macos
+    env:
+      OS: macos
     strategy:
       fail-fast: true
+      max-parallel: 4
       matrix:
         target:
-          - i686-unknown-linux-gnu
-          - x86_64-unknown-linux-gnu
+          - { toolchain: stable, os: macos-14 }
+          - { toolchain: beta, os: macos-14 }
+          - { toolchain: nightly, os: macos-14 }
+          - { toolchain: 1.63.0, os: macos-14 }
+    runs-on: ${{ matrix.target.os }}
     steps:
       - uses: actions/checkout@v4
       - name: Setup Rust toolchain
-        run: TARGET=${{ matrix.target }} sh ./ci/install-rust.sh
-      - name: Execute run-docker.sh
-        run: LIBC_CI=1 sh ./ci/run-docker.sh ${{ matrix.target }}
+        run: TOOLCHAIN=${{ matrix.target.toolchain }} sh ./ci/install-rust.sh
+      - name: Execute build.sh
+        run: LIBC_CI=1 TOOLCHAIN=${{ matrix.target.toolchain }} sh ./ci/build.sh
+
+  build_channels_windows:
+    name: Build Channels Windows
+    runs-on: windows-2022
+    env:
+      OS: windows
+    strategy:
+      fail-fast: true
+      matrix:
+        toolchain:
+          - 1.63.0
+          - stable
+    steps:
+      - uses: actions/checkout@v4
+      - name: Self-update rustup
+        run: rustup self update
+        shell: bash
+      - name: Execute build.sh
+        run: LIBC_CI=1 TOOLCHAIN=${{ matrix.toolchain }} sh ./ci/build.sh
+        shell: bash
 
   macos:
     name: macOS
@@ -69,15 +126,22 @@ jobs:
         run: LIBC_CI=1 sh ./ci/run.sh ${{ matrix.target }}
         shell: bash
 
-  style_check:
-    name: Style check
+
+  docker_linux_tier1:
+    name: Docker Linux Tier1
     runs-on: ubuntu-22.04
+    strategy:
+      fail-fast: true
+      matrix:
+        target:
+          - i686-unknown-linux-gnu
+          - x86_64-unknown-linux-gnu
     steps:
       - uses: actions/checkout@v4
       - name: Setup Rust toolchain
-        run: sh ./ci/install-rust.sh
-      - name: Check style
-        run: sh ci/style.sh
+        run: TARGET=${{ matrix.target }} sh ./ci/install-rust.sh
+      - name: Execute run-docker.sh
+        run: LIBC_CI=1 sh ./ci/run-docker.sh ${{ matrix.target }}
 
   docker_linux_tier2:
     name: Docker Linux Tier2
@@ -119,70 +183,6 @@ jobs:
       - name: Execute run-docker.sh
         run: LIBC_CI=1 sh ./ci/run-docker.sh ${{ matrix.target }}
 
-  build_channels_linux:
-    name: Build Channels Linux
-    needs: docker_linux_tier2
-    runs-on: ubuntu-22.04
-    env:
-      OS: linux
-    strategy:
-      fail-fast: true
-      max-parallel: 5
-      matrix:
-        toolchain:
-          - stable
-          - beta
-          - nightly
-          - 1.63.0
-    steps:
-      - uses: actions/checkout@v4
-      - name: Setup Rust toolchain
-        run: TOOLCHAIN=${{ matrix.toolchain }} sh ./ci/install-rust.sh
-      - name: Execute build.sh
-        run: LIBC_CI=1 TOOLCHAIN=${{ matrix.toolchain }} sh ./ci/build.sh
-
-  build_channels_macos:
-    name: Build Channels macOS
-    needs: macos
-    env:
-      OS: macos
-    strategy:
-      fail-fast: true
-      max-parallel: 4
-      matrix:
-        target:
-          - { toolchain: stable, os: macos-14 }
-          - { toolchain: beta, os: macos-14 }
-          - { toolchain: nightly, os: macos-14 }
-          - { toolchain: 1.63.0, os: macos-14 }
-    runs-on: ${{ matrix.target.os }}
-    steps:
-      - uses: actions/checkout@v4
-      - name: Setup Rust toolchain
-        run: TOOLCHAIN=${{ matrix.target.toolchain }} sh ./ci/install-rust.sh
-      - name: Execute build.sh
-        run: LIBC_CI=1 TOOLCHAIN=${{ matrix.target.toolchain }} sh ./ci/build.sh
-
-  build_channels_windows:
-    name: Build Channels Windows
-    runs-on: windows-2022
-    env:
-      OS: windows
-    strategy:
-      fail-fast: true
-      matrix:
-        toolchain:
-          - 1.63.0
-          - stable
-    steps:
-      - uses: actions/checkout@v4
-      - name: Self-update rustup
-        run: rustup self update
-        shell: bash
-      - name: Execute build.sh
-        run: LIBC_CI=1 TOOLCHAIN=${{ matrix.toolchain }} sh ./ci/build.sh
-        shell: bash
-
   check_cfg:
     name: "Check #[cfg]s"
     runs-on: ubuntu-22.04