Sort steps

zdharma-continuum · Nov 16, 2021 · 437b071 · 437b071
1 parent e099e23
commit 437b071
Showing 1 changed file with 24 additions and 24 deletions.
diff --git a/.github/workflows/installer.yaml b/.github/workflows/installer.yaml
@@ -30,13 +30,6 @@ jobs:
       - name: Grab git slugs (short commit id, branch etc.)
         uses: rlespinasse/github-slug-action@v3.x
 
-      - name: Install dependencies (windows)
-        if: startsWith(matrix.os, 'windows')
-        uses: egor-tensin/setup-cygwin@v3
-        with:
-          platform: x64
-          packages: curl git zsh
-
       - name: Install dependencies (ubuntu)
         if: startsWith(matrix.os, 'ubuntu-latest')
         run: |
@@ -48,6 +41,13 @@ jobs:
         run: |
           brew install curl git zsh
 
+      - name: Install dependencies (windows)
+        if: startsWith(matrix.os, 'windows')
+        uses: egor-tensin/setup-cygwin@v3
+        with:
+          platform: x64
+          packages: curl git zsh
+
       - name: Install zinit (linux/macOS, with annexes)
         if: matrix.annexes == 'with-annexes' && !startsWith(matrix.os, 'windows')
         run: |
@@ -103,12 +103,6 @@ jobs:
             ~/.zshrc
             ~/.local/share/zinit
 
-      - name: Test zinit install (linux/macOS)
-        if: "!startsWith(matrix.os, 'windows')"
-        run: |
-          export TERM=xterm
-          zsh -silc 'zinit --help; exit $?'
-
       - name: Upload zshrc and zinit files (windows)
         if: startsWith(matrix.os, 'windows')
         uses: actions/upload-artifact@v2
@@ -120,6 +114,12 @@ jobs:
             C:\tools\cygwin\home\runneradmin\.zshrc
             C:\tools\cygwin\home\runneradmin\.local\.share\zinit\zinit.git
 
+      - name: Test zinit install (linux/macOS)
+        if: "!startsWith(matrix.os, 'windows')"
+        run: |
+          export TERM=xterm
+          zsh -silc 'zinit --help; exit $?'
+
       - name: Test zinit install (windows)
         shell: C:\tools\cygwin\bin\bash.exe --login --norc -eo pipefail -o igncr '{0}'
         if: startsWith(matrix.os, 'windows')
@@ -164,7 +164,7 @@ jobs:
           platform: x64
           packages: curl git zsh
 
-      - name: Install previous zinit version (${{ github.event.before }})
+      - name: Install previous zinit version (linux/macOS, ${{ github.event.before }})
         if: "!startsWith(matrix.os, 'windows')"
         env:
           PREVIOUS_COMMIT: ${{ github.event.before }}
@@ -176,16 +176,6 @@ jobs:
 
           ./scripts/install.sh
 
-      - name: Update zinit from ${{ github.event.before }} to ${{ github.sha }}
-        if: "!startsWith(matrix.os, 'windows')"
-        run: |
-          export ZINIT_COMMIT="$GITHUB_SHA"
-          export ZINIT_REPO="$GITHUB_REPOSITORY"
-          export ZINIT_BRANCH="$GITHUB_REF_SLUG"
-          export NO_INPUT=true
-
-          ./scripts/install.sh
-
       - name: Install previous zinit version (windows, ${{ github.event.before }})
         if: startsWith(matrix.os, 'windows')
         env:
@@ -200,6 +190,16 @@ jobs:
           cd ${GITHUB_WORKSPACE}
           ./scripts/install.sh
 
+      - name: Update zinit from ${{ github.event.before }} to ${{ github.sha }} (linux/macOS)
+        if: "!startsWith(matrix.os, 'windows')"
+        run: |
+          export ZINIT_COMMIT="$GITHUB_SHA"
+          export ZINIT_REPO="$GITHUB_REPOSITORY"
+          export ZINIT_BRANCH="$GITHUB_REF_SLUG"
+          export NO_INPUT=true
+
+          ./scripts/install.sh
+
       - name: Update zinit from ${{ github.event.before }} to ${{ github.sha }} (windows)
         if: startsWith(matrix.os, 'windows')
         shell: C:\tools\cygwin\bin\bash.exe --login --norc -eo pipefail -o igncr '{0}'