From 1e071d7a750cbcfdab9ffde9779072035e1ce2d4 Mon Sep 17 00:00:00 2001 From: einhornimmond Date: Fri, 24 Jan 2025 14:06:12 +0100 Subject: [PATCH] next try fixing worker --- .github/workflows/test_backend.yml | 4 ++-- .github/workflows/test_dht_node.yml | 2 +- dht-node/Dockerfile | 9 +++------ federation/Dockerfile | 9 +++------ 4 files changed, 9 insertions(+), 15 deletions(-) diff --git a/.github/workflows/test_backend.yml b/.github/workflows/test_backend.yml index ed20f91bb..23379fc0f 100644 --- a/.github/workflows/test_backend.yml +++ b/.github/workflows/test_backend.yml @@ -54,7 +54,7 @@ jobs: run: docker compose -f docker-compose.yml -f docker-compose.test.yml up --detach --no-deps database - name: Backend | Unit tests - run: cd database && yarn && yarn build && cd ../backend && yarn && yarn test + run: cd database && yarn && cd ../config && yarn install && yarn build && cd ../backend && yarn && yarn test lint: if: needs.files-changed.outputs.backend == 'true' @@ -66,7 +66,7 @@ jobs: uses: actions/checkout@v3 - name: Backend | Lint - run: cd database && yarn && cd ../backend && yarn && yarn run lint + run: cd database && yarn && cd ../config && yarn install && cd ../backend && yarn && yarn run lint locales: if: needs.files-changed.outputs.backend == 'true' diff --git a/.github/workflows/test_dht_node.yml b/.github/workflows/test_dht_node.yml index 5452d3f0b..2bbbd5e6d 100644 --- a/.github/workflows/test_dht_node.yml +++ b/.github/workflows/test_dht_node.yml @@ -51,7 +51,7 @@ jobs: uses: actions/checkout@v3 - name: Lint - run: cd database && yarn && cd ../dht-node && yarn && yarn run lint + run: cd database && yarn && cd ../config && yarn install && cd ../dht-node && yarn && yarn run lint unit_test: name: Unit Tests - DHT Node diff --git a/dht-node/Dockerfile b/dht-node/Dockerfile index 899a4a980..9c97f73b3 100644 --- a/dht-node/Dockerfile +++ b/dht-node/Dockerfile @@ -74,24 +74,21 @@ COPY ./database/ ../database/ # Copy everything from config COPY ./config/ ../config/ +# yarn install and build config +RUN cd ../config && yarn install --production=false --frozen-lockfile --non-interactive && yarn run build + # yarn install dht-node RUN yarn install --production=false --frozen-lockfile --non-interactive # yarn install database RUN cd ../database && yarn install --production=false --frozen-lockfile --non-interactive -# yarn install config -RUN cd ../config && yarn install --production=false --frozen-lockfile --non-interactive - # yarn build RUN yarn run build # yarn build database RUN cd ../database && yarn run build -# yarn build config -RUN cd ../config && yarn run build - ################################################################################## # TEST ########################################################################### ################################################################################## diff --git a/federation/Dockerfile b/federation/Dockerfile index a6f95bf3b..bd472a5cc 100644 --- a/federation/Dockerfile +++ b/federation/Dockerfile @@ -71,24 +71,21 @@ COPY ./database/ ../database/ # Copy everything from config COPY ./config/ ../config/ +# yarn install and build config +RUN cd ../config && yarn install --production=false --frozen-lockfile --non-interactive && yarn run build + # yarn install federation RUN yarn install --production=false --frozen-lockfile --non-interactive # yarn install database RUN cd ../database && yarn install --production=false --frozen-lockfile --non-interactive -# yarn install config -RUN cd ../config && yarn install --production=false --frozen-lockfile --non-interactive - # yarn build RUN yarn run build # yarn build database RUN cd ../database && yarn run build -# yarn build config -RUN cd ../config && yarn run build - ################################################################################## # TEST ########################################################################### ##################################################################################