rebase on trunk

Signed-off-by: Dmitry Savintsev <[email protected]>
sigstore · Jun 19, 2024 · f3d55a8 · f3d55a8
1 parent ee2d2a7
commit f3d55a8
Showing 1 changed file with 4 additions and 8 deletions.
diff --git a/.github/workflows/e2e-tests.yml b/.github/workflows/e2e-tests.yml
@@ -63,7 +63,10 @@ jobs:
       - name: Run pkcs11 end-to-end tests
         shell: bash
         run: ./test/e2e_test_pkcs11.sh
-<<<<<<< HEAD
+
+      - name: Run e2e_tsa_certbundle.sh
+        shell: bash
+        run: make && PATH="$PWD:$PATH" ./test/e2e_tsa_certbundle.sh
 
   e2e-kms:
     runs-on: ubuntu-latest
@@ -216,10 +219,3 @@ jobs:
     - name: Collect diagnostics
       if: ${{ failure() }}
       uses: chainguard-dev/actions/kind-diag@84c993eaf02da1c325854fb272a4df9184bd80fc # main
-||||||| parent of 83ab01aa (add functional tests for --ca-roots flag)
-=======
-
-      - name: Run e2e_tsa_certbundle.sh
-        shell: bash
-        run: make && PATH="$PWD:$PATH" ./test/e2e_tsa_certbundle.sh
->>>>>>> 83ab01aa (add functional tests for --ca-roots flag)