diff --git a/.github/workflows/main_deploy.yaml b/.github/workflows/main_deploy.yaml index f6ad95bc8..ab789ac88 100644 --- a/.github/workflows/main_deploy.yaml +++ b/.github/workflows/main_deploy.yaml @@ -19,26 +19,18 @@ jobs: with: flutter-version: ${{ env.FLUTTER_VERSION }} cache: true - - name: Install dependencies - run: sudo apt-get update && sudo apt-get install nodejs -y - run: flutter pub get - name: Prepare web run: ./scripts/prepare-web.sh - name: Build Release Web run: flutter build web --dart-define=FLUTTER_WEB_CANVASKIT_URL=canvaskit/ --release --source-maps --base-href "/web/" - - name: Build Website - run: | - cd docs && npx tailwindcss -o ./tailwind.css --minify && cd .. - mv docs public - mv repo public || true - mv build/web/ public/web - echo "fluffychat.im" > ./public/CNAME - name: Deploy to GitHub Pages uses: peaceiris/actions-gh-pages@v3 with: personal_token: ${{ secrets.PAGES_DEPLOY_TOKEN }} - publish_dir: ./public + publish_dir: ./build/web publish_branch: gh-pages + destination_dir: nightly deploy_playstore_internal: runs-on: ubuntu-latest diff --git a/.github/workflows/release.yaml b/.github/workflows/release.yaml index 3c87c2c94..a112c1f3a 100644 --- a/.github/workflows/release.yaml +++ b/.github/workflows/release.yaml @@ -42,6 +42,20 @@ jobs: asset_path: fluffychat-web.tar.gz asset_name: fluffychat-web.tar.gz asset_content_type: application/gzip + - name: Build Website + run: | + cd docs && npx tailwindcss -o ./tailwind.css --minify && cd .. + mv docs public + mv repo public || true + mv build/web/ public/web + cp public/web -r public/nightly + echo "fluffychat.im" > ./public/CNAME + - name: Deploy to GitHub Pages + uses: peaceiris/actions-gh-pages@v3 + with: + personal_token: ${{ secrets.PAGES_DEPLOY_TOKEN }} + publish_dir: ./public + publish_branch: gh-pages build_apk: runs-on: ubuntu-latest