From 074d8b55c9b8709ba68af65540f60594287460e2 Mon Sep 17 00:00:00 2001 From: Fang-Pen Lin Date: Mon, 12 Jan 2026 14:16:36 -0800 Subject: [PATCH 1/5] Add e2e test ci task --- .github/workflows/e2e-tests.yml | 58 +++++++++++++++++++++++++++++++++ 1 file changed, 58 insertions(+) create mode 100644 .github/workflows/e2e-tests.yml diff --git a/.github/workflows/e2e-tests.yml b/.github/workflows/e2e-tests.yml new file mode 100644 index 00000000..27631649 --- /dev/null +++ b/.github/workflows/e2e-tests.yml @@ -0,0 +1,58 @@ +name: E2E Tests + +on: + pull_request: + types: [opened, synchronize] + paths: + - "e2e/**" + - "packages/**" + - "main.go" + - "go.mod" + - "go.sum" + - ".github/workflows/e2e-tests.yml" + + workflow_dispatch: + + workflow_call: + +jobs: + e2e-tests: + runs-on: ubuntu-latest + timeout-minutes: 30 + + steps: + - name: Checkout code + uses: actions/checkout@v4 + + - name: Set up Go + uses: actions/setup-go@v4 + with: + go-version: "1.25.2" + + - name: Set up Docker Buildx + uses: docker/setup-buildx-action@v3 + + - name: Install dependencies + run: | + sudo apt-get update + sudo apt-get install -y jq + # Docker and Docker Compose are already available in GitHub Actions runners + + - name: Build CLI executable + working-directory: ${{ github.workspace }} + run: | + go build -o infisical-merge ./main.go + chmod +x infisical-merge + + - name: Install e2e dependencies + working-directory: ${{ github.workspace }}/e2e + run: | + go mod download + + - name: Run e2e tests + working-directory: ${{ github.workspace }}/e2e + env: + INFISICAL_CLI_EXECUTABLE: ${{ github.workspace }}/infisical-merge + CLI_E2E_DEFAULT_RUN_METHOD: subprocess + run: | + go test -v -count=1 -timeout=30m ./relay/... From 4ca4276bb1abdcfad5e8b27e7254943004d2a5ba Mon Sep 17 00:00:00 2001 From: Fang-Pen Lin Date: Mon, 12 Jan 2026 14:24:59 -0800 Subject: [PATCH 2/5] Try to fix backend dir missing issue --- .github/workflows/e2e-tests.yml | 8 ++++++++ 1 file changed, 8 insertions(+) diff --git a/.github/workflows/e2e-tests.yml b/.github/workflows/e2e-tests.yml index 27631649..dd728501 100644 --- a/.github/workflows/e2e-tests.yml +++ b/.github/workflows/e2e-tests.yml @@ -24,6 +24,13 @@ jobs: - name: Checkout code uses: actions/checkout@v4 + - name: Checkout another public repo + uses: actions/checkout@v4 + with: + repository: infisical/infisical + path: deps/ + ref: main + - name: Set up Go uses: actions/setup-go@v4 with: @@ -52,6 +59,7 @@ jobs: - name: Run e2e tests working-directory: ${{ github.workspace }}/e2e env: + INFISICAL_BACKEND_DIR: ${{ github.workspace }}/deps/infisical/backend INFISICAL_CLI_EXECUTABLE: ${{ github.workspace }}/infisical-merge CLI_E2E_DEFAULT_RUN_METHOD: subprocess run: | From 46d98855ac46f99fac20f7af9f054ee3b157190a Mon Sep 17 00:00:00 2001 From: Fang-Pen Lin Date: Mon, 12 Jan 2026 14:34:28 -0800 Subject: [PATCH 3/5] ci debug --- .github/workflows/e2e-tests.yml | 10 ++++++++-- 1 file changed, 8 insertions(+), 2 deletions(-) diff --git a/.github/workflows/e2e-tests.yml b/.github/workflows/e2e-tests.yml index dd728501..eea3e10c 100644 --- a/.github/workflows/e2e-tests.yml +++ b/.github/workflows/e2e-tests.yml @@ -24,12 +24,18 @@ jobs: - name: Checkout code uses: actions/checkout@v4 - - name: Checkout another public repo + - name: Checkout infisical repository uses: actions/checkout@v4 with: repository: infisical/infisical path: deps/ - ref: main + ref: main + + - name: debug + run: | + echo "INFISICAL_BACKEND_DIR: ${{ github.workspace }}/deps/infisical/backend" + ls -la ${{ github.workspace }}/deps/ + tree ${{ github.workspace }}/deps/ - name: Set up Go uses: actions/setup-go@v4 From 781d31ca7dc11c0f3b2cfdfaf0ea13c402bd9908 Mon Sep 17 00:00:00 2001 From: Fang-Pen Lin Date: Mon, 12 Jan 2026 14:40:19 -0800 Subject: [PATCH 4/5] Try to fix ci folder path --- .github/workflows/e2e-tests.yml | 8 +------- 1 file changed, 1 insertion(+), 7 deletions(-) diff --git a/.github/workflows/e2e-tests.yml b/.github/workflows/e2e-tests.yml index eea3e10c..50cf8665 100644 --- a/.github/workflows/e2e-tests.yml +++ b/.github/workflows/e2e-tests.yml @@ -28,14 +28,8 @@ jobs: uses: actions/checkout@v4 with: repository: infisical/infisical - path: deps/ + path: deps/infisical/ ref: main - - - name: debug - run: | - echo "INFISICAL_BACKEND_DIR: ${{ github.workspace }}/deps/infisical/backend" - ls -la ${{ github.workspace }}/deps/ - tree ${{ github.workspace }}/deps/ - name: Set up Go uses: actions/setup-go@v4 From 12bf8b78fa456a93f405d6d257b975af19e56475 Mon Sep 17 00:00:00 2001 From: Fang-Pen Lin Date: Mon, 12 Jan 2026 15:11:51 -0800 Subject: [PATCH 5/5] Free up disk space --- .github/workflows/e2e-tests.yml | 8 ++++++++ 1 file changed, 8 insertions(+) diff --git a/.github/workflows/e2e-tests.yml b/.github/workflows/e2e-tests.yml index 50cf8665..5653b2b6 100644 --- a/.github/workflows/e2e-tests.yml +++ b/.github/workflows/e2e-tests.yml @@ -21,6 +21,14 @@ jobs: timeout-minutes: 30 steps: + - name: Free up disk space + run: | + sudo rm -rf /usr/share/dotnet + sudo rm -rf /opt/ghc + sudo rm -rf "/usr/local/share/boost" + sudo rm -rf "$AGENT_TOOLSDIRECTORY" + docker system prune -af + - name: Checkout code uses: actions/checkout@v4