From 4cd6b2075679fa68950d40670eff324b3b967ecc Mon Sep 17 00:00:00 2001 From: Corey Daley Date: Mon, 14 Aug 2023 21:40:46 -0400 Subject: [PATCH 1/3] fix tests --- .github/workflows/e2e.yaml | 6 ++++-- .gitmodules | 12 ------------ Makefile | 2 +- 3 files changed, 5 insertions(+), 15 deletions(-) delete mode 100644 .gitmodules diff --git a/.github/workflows/e2e.yaml b/.github/workflows/e2e.yaml index 2e45b1419..d2e3667ea 100644 --- a/.github/workflows/e2e.yaml +++ b/.github/workflows/e2e.yaml @@ -20,8 +20,9 @@ jobs: steps: - uses: actions/checkout@v3 - with: - submodules: recursive + - name: Setup BATS testing framework + uses: mig4/setup-bats@v1.2.0 + - name: Setup Go and ko uses: ./.github/actions/setup @@ -32,6 +33,7 @@ jobs: cluster_name: kind config: test/kind/config.yaml wait: 120s + - uses: shipwright-io/setup@v1 with: tekton-version: v0.38.3 diff --git a/.gitmodules b/.gitmodules deleted file mode 100644 index e1a519750..000000000 --- a/.gitmodules +++ /dev/null @@ -1,12 +0,0 @@ -[submodule "test/e2e/bats/core"] - path = test/e2e/bats/core - url = https://github.com/bats-core/bats-core -[submodule "test/e2e/bats/support"] - path = test/e2e/bats/support - url = https://github.com/bats-core/bats-support -[submodule "test/e2e/bats/assert"] - path = test/e2e/bats/assert - url = https://github.com/bats-core/bats-assert -[submodule "test/e2e/bats/file"] - path = test/e2e/bats/file - url = https://github.com/bats-core/bats-file diff --git a/Makefile b/Makefile index 07eaa2f4b..503484c33 100644 --- a/Makefile +++ b/Makefile @@ -61,7 +61,7 @@ test-unit: # looks for *.bats files in the test/e2e directory and runs them test-e2e: - ./test/e2e/bats/core/bin/bats --recursive test/e2e/*.bats + bats --recursive test/e2e/*.bats # runs act, with optional arguments .PHONY: act From 4fbbd8409e5968fa96242f4275a78f27d17170f7 Mon Sep 17 00:00:00 2001 From: Corey Daley Date: Mon, 14 Aug 2023 21:51:11 -0400 Subject: [PATCH 2/3] updating --- .github/workflows/e2e.yaml | 8 ++++++-- 1 file changed, 6 insertions(+), 2 deletions(-) diff --git a/.github/workflows/e2e.yaml b/.github/workflows/e2e.yaml index d2e3667ea..6750556ae 100644 --- a/.github/workflows/e2e.yaml +++ b/.github/workflows/e2e.yaml @@ -20,8 +20,12 @@ jobs: steps: - uses: actions/checkout@v3 - - name: Setup BATS testing framework - uses: mig4/setup-bats@v1.2.0 + - name: Setup Bats and libs + uses: brokenpip3/setup-bats-libs@1.5.0 + with: + assert-path: ${{ github.workspace }}/bats/assert + file-path: ${{ github.workspace }}/bats/file + support-path: ${{ github.workspace }}/bats/support - name: Setup Go and ko uses: ./.github/actions/setup From 9122a60eed42ee2c8389f55040d912156b7b5c0c Mon Sep 17 00:00:00 2001 From: Corey Daley Date: Mon, 14 Aug 2023 21:53:07 -0400 Subject: [PATCH 3/3] updating --- .github/workflows/e2e.yaml | 6 +++--- 1 file changed, 3 insertions(+), 3 deletions(-) diff --git a/.github/workflows/e2e.yaml b/.github/workflows/e2e.yaml index 6750556ae..d65cb20e3 100644 --- a/.github/workflows/e2e.yaml +++ b/.github/workflows/e2e.yaml @@ -23,9 +23,9 @@ jobs: - name: Setup Bats and libs uses: brokenpip3/setup-bats-libs@1.5.0 with: - assert-path: ${{ github.workspace }}/bats/assert - file-path: ${{ github.workspace }}/bats/file - support-path: ${{ github.workspace }}/bats/support + assert-path: ${{ github.workspace }}/test/e2e/bats/assert + file-path: ${{ github.workspace }}/test/e2e/bats/file + support-path: ${{ github.workspace }}/test/e2e/bats/support - name: Setup Go and ko uses: ./.github/actions/setup