use same version as master for test.yaml

rancher · Jul 31, 2024 · a6e3c4f · a6e3c4f
1 parent e9f5724
commit a6e3c4f
Showing 1 changed file with 35 additions and 13 deletions.
diff --git a/.github/workflows/test.yaml b/.github/workflows/test.yaml
@@ -178,6 +178,7 @@ jobs:
       - uses: actions/checkout@v3
         with:
           fetch-depth: 1
+<<<<<<< HEAD
 <<<<<<< HEAD
       - uses: actions/setup-node@v4
         with:
@@ -198,6 +199,11 @@ jobs:
         with:
           node-version: '16.x'
 >>>>>>> f0bfe54175 (comment workflows)
+=======
+      - uses: actions/setup-node@v4
+        with:
+          node-version-file: '.nvmrc'
+>>>>>>> 46989f9ad6 (use same version as master for test.yaml)
 
       - name: Install packages
         run: yarn install:ci
@@ -262,6 +268,7 @@ jobs:
       - name: Run tests
         uses: ./.github/actions/lint
 <<<<<<< HEAD
+<<<<<<< HEAD
 >>>>>>> f0bfe54175 (comment workflows)
 
 =======
@@ -274,21 +281,32 @@ jobs:
       - uses: actions/checkout@v3
         with:
           fetch-depth: 1
+=======
+>>>>>>> 46989f9ad6 (use same version as master for test.yaml)
 
-      - uses: actions/setup-node@v3
-        with:
-          node-version: '16.x'
+  # coverage:
+  #   runs-on: ubuntu-latest
+  #   needs:
+  #     - unit-test
+  #   steps:
+  #     - uses: actions/checkout@v3
+  #       with:
+  #         fetch-depth: 1
 
-      - name: Download Coverage Artifacts
-        uses: actions/download-artifact@v3
-        with:
-          name: ${{github.run_number}}-${{github.run_attempt}}-coverage
+  #     - uses: actions/setup-node@v4
+  #       with:
+  #         node-version-file: '.nvmrc'
 
-      - name: Install Codecov CLI
-        run : .github/workflows/scripts/install-codecov.sh
+  #     - name: Download Coverage Artifacts
+  #       uses: actions/download-artifact@v3
+  #       with:
+  #         name: ${{github.run_number}}-${{github.run_attempt}}-coverage
 
-      - name: Upload tests coverage report to Codecov
-        run: ./codecov --verbose upload-process -t ${{ secrets.CODECOV_TOKEN }} -n ${{github.run_number}}-${{github.run_attempt}}-coverage -F unit -f ./coverage/coverage-unit.json
+  #     - name: Install Codecov CLI
+  #       run : .github/workflows/scripts/install-codecov.sh
+
+  #     - name: Upload tests coverage report to Codecov
+  #       run: ./codecov --verbose upload-process -t ${{ secrets.CODECOV_TOKEN }} -n ${{github.run_number}}-${{github.run_attempt}}-coverage -F unit -f ./coverage/coverage-unit.json
 
 <<<<<<< HEAD
 >>>>>>> 7cea97aad2 (comment workflows)
@@ -315,10 +333,14 @@ jobs:
       - uses: actions/checkout@v3
         with:
           fetch-depth: 1
-      - uses: actions/setup-node@v3
+      - uses: actions/setup-node@v4
         with:
-          node-version: '16.x'
+          node-version-file: '.nvmrc'
       - name: Check e2e tags
         run: |
+<<<<<<< HEAD
           ./scripts/check-e2e-tests-for-tags
 >>>>>>> f0bfe54175 (comment workflows)
+=======
+          ./scripts/check-e2e-tests-for-tags
+>>>>>>> 46989f9ad6 (use same version as master for test.yaml)