From 048e9d3cbde9d5b73cf1b970a8832d04ea646579 Mon Sep 17 00:00:00 2001 From: Hayden Briese Date: Wed, 25 Oct 2023 20:01:44 +1100 Subject: [PATCH 1/5] App web build script --- app/package.json | 1 + 1 file changed, 1 insertion(+) diff --git a/app/package.json b/app/package.json index 3603614d4..5a7f97ee6 100644 --- a/app/package.json +++ b/app/package.json @@ -5,6 +5,7 @@ "main": "index.js", "scripts": { "prebuild": "(cd .. && yarn lib build) && yarn generate:gql && yarn expo customize tsconfig.json", + "build:web": "yarn prebuild && yarn expo export -p web", "start": "APP_VARIANT=dev yarn expo start --dev-client", "test": "yarn typecheck && jest", "typecheck": "tsc --noEmit", From 4c2a4b9038082a248482ce96a5d3dac8043f7954 Mon Sep 17 00:00:00 2001 From: Hayden Briese Date: Wed, 25 Oct 2023 23:07:11 +1100 Subject: [PATCH 2/5] CI test that the web app builds --- .github/workflows/tests.yaml | 21 ++++++++++++++++++++- 1 file changed, 20 insertions(+), 1 deletion(-) diff --git a/.github/workflows/tests.yaml b/.github/workflows/tests.yaml index 3cb4f6b44..abc05e575 100644 --- a/.github/workflows/tests.yaml +++ b/.github/workflows/tests.yaml @@ -117,7 +117,7 @@ jobs: - name: ๐Ÿงช Test run: yarn test - app: + 'app: tests': runs-on: ubuntu-latest steps: @@ -138,3 +138,22 @@ jobs: - name: ๐Ÿงช Test run: yarn app test + + 'app: web build test': + runs-on: ubuntu-latest + + steps: + - name: ๐Ÿšง Checkout + uses: actions/checkout@v3 + + - name: ๐Ÿšง Setup Node + uses: actions/setup-node@v3 + with: + node-version: 18 + cache: 'yarn' + + - name: ๐Ÿ“ฆ Install + run: yarn install + + - name: ๐Ÿ—๏ธ Build + run: yarn app build:web From e6626f36afbd67668d203f5a767f059ba98e83ed Mon Sep 17 00:00:00 2001 From: Hayden Briese Date: Wed, 25 Oct 2023 23:08:28 +1100 Subject: [PATCH 3/5] Web app CD --- .github/workflows/deployment.yaml | 17 ++++++++++++++--- 1 file changed, 14 insertions(+), 3 deletions(-) diff --git a/.github/workflows/deployment.yaml b/.github/workflows/deployment.yaml index c3f314d4e..aff034c93 100644 --- a/.github/workflows/deployment.yaml +++ b/.github/workflows/deployment.yaml @@ -52,7 +52,7 @@ jobs: working_directory: './api' sourcemaps: './dist' - app: + 'app: native': environment: main - app runs-on: ubuntu-latest @@ -85,8 +85,19 @@ jobs: - name: ๐Ÿš€ Publish update run: yarn app eas update --auto --non-interactive --platform all - site: - environment: main - site + 'app: web': + environment: main - app + runs-on: ubuntu-latest + + steps: + - name: ๐Ÿš€ Deploy + uses: fjogeleit/http-request-action@v1 + with: + url: ${{ secrets.WEB_DEPLOY_HOOK }} + method: POST + + docs: + environment: main - docs runs-on: ubuntu-latest steps: From 517c557d363ce6c747f94c5bb135eb0302855874 Mon Sep 17 00:00:00 2001 From: Hayden Briese Date: Wed, 25 Oct 2023 23:24:40 +1100 Subject: [PATCH 4/5] Fix workflow job names --- .github/workflows/deployment.yaml | 4 ++-- .github/workflows/tests.yaml | 4 ++-- 2 files changed, 4 insertions(+), 4 deletions(-) diff --git a/.github/workflows/deployment.yaml b/.github/workflows/deployment.yaml index aff034c93..1297fb672 100644 --- a/.github/workflows/deployment.yaml +++ b/.github/workflows/deployment.yaml @@ -52,7 +52,7 @@ jobs: working_directory: './api' sourcemaps: './dist' - 'app: native': + app-native: environment: main - app runs-on: ubuntu-latest @@ -85,7 +85,7 @@ jobs: - name: ๐Ÿš€ Publish update run: yarn app eas update --auto --non-interactive --platform all - 'app: web': + app-web: environment: main - app runs-on: ubuntu-latest diff --git a/.github/workflows/tests.yaml b/.github/workflows/tests.yaml index abc05e575..74feceed0 100644 --- a/.github/workflows/tests.yaml +++ b/.github/workflows/tests.yaml @@ -117,7 +117,7 @@ jobs: - name: ๐Ÿงช Test run: yarn test - 'app: tests': + app-tests: runs-on: ubuntu-latest steps: @@ -139,7 +139,7 @@ jobs: - name: ๐Ÿงช Test run: yarn app test - 'app: web build test': + app-web-build-test: runs-on: ubuntu-latest steps: From e5f2c2029f19e7f8f5563c1b681b2347c79fd436 Mon Sep 17 00:00:00 2001 From: Hayden Briese Date: Wed, 25 Oct 2023 23:25:05 +1100 Subject: [PATCH 5/5] Disable docs CD --- .github/workflows/deployment.yaml | 20 ++++++++++---------- 1 file changed, 10 insertions(+), 10 deletions(-) diff --git a/.github/workflows/deployment.yaml b/.github/workflows/deployment.yaml index 1297fb672..7e9f3e671 100644 --- a/.github/workflows/deployment.yaml +++ b/.github/workflows/deployment.yaml @@ -96,13 +96,13 @@ jobs: url: ${{ secrets.WEB_DEPLOY_HOOK }} method: POST - docs: - environment: main - docs - runs-on: ubuntu-latest - - steps: - - name: ๐Ÿš€ Deploy - uses: fjogeleit/http-request-action@v1 - with: - url: ${{ secrets.DEPLOY_HOOK }} - method: POST + # docs: + # environment: main - docs + # runs-on: ubuntu-latest + + # steps: + # - name: ๐Ÿš€ Deploy + # uses: fjogeleit/http-request-action@v1 + # with: + # url: ${{ secrets.DEPLOY_HOOK }} + # method: POST