diff --git a/.github/workflows/test.yml b/.github/workflows/test.yml index 87728be..6119e51 100644 --- a/.github/workflows/test.yml +++ b/.github/workflows/test.yml @@ -16,6 +16,18 @@ jobs: integration: name: Integration runs-on: ubuntu-latest + env: + XMTP_NODE_URL: http://node:5555 + NOTIFICATION_SERVER_URL: http://notification_server:8080 steps: - - uses: actions/checkout@v3 + - uses: actions/checkout@v4 - run: ./dev/integration + - uses: oven-sh/setup-bun@v2 + with: + bun-version: latest + - name: Install dependencies + working-directory: ./integration + run: bun install + - name: Run tests + working-directory: ./integration + run: bun test diff --git a/dev/integration b/dev/integration index 174c7ab..fb57fc5 100755 --- a/dev/integration +++ b/dev/integration @@ -2,5 +2,4 @@ set -eou pipefail docker compose up -d node -docker compose up integration -exit $? +docker compose up -d notification_server diff --git a/docker-compose.yml b/docker-compose.yml index 2d1fed2..a6c6392 100644 --- a/docker-compose.yml +++ b/docker-compose.yml @@ -48,21 +48,3 @@ services: - --http-delivery - --http-delivery-address=http://integration:7777/post - --api-port=8080 - - integration: - build: - context: ./integration - dockerfile: Dockerfile - expose: - - 7777 - volumes: - - ./integration/src:/usr/app/src:ro - depends_on: - - node - - notification_server - environment: - - XMTP_NODE_URL=http://node:5555 - - NOTIFICATION_SERVER_URL=http://notification_server:8080 - command: - - bun - - test diff --git a/integration/Dockerfile b/integration/Dockerfile deleted file mode 100644 index baa60ef..0000000 --- a/integration/Dockerfile +++ /dev/null @@ -1,22 +0,0 @@ -FROM oven/bun:1 AS base -WORKDIR /usr/app - -# FROM base AS install -# RUN mkdir -p /temp/dev -# COPY package.json bun.lockb /temp/dev/ -# RUN cd /temp/dev && bun install --frozen-lockfile - -FROM base -RUN bun install -g yarn -# COPY --from=install /temp/dev/node_modules node_modules -COPY . . -RUN yarn install; bun install - -USER bun -EXPOSE 7777/tcp - -# Add these debug commands before the entrypoint -RUN ls -la /usr/app/node_modules/@xmtp -RUN find /usr/app/node_modules -name "*linux-x64-gnu*" - -ENTRYPOINT [ "bun", "test" ]