Merge pull request #2301 from demergent-labs/more_steps

break up longer steps into smaller steps
demergent-labs · Dec 9, 2024 · d4ce962 · d4ce962
2 parents f27a1e8 + 73ce5d7
commit d4ce962
Show file tree

Hide file tree

Showing 4 changed files with 36 additions and 37 deletions.
diff --git a/.github/workflows/benchmark_parallel.yml b/.github/workflows/benchmark_parallel.yml
@@ -66,13 +66,14 @@ jobs:
 
             - uses: ./.github/actions/setup_dfx
 
-            - name: Install dependencies
-              run: |
-                  npm install
-                  npm link
-                  cd ${{ matrix.test.path }}
-                  npm install
-                  npm link azle
+            - run: npm install
+            - run: npm link
+
+            - run: npm install
+              working-directory: ${{ matrix.test.path }}
+
+            - run: npm link azle
+              working-directory: ${{ matrix.test.path }}
 
             - name: Start dfx with artificial delay 0
               working-directory: ${{ matrix.test.path }}

diff --git a/.github/workflows/create_branch_prefix.yml b/.github/workflows/create_branch_prefix.yml
@@ -45,6 +45,6 @@ jobs:
                   gpg_signing_key: ${{ secrets.GPG_SIGNING_KEY }}
 
             - name: Create base branch
-              run: |
-                  git checkout -b ${{ steps.create-prefix.outputs.base-branch }}
-                  git push origin ${{ steps.create-prefix.outputs.base-branch }}
+              run: git checkout -b ${{ steps.create-prefix.outputs.base-branch }}
+
+            - run: git push origin ${{ steps.create-prefix.outputs.base-branch }}
diff --git a/.github/workflows/release.yml b/.github/workflows/release.yml
@@ -81,8 +81,12 @@ jobs:
                   sed -E -i "s/(\"version\": \")(.*)(\")/\1$VERSION\3/" package.json
                   sed -E -i "s/(\"version\": \")(.*)(\")/\1$VERSION\3/" dfx_extension/extension.json
                   npm install
-                  AZLE_VERBOSE=true npx azle template
-                  AZLE_VERBOSE=true npx azle template --experimental
+
+            - name: Build stable template
+              run: AZLE_VERBOSE=true npx azle template
+
+            - name: Build experimental template
+              run: AZLE_VERBOSE=true npx azle template --experimental
 
             - uses: ./.github/actions/commit_and_push
               with:
@@ -129,12 +133,15 @@ jobs:
 
             - uses: ./.github/actions/setup_dfx
 
+            - run: npm install
+
             - name: Update azle version
+              working-directory: ${{ matrix.test.path }}
               run: |
-                  npm install
-                  cd ${{ matrix.test.path }}
                   sed -E -i "s/(\"azle\": \")(.*)(\")/\1${{ inputs.release-version }}\3/" package.json
-                  npm install
+
+            - run: npm install
+              working-directory: ${{ matrix.test.path }}
 
             - name: Start dfx with artificial delay 0
               working-directory: ${{ matrix.test.path }}

diff --git a/.github/workflows/run_test.yml b/.github/workflows/run_test.yml
@@ -78,33 +78,26 @@ jobs:
 
             - uses: ./.github/actions/setup_dfx
 
-            - name: Run pre-test Azle setup
-              run: |
-                  # MacOS-specific DNS configuration
-                  if [[ "${{ matrix.os }}" == "macos-latest" ]]; then
-                      sudo networksetup -setdnsservers Ethernet 9.9.9.9
-                  fi
+            - name: Configure MacOS DNS (if needed)
+              if: matrix.os == 'macos-latest'
+              run: sudo networksetup -setdnsservers Ethernet 9.9.9.9
 
-                  npm install
+            - run: npm install
 
-                  if [[ "${{ matrix.azle_source }}" == "repo" ]]; then
-                      npm link
-                  fi
+            - run: npm link
+              if: matrix.azle_source == 'repo'
 
-                  npm run lint
-              shell: bash -l {0}
+            - run: npm run lint
 
-            - name: Run pre-test setup for ${{ matrix.test.name }}
-              run: |
-                  npm install
+            - run: npm install
+              working-directory: ${{ matrix.test.path }}
 
-                  if [[ "${{ matrix.azle_source }}" == "repo" ]]; then
-                      npm link azle
-                  fi
+            - run: npm link azle
+              if: matrix.azle_source == 'repo'
+              working-directory: ${{ matrix.test.path }}
 
-                  npx azle install-dfx-extension
+            - run: npx azle install-dfx-extension
               working-directory: ${{ matrix.test.path }}
-              shell: bash -l {0}
 
             - name: Start dfx with artificial delay 0
               if: ${{ steps.set-conditions.outputs.is_feature_branch_pr == 'true' || steps.set-conditions.outputs.is_feature_branch_draft_pr == 'true' }}
@@ -143,7 +136,6 @@ jobs:
 
                   echo "Running tests $RUNS times"
                   echo "runs=$RUNS" >> $GITHUB_OUTPUT
-              shell: bash -l {0}
 
             - name: Run tests
               run: |
@@ -155,7 +147,6 @@ jobs:
                   else
                       exit $exit_code
                   fi
-              shell: bash -l {0}
               working-directory: ${{ matrix.test.path }}
               env:
                   AZLE_PROPTEST_NUM_RUNS: ${{ steps.calc-runs.outputs.runs }}