From b46e18a06c354a74d9e417f82bf2d20dc888e7ab Mon Sep 17 00:00:00 2001 From: Brord van Wierst Date: Mon, 27 Nov 2023 19:54:37 +0100 Subject: [PATCH 1/7] Create CNAME --- CNAME | 1 + 1 file changed, 1 insertion(+) create mode 100644 CNAME diff --git a/CNAME b/CNAME new file mode 100644 index 000000000..9ea517492 --- /dev/null +++ b/CNAME @@ -0,0 +1 @@ +app.staging.pangea.chat \ No newline at end of file From 0bcc0c1a1a6ef81654a28a18cd3113ccbcec0b15 Mon Sep 17 00:00:00 2001 From: Brord van Wierst Date: Mon, 27 Nov 2023 19:56:07 +0100 Subject: [PATCH 2/7] Delete CNAME --- CNAME | 1 - 1 file changed, 1 deletion(-) delete mode 100644 CNAME diff --git a/CNAME b/CNAME deleted file mode 100644 index 9ea517492..000000000 --- a/CNAME +++ /dev/null @@ -1 +0,0 @@ -app.staging.pangea.chat \ No newline at end of file From d5784a0831d24e787b7130edcca2773a7e307d9b Mon Sep 17 00:00:00 2001 From: Brord van Wierst Date: Sun, 10 Dec 2023 19:26:36 +0100 Subject: [PATCH 3/7] new web build test... --- .github/workflows/main_deploy.yaml | 17 +++++++++++------ 1 file changed, 11 insertions(+), 6 deletions(-) diff --git a/.github/workflows/main_deploy.yaml b/.github/workflows/main_deploy.yaml index 4800aa0c5..1207580ad 100644 --- a/.github/workflows/main_deploy.yaml +++ b/.github/workflows/main_deploy.yaml @@ -4,6 +4,7 @@ on: push: branches: - main + - fix-main-deploy env: # Setting an environment variable with the value of a configuration variable @@ -16,6 +17,11 @@ jobs: steps: - uses: actions/checkout@v2 - run: cat .github/workflows/versions.env >> $GITHUB_ENV + - name: 'Create env file' + run: | + touch .env + echo "$WEB_APP_ENV" >> .env + cat .env - uses: subosito/flutter-action@v2 with: flutter-version: ${{ env.FLUTTER_VERSION }} @@ -27,11 +33,10 @@ jobs: run: ./scripts/prepare-web.sh - name: Build Release Web run: ./scripts/build-web.sh - - name: Build Website + - name: Move Website run: | mv build/web public - touch public/.env - echo "$WEB_APP_ENV" >> public/.env + mv .env public/.env - name: Deploy to GitHub Pages uses: peaceiris/actions-gh-pages@v3 with: @@ -42,6 +47,8 @@ jobs: update_sentry: runs-on: ubuntu-latest + environment: staging + needs: deploy_web steps: - uses: actions/checkout@v3 with: @@ -53,6 +60,4 @@ jobs: SENTRY_AUTH_TOKEN: ${{ secrets.SENTRY_AUTH_TOKEN }} SENTRY_ORG: ${{ secrets.SENTRY_ORG }} SENTRY_PROJECT: ${{ secrets.SENTRY_PROJECT }} - # SENTRY_URL: https://sentry.io/ - with: - environment: staging + # SENTRY_URL: https://sentry.io/ \ No newline at end of file From 30a6cb561096b4e35dddd0198d67a1481f53070b Mon Sep 17 00:00:00 2001 From: Brord van Wierst Date: Sun, 10 Dec 2023 23:10:02 +0100 Subject: [PATCH 4/7] new web build test...2 --- pubspec.yaml | 1 - 1 file changed, 1 deletion(-) diff --git a/pubspec.yaml b/pubspec.yaml index f0275779f..395299f12 100644 --- a/pubspec.yaml +++ b/pubspec.yaml @@ -132,7 +132,6 @@ flutter: generate: true uses-material-design: true assets: - - .env - assets/ - assets/pangea/ - assets/pangea/bot_faces/ From 5de94392941605f7fb190409f4f2b010cd2ff17b Mon Sep 17 00:00:00 2001 From: Brord van Wierst Date: Sun, 10 Dec 2023 23:10:09 +0100 Subject: [PATCH 5/7] new web build test...2 --- .github/workflows/main_deploy.yaml | 16 ++++++---------- 1 file changed, 6 insertions(+), 10 deletions(-) diff --git a/.github/workflows/main_deploy.yaml b/.github/workflows/main_deploy.yaml index 1207580ad..3abd9d18d 100644 --- a/.github/workflows/main_deploy.yaml +++ b/.github/workflows/main_deploy.yaml @@ -17,11 +17,6 @@ jobs: steps: - uses: actions/checkout@v2 - run: cat .github/workflows/versions.env >> $GITHUB_ENV - - name: 'Create env file' - run: | - touch .env - echo "$WEB_APP_ENV" >> .env - cat .env - uses: subosito/flutter-action@v2 with: flutter-version: ${{ env.FLUTTER_VERSION }} @@ -33,10 +28,11 @@ jobs: run: ./scripts/prepare-web.sh - name: Build Release Web run: ./scripts/build-web.sh - - name: Move Website + - name: Build Website run: | mv build/web public - mv .env public/.env + touch public/.env + echo "$WEB_APP_ENV" >> public/.env - name: Deploy to GitHub Pages uses: peaceiris/actions-gh-pages@v3 with: @@ -47,8 +43,6 @@ jobs: update_sentry: runs-on: ubuntu-latest - environment: staging - needs: deploy_web steps: - uses: actions/checkout@v3 with: @@ -60,4 +54,6 @@ jobs: SENTRY_AUTH_TOKEN: ${{ secrets.SENTRY_AUTH_TOKEN }} SENTRY_ORG: ${{ secrets.SENTRY_ORG }} SENTRY_PROJECT: ${{ secrets.SENTRY_PROJECT }} - # SENTRY_URL: https://sentry.io/ \ No newline at end of file + # SENTRY_URL: https://sentry.io/ + with: + environment: staging From 9c117800264357b32c305ab12f20694516d12089 Mon Sep 17 00:00:00 2001 From: Brord van Wierst Date: Sun, 10 Dec 2023 23:22:03 +0100 Subject: [PATCH 6/7] dumb quickfix --- .github/workflows/main_deploy.yaml | 1 + scripts/build-web.sh | 2 +- 2 files changed, 2 insertions(+), 1 deletion(-) diff --git a/.github/workflows/main_deploy.yaml b/.github/workflows/main_deploy.yaml index 3abd9d18d..328bba665 100644 --- a/.github/workflows/main_deploy.yaml +++ b/.github/workflows/main_deploy.yaml @@ -33,6 +33,7 @@ jobs: mv build/web public touch public/.env echo "$WEB_APP_ENV" >> public/.env + cp public/.env public/assets/.env - name: Deploy to GitHub Pages uses: peaceiris/actions-gh-pages@v3 with: diff --git a/scripts/build-web.sh b/scripts/build-web.sh index 603a84301..8e46ed749 100755 --- a/scripts/build-web.sh +++ b/scripts/build-web.sh @@ -2,5 +2,5 @@ flutter config --enable-web flutter clean flutter pub get -flutter build web --dart-define=FLUTTER_WEB_CANVASKIT_URL=canvaskit/ --source-maps --base-href "/client/" +flutter build web --dart-define=FLUTTER_WEB_CANVASKIT_URL=canvaskit/ --profile --source-maps --base-href "/client/" # flutter build web --release --verbose --source-maps --dart-define=SENTRY_RELEASE=$CI_COMMIT_SHA From 716de94ec8ea50aa7efb1cf9d510fa557d4287ec Mon Sep 17 00:00:00 2001 From: Brord van Wierst Date: Tue, 12 Dec 2023 18:42:18 +0100 Subject: [PATCH 7/7] revert test branch --- .github/workflows/main_deploy.yaml | 1 - 1 file changed, 1 deletion(-) diff --git a/.github/workflows/main_deploy.yaml b/.github/workflows/main_deploy.yaml index 328bba665..d3567e06e 100644 --- a/.github/workflows/main_deploy.yaml +++ b/.github/workflows/main_deploy.yaml @@ -4,7 +4,6 @@ on: push: branches: - main - - fix-main-deploy env: # Setting an environment variable with the value of a configuration variable