update

rancher · Jul 31, 2024 · 4cd3724 · 4cd3724
1 parent a6e3c4f
commit 4cd3724
Showing 1 changed file with 1 addition and 113 deletions.
diff --git a/.github/workflows/test.yaml b/.github/workflows/test.yaml
@@ -168,42 +168,15 @@ jobs:
       - name: Run i18n lint
         uses: ./.github/actions/i18n-lint
 
-<<<<<<< HEAD
-<<<<<<< HEAD
-=======
->>>>>>> f0bfe54175 (comment workflows)
   check-i18n:
     runs-on: ubuntu-latest
     steps:
       - uses: actions/checkout@v3
         with:
           fetch-depth: 1
-<<<<<<< HEAD
-<<<<<<< HEAD
       - uses: actions/setup-node@v4
         with:
           node-version-file: '.nvmrc'
-=======
-#   check-i18n:
-#     runs-on: ubuntu-latest
-#     steps:
-#       - uses: actions/checkout@v3
-#         with:
-#           fetch-depth: 1
-#       - uses: actions/setup-node@v3
-#         with:
-#           node-version: '16.x'
->>>>>>> d05c7b9587 (bind to only v2.9 to check if tests pass + comment other workflows)
-=======
-      - uses: actions/setup-node@v3
-        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
@@ -220,69 +193,8 @@ jobs:
         with:
           fetch-depth: 1
 
-<<<<<<< HEAD
-#       - name: Run tests
-#         uses: ./.github/actions/lint
-<<<<<<< HEAD
-
-<<<<<<< HEAD
-  # coverage:
-  #   runs-on: ubuntu-latest
-  #   needs:
-  #     - unit-test
-  #   steps:
-  #     - uses: actions/checkout@v3
-  #       with:
-  #         fetch-depth: 1
-
-  #     - uses: actions/setup-node@v4
-  #       with:
-  #         node-version-file: '.nvmrc'
-
-  #     - name: Download Coverage Artifacts
-  #       uses: actions/download-artifact@v3
-  #       with:
-  #         name: ${{github.run_number}}-${{github.run_attempt}}-coverage
-
-  #     - 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
-
-  check-e2e-tags:
-    runs-on: ubuntu-latest
-    steps:
-      - uses: actions/checkout@v3
-        with:
-          fetch-depth: 1
-      - uses: actions/setup-node@v4
-        with:
-          node-version-file: '.nvmrc'
-      - name: Check e2e tags
-        run: |
-          ./scripts/check-e2e-tests-for-tags
-=======
-=======
-=======
       - name: Run tests
         uses: ./.github/actions/lint
-<<<<<<< HEAD
-<<<<<<< HEAD
->>>>>>> f0bfe54175 (comment workflows)
-
-=======
->>>>>>> 15910841c9 (see if setup runs)
-  coverage:
-    runs-on: ubuntu-latest
-    needs:
-      - unit-test
-    steps:
-      - uses: actions/checkout@v3
-        with:
-          fetch-depth: 1
-=======
->>>>>>> 46989f9ad6 (use same version as master for test.yaml)
 
   # coverage:
   #   runs-on: ubuntu-latest
@@ -308,25 +220,6 @@ jobs:
   #     - 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)
-#   check-e2e-tags:
-#     runs-on: ubuntu-latest
-#     steps:
-#       - uses: actions/checkout@v3
-#         with:
-#           fetch-depth: 1
-#       - uses: actions/setup-node@v3
-#         with:
-#           node-version: '16.x'
-#       - name: Check e2e tags
-#         run: |
-#           ./scripts/check-e2e-tests-for-tags
-<<<<<<< HEAD
->>>>>>> d05c7b9587 (bind to only v2.9 to check if tests pass + comment other workflows)
-=======
->>>>>>> 7cea97aad2 (comment workflows)
-=======
   check-e2e-tags:
     runs-on: ubuntu-latest
     steps:
@@ -338,9 +231,4 @@ jobs:
           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)
+          ./scripts/check-e2e-tests-for-tags