From 36acd756ce65f42d3c399ea140a33ba6106aa45f Mon Sep 17 00:00:00 2001 From: infra Date: Fri, 27 Sep 2024 02:36:49 -0400 Subject: [PATCH 01/11] fix: add docker-compose tests --- .github/workflows/test_docker_compose.yml | 28 +++++++++++++++++++++++ 1 file changed, 28 insertions(+) create mode 100644 .github/workflows/test_docker_compose.yml diff --git a/.github/workflows/test_docker_compose.yml b/.github/workflows/test_docker_compose.yml new file mode 100644 index 000000000..7a26a9f50 --- /dev/null +++ b/.github/workflows/test_docker_compose.yml @@ -0,0 +1,28 @@ +name: "CI: Test Docker Compose" + +on: + push: + branches: [ main ] + paths: + pull_request: + branches: [ main ] + paths: + - ".github/workflows/test_docker_compose.yml" + - "langsmith-sdk/python/langsmith/cli/docker-compose.yaml" + + +jobs: + + docker-compose: + timeout-minutes: 10 + runs-on: ubuntu-latest + + env: + LANGSMITH_LICENSE_KEY: ${{ secrets.LANGSMITH_LICENSE_KEY }} + + steps: + - name: Checkout + uses: actions/checkout@v1 + + - name: Start containers + run: docker-compose up -e LANGSMITH_LICENSE_KEY=$LANGSMITH_LICENSE_KEY -e API_KEY_SALT="foo" From 87f524e8905043d956ea8e1c00b57b9c0a0b3abd Mon Sep 17 00:00:00 2001 From: infra Date: Fri, 27 Sep 2024 02:43:05 -0400 Subject: [PATCH 02/11] fix: add docker-compose tests --- .github/workflows/test_docker_compose.yml | 2 ++ 1 file changed, 2 insertions(+) diff --git a/.github/workflows/test_docker_compose.yml b/.github/workflows/test_docker_compose.yml index 7a26a9f50..847f2f9c8 100644 --- a/.github/workflows/test_docker_compose.yml +++ b/.github/workflows/test_docker_compose.yml @@ -24,5 +24,7 @@ jobs: - name: Checkout uses: actions/checkout@v1 + - uses: KengoTODA/actions-setup-docker-compose@v1 + - name: Start containers run: docker-compose up -e LANGSMITH_LICENSE_KEY=$LANGSMITH_LICENSE_KEY -e API_KEY_SALT="foo" From b4f9bdb2fb66155c3692cf2bb1e9ba8720fc6ba8 Mon Sep 17 00:00:00 2001 From: infra Date: Fri, 27 Sep 2024 02:49:38 -0400 Subject: [PATCH 03/11] fix: add docker-compose tests --- .github/workflows/test_docker_compose.yml | 2 ++ 1 file changed, 2 insertions(+) diff --git a/.github/workflows/test_docker_compose.yml b/.github/workflows/test_docker_compose.yml index 847f2f9c8..8a7cabcca 100644 --- a/.github/workflows/test_docker_compose.yml +++ b/.github/workflows/test_docker_compose.yml @@ -25,6 +25,8 @@ jobs: uses: actions/checkout@v1 - uses: KengoTODA/actions-setup-docker-compose@v1 + env: + GITHUB_TOKEN: ${{ secrets.GITHUB_TOKEN }} - name: Start containers run: docker-compose up -e LANGSMITH_LICENSE_KEY=$LANGSMITH_LICENSE_KEY -e API_KEY_SALT="foo" From 88b9847112ac06bb98f700c252567a68e54ba865 Mon Sep 17 00:00:00 2001 From: infra Date: Fri, 27 Sep 2024 02:52:18 -0400 Subject: [PATCH 04/11] fix: add docker-compose tests --- .github/workflows/test_docker_compose.yml | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/.github/workflows/test_docker_compose.yml b/.github/workflows/test_docker_compose.yml index 8a7cabcca..8f5499e51 100644 --- a/.github/workflows/test_docker_compose.yml +++ b/.github/workflows/test_docker_compose.yml @@ -29,4 +29,4 @@ jobs: GITHUB_TOKEN: ${{ secrets.GITHUB_TOKEN }} - name: Start containers - run: docker-compose up -e LANGSMITH_LICENSE_KEY=$LANGSMITH_LICENSE_KEY -e API_KEY_SALT="foo" + run: docker compose run -e LANGSMITH_LICENSE_KEY=$LANGSMITH_LICENSE_KEY -e API_KEY_SALT="foo" From c5322d080145c27210c3e222efd7ee3408c9cc0d Mon Sep 17 00:00:00 2001 From: infra Date: Fri, 27 Sep 2024 02:54:28 -0400 Subject: [PATCH 05/11] fix: add docker-compose tests --- .github/workflows/test_docker_compose.yml | 3 ++- 1 file changed, 2 insertions(+), 1 deletion(-) diff --git a/.github/workflows/test_docker_compose.yml b/.github/workflows/test_docker_compose.yml index 8f5499e51..26c54aa80 100644 --- a/.github/workflows/test_docker_compose.yml +++ b/.github/workflows/test_docker_compose.yml @@ -19,6 +19,7 @@ jobs: env: LANGSMITH_LICENSE_KEY: ${{ secrets.LANGSMITH_LICENSE_KEY }} + API_KEY_SALT: test steps: - name: Checkout @@ -29,4 +30,4 @@ jobs: GITHUB_TOKEN: ${{ secrets.GITHUB_TOKEN }} - name: Start containers - run: docker compose run -e LANGSMITH_LICENSE_KEY=$LANGSMITH_LICENSE_KEY -e API_KEY_SALT="foo" + run: docker compose up From c1ced4b2a23030074e86e393ffd7d5425c31c060 Mon Sep 17 00:00:00 2001 From: infra Date: Fri, 27 Sep 2024 02:55:31 -0400 Subject: [PATCH 06/11] fix: add docker-compose tests --- .github/workflows/test_docker_compose.yml | 1 + 1 file changed, 1 insertion(+) diff --git a/.github/workflows/test_docker_compose.yml b/.github/workflows/test_docker_compose.yml index 26c54aa80..dcd81c172 100644 --- a/.github/workflows/test_docker_compose.yml +++ b/.github/workflows/test_docker_compose.yml @@ -30,4 +30,5 @@ jobs: GITHUB_TOKEN: ${{ secrets.GITHUB_TOKEN }} - name: Start containers + working-directory: langsmith-sdk/python/langsmith/cli run: docker compose up From 560ac27da4855d002d086aabfb65406f39a8c822 Mon Sep 17 00:00:00 2001 From: infra Date: Fri, 27 Sep 2024 02:56:55 -0400 Subject: [PATCH 07/11] fix: add docker-compose tests --- .github/workflows/test_docker_compose.yml | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/.github/workflows/test_docker_compose.yml b/.github/workflows/test_docker_compose.yml index dcd81c172..d811beb40 100644 --- a/.github/workflows/test_docker_compose.yml +++ b/.github/workflows/test_docker_compose.yml @@ -8,7 +8,7 @@ on: branches: [ main ] paths: - ".github/workflows/test_docker_compose.yml" - - "langsmith-sdk/python/langsmith/cli/docker-compose.yaml" + - "python/langsmith/cli/docker-compose.yaml" jobs: @@ -30,5 +30,5 @@ jobs: GITHUB_TOKEN: ${{ secrets.GITHUB_TOKEN }} - name: Start containers - working-directory: langsmith-sdk/python/langsmith/cli + working-directory: python/langsmith/cli run: docker compose up From 6d95c172d0ba326a83b4ab65dc17626d4e49209a Mon Sep 17 00:00:00 2001 From: infra Date: Fri, 27 Sep 2024 03:03:12 -0400 Subject: [PATCH 08/11] fix: add docker-compose tests --- .github/workflows/test_docker_compose.yml | 9 ++++++++- 1 file changed, 8 insertions(+), 1 deletion(-) diff --git a/.github/workflows/test_docker_compose.yml b/.github/workflows/test_docker_compose.yml index d811beb40..b828e5626 100644 --- a/.github/workflows/test_docker_compose.yml +++ b/.github/workflows/test_docker_compose.yml @@ -31,4 +31,11 @@ jobs: - name: Start containers working-directory: python/langsmith/cli - run: docker compose up + run: docker compose up -d + + - name: Check frontend health + run: curl localhost:1980/ok + + - name: Check backend health + run: curl localhost:1980/api/info + From 163a2ebf987c1f61fb06572e06a8040fe5cf3074 Mon Sep 17 00:00:00 2001 From: infra Date: Fri, 27 Sep 2024 03:03:30 -0400 Subject: [PATCH 09/11] fix: add docker-compose tests --- .github/workflows/test_docker_compose.yml | 4 ++++ 1 file changed, 4 insertions(+) diff --git a/.github/workflows/test_docker_compose.yml b/.github/workflows/test_docker_compose.yml index b828e5626..184a8f09e 100644 --- a/.github/workflows/test_docker_compose.yml +++ b/.github/workflows/test_docker_compose.yml @@ -11,6 +11,10 @@ on: - "python/langsmith/cli/docker-compose.yaml" +concurrency: + group: "test-docker-compose" + cancel-in-progress: true + jobs: docker-compose: From c305a0189509549cfd685f205218cb0d9ad69675 Mon Sep 17 00:00:00 2001 From: infra Date: Fri, 27 Sep 2024 03:06:05 -0400 Subject: [PATCH 10/11] fix: add docker-compose tests --- .github/workflows/test_docker_compose.yml | 3 --- 1 file changed, 3 deletions(-) diff --git a/.github/workflows/test_docker_compose.yml b/.github/workflows/test_docker_compose.yml index 184a8f09e..8f72c8b44 100644 --- a/.github/workflows/test_docker_compose.yml +++ b/.github/workflows/test_docker_compose.yml @@ -37,9 +37,6 @@ jobs: working-directory: python/langsmith/cli run: docker compose up -d - - name: Check frontend health - run: curl localhost:1980/ok - - name: Check backend health run: curl localhost:1980/api/info From 37f8cebbb3a7aacde544cfd23482c255610a63dd Mon Sep 17 00:00:00 2001 From: infra Date: Fri, 27 Sep 2024 03:07:27 -0400 Subject: [PATCH 11/11] fix: add docker-compose tests --- .github/workflows/test_docker_compose.yml | 3 +++ 1 file changed, 3 insertions(+) diff --git a/.github/workflows/test_docker_compose.yml b/.github/workflows/test_docker_compose.yml index 8f72c8b44..8b67d598a 100644 --- a/.github/workflows/test_docker_compose.yml +++ b/.github/workflows/test_docker_compose.yml @@ -37,6 +37,9 @@ jobs: working-directory: python/langsmith/cli run: docker compose up -d + - name: sleep 30 seconds + run: sleep 30 + - name: Check backend health run: curl localhost:1980/api/info