From a91732959bab15bac35df93be059b680a3f9aa84 Mon Sep 17 00:00:00 2001 From: Eli Bosley Date: Mon, 1 May 2023 14:30:26 -0400 Subject: [PATCH] feat: faster builds through concurrency (#634) --- .github/workflows/main.yml | 3 +-- .github/workflows/pull-request.yml | 3 +-- api/src/graphql/client/api/get-api-client.ts | 11 ++++++----- 3 files changed, 8 insertions(+), 9 deletions(-) diff --git a/.github/workflows/main.yml b/.github/workflows/main.yml index 131a43e9c..493fe3538 100644 --- a/.github/workflows/main.yml +++ b/.github/workflows/main.yml @@ -107,7 +107,6 @@ jobs: run: working-directory: api runs-on: ubuntu-latest - needs: [lint-api, test-api] outputs: API_VERSION: ${{ steps.build-pack-binary.outputs.API_VERSION }} @@ -162,11 +161,11 @@ jobs: path: ${{ github.workspace }}/api/deploy/release/*.tgz build-plugin: + needs: [lint-api, test-api, build-api] defaults: run: working-directory: plugin runs-on: ubuntu-latest - needs: [build-api] steps: - name: Set Timezone uses: szenius/set-timezone@v1.2 diff --git a/.github/workflows/pull-request.yml b/.github/workflows/pull-request.yml index ae46fa8d8..08d604744 100644 --- a/.github/workflows/pull-request.yml +++ b/.github/workflows/pull-request.yml @@ -92,7 +92,6 @@ jobs: run: working-directory: api runs-on: ubuntu-latest - needs: [lint-api, test-api] outputs: API_VERSION: ${{ steps.build-pack-binary.outputs.API_VERSION }} @@ -158,7 +157,7 @@ jobs: run: working-directory: plugin runs-on: ubuntu-latest - needs: [build-api] + needs: [lint-api, test-api, build-api] steps: - name: Set Timezone uses: szenius/set-timezone@v1.2 diff --git a/api/src/graphql/client/api/get-api-client.ts b/api/src/graphql/client/api/get-api-client.ts index 5daa09cca..d9159af8c 100644 --- a/api/src/graphql/client/api/get-api-client.ts +++ b/api/src/graphql/client/api/get-api-client.ts @@ -5,9 +5,7 @@ import { split, } from '@apollo/client/core/core.cjs'; import { onError } from '@apollo/client/link/error'; -import { - getInternalApiAddress, -} from '@app/consts'; +import { getInternalApiAddress } from '@app/consts'; import WebSocket from 'ws'; import { fetch } from 'cross-fetch'; import { getMainDefinition } from '@apollo/client/utilities'; @@ -27,11 +25,14 @@ const getWebsocketWithHeaders = () => { }); } }; -} +}; export const getApiApolloClient = ({ upcApiKey }: { upcApiKey: string }) => { const nginxPort = getters?.emhttp()?.nginx?.httpPort ?? 80; - graphqlLogger.debug('Internal GraphQL URL: %s', getInternalApiAddress(true, nginxPort)); + graphqlLogger.debug( + 'Internal GraphQL URL: %s', + getInternalApiAddress(true, nginxPort) + ); const httpLink = new HttpLink({ uri: getInternalApiAddress(true, nginxPort), fetch,