refactor and alphabetically arrange matrix jobs

microdev1 · microdev1 · commit 03804e6ec1df · 2023-01-14T20:42:58.000+05:30
diff --git a/.github/workflows/build.yml b/.github/workflows/build.yml
@@ -326,16 +326,16 @@ jobs:
         [ -z "$TWINE_USERNAME" ] || twine upload circuitpython-stubs/dist/*
 
 
-  build-arm:
+  build-aarch:
     runs-on: ubuntu-20.04
     needs: test
-    if: ${{ needs.test.outputs.boards-arm != '[]' }}
+    if: ${{ needs.test.outputs.boards-aarch != '[]' }}
     env:
       CP_VERSION: ${{ needs.test.outputs.cp-version }}
     strategy:
       fail-fast: false
       matrix:
-        board: ${{ fromJSON(needs.test.outputs.boards-arm) }}
+        board: ${{ fromJSON(needs.test.outputs.boards-aarch) }}
     steps:
     - name: Set up repository
       uses: actions/checkout@v3
@@ -360,18 +360,31 @@ jobs:
     - name: CircuitPython dependencies
       id: cp-deps
       run: python tools/ci_fetch_deps.py ${{ matrix.board }}
+    - name: Install dependencies
+      run: |
+        sudo apt-get install -y gettext mtools
+        pip install -r requirements-ci.txt -r requirements-dev.txt
+        wget --no-verbose https://adafruit-circuit-python.s3.amazonaws.com/gcc-arm-10.3-2021.07-x86_64-aarch64-none-elf.tar.xz
+        sudo tar -C /usr --strip-components=1 -xaf gcc-arm-10.3-2021.07-x86_64-aarch64-none-elf.tar.xz
     - uses: carlosperate/arm-none-eabi-gcc-action@v1
       with:
         release: '10-2020-q4'
-    - name: Install dependencies
+    - name: Install mkfs.fat
       run: |
-        sudo apt-get install -y gettext
-        pip install -r requirements-ci.txt -r requirements-dev.txt
+        wget https://github.com/dosfstools/dosfstools/releases/download/v4.2/dosfstools-4.2.tar.gz
+        tar -xaf dosfstools-4.2.tar.gz
+        cd dosfstools-4.2
+        ./configure
+        make -j 2
+        cd src
+        echo >>$GITHUB_PATH $(pwd)
     - name: Versions
       run: |
         gcc --version
+        aarch64-none-elf-gcc --version
         arm-none-eabi-gcc --version
         python3 --version
+        mkfs.fat --version || true
     - name: Build mpy-cross
       if: ${{ steps.cp-deps.outputs.frozen_tags == 'True' }}
       run: make -C mpy-cross -j2
@@ -395,16 +408,16 @@ jobs:
       if: (github.event_name == 'push' && github.ref == 'refs/heads/main' && github.repository_owner == 'adafruit') || (github.event_name == 'release' && (github.event.action == 'published' || github.event.action == 'rerequested'))
 
 
-  build-riscv:
+  build-arm:
     runs-on: ubuntu-20.04
     needs: test
-    if: ${{ needs.test.outputs.boards-riscv != '[]' }}
+    if: ${{ needs.test.outputs.boards-arm != '[]' }}
     env:
       CP_VERSION: ${{ needs.test.outputs.cp-version }}
     strategy:
       fail-fast: false
       matrix:
-        board: ${{ fromJSON(needs.test.outputs.boards-riscv) }}
+        board: ${{ fromJSON(needs.test.outputs.boards-arm) }}
     steps:
     - name: Set up repository
       uses: actions/checkout@v3
@@ -429,16 +442,17 @@ jobs:
     - name: CircuitPython dependencies
       id: cp-deps
       run: python tools/ci_fetch_deps.py ${{ matrix.board }}
+    - uses: carlosperate/arm-none-eabi-gcc-action@v1
+      with:
+        release: '10-2020-q4'
     - name: Install dependencies
       run: |
         sudo apt-get install -y gettext
         pip install -r requirements-ci.txt -r requirements-dev.txt
-        wget https://static.dev.sifive.com/dev-tools/riscv64-unknown-elf-gcc-8.3.0-2019.08.0-x86_64-linux-centos6.tar.gz
-        sudo tar -C /usr --strip-components=1 -xaf riscv64-unknown-elf-gcc-8.3.0-2019.08.0-x86_64-linux-centos6.tar.gz
     - name: Versions
       run: |
         gcc --version
-        riscv64-unknown-elf-gcc --version
+        arm-none-eabi-gcc --version
         python3 --version
     - name: Build mpy-cross
       if: ${{ steps.cp-deps.outputs.frozen_tags == 'True' }}
@@ -568,16 +582,16 @@ jobs:
       if: (github.event_name == 'push' && github.ref == 'refs/heads/main' && github.repository_owner == 'adafruit') || (github.event_name == 'release' && (github.event.action == 'published' || github.event.action == 'rerequested'))
 
 
-  build-aarch:
+  build-riscv:
     runs-on: ubuntu-20.04
     needs: test
-    if: ${{ needs.test.outputs.boards-aarch != '[]' }}
+    if: ${{ needs.test.outputs.boards-riscv != '[]' }}
     env:
       CP_VERSION: ${{ needs.test.outputs.cp-version }}
     strategy:
       fail-fast: false
       matrix:
-        board: ${{ fromJSON(needs.test.outputs.boards-aarch) }}
+        board: ${{ fromJSON(needs.test.outputs.boards-riscv) }}
     steps:
     - name: Set up repository
       uses: actions/checkout@v3
@@ -604,29 +618,15 @@ jobs:
       run: python tools/ci_fetch_deps.py ${{ matrix.board }}
     - name: Install dependencies
       run: |
-        sudo apt-get install -y gettext mtools
+        sudo apt-get install -y gettext
         pip install -r requirements-ci.txt -r requirements-dev.txt
-        wget --no-verbose https://adafruit-circuit-python.s3.amazonaws.com/gcc-arm-10.3-2021.07-x86_64-aarch64-none-elf.tar.xz
-        sudo tar -C /usr --strip-components=1 -xaf gcc-arm-10.3-2021.07-x86_64-aarch64-none-elf.tar.xz
-    - uses: carlosperate/arm-none-eabi-gcc-action@v1
-      with:
-        release: '10-2020-q4'
-    - name: Install mkfs.fat
-      run: |
-        wget https://github.com/dosfstools/dosfstools/releases/download/v4.2/dosfstools-4.2.tar.gz
-        tar -xaf dosfstools-4.2.tar.gz
-        cd dosfstools-4.2
-        ./configure
-        make -j 2
-        cd src
-        echo >>$GITHUB_PATH $(pwd)
+        wget https://static.dev.sifive.com/dev-tools/riscv64-unknown-elf-gcc-8.3.0-2019.08.0-x86_64-linux-centos6.tar.gz
+        sudo tar -C /usr --strip-components=1 -xaf riscv64-unknown-elf-gcc-8.3.0-2019.08.0-x86_64-linux-centos6.tar.gz
     - name: Versions
       run: |
         gcc --version
-        aarch64-none-elf-gcc --version
-        arm-none-eabi-gcc --version
+        riscv64-unknown-elf-gcc --version
         python3 --version
-        mkfs.fat --version || true
     - name: Build mpy-cross
       if: ${{ steps.cp-deps.outputs.frozen_tags == 'True' }}
       run: make -C mpy-cross -j2
