Skip to content

Commit f8d2fbf

Browse files
AzizX-coderclaude
andcommitted
fix: Android JDK 21, landing-at-root + app-at-/app, version bump
Android build failed with "invalid source release: 21" because Capacitor 7 requires JDK 21 (workflow had JDK 17). Bumped Android setup-java to 21. Landing page got wiped on every deploy because deploy-web.yml used force_orphan: true, which orphan-pushes the gh-pages branch and erases the /landing folder that deploy-pages.yml had placed there. Merged both workflows into one (Deploy Site - Landing + Web App) that: - Builds the web app with vite build --mode web - Assembles a site/ dir: landing at root, dist at /app - Single force_orphan push, no more race / overwrite Deleted the now-redundant deploy-pages.yml. Updated landing CTAs to point at ./app/ instead of GitHub releases: - Nav: "Download" becomes "Launch Web App" - Hero: primary "Launch Web App", secondary "Download Desktop / Mobile" Bumped package.json 3.1.0 to 3.1.1 so artifact filenames match the release tag. Co-Authored-By: Claude Opus 4.7 <noreply@anthropic.com>
1 parent ec960ae commit f8d2fbf

5 files changed

Lines changed: 16 additions & 37 deletions

File tree

.github/workflows/deploy-pages.yml

Lines changed: 0 additions & 28 deletions
This file was deleted.

.github/workflows/deploy-web.yml

Lines changed: 10 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -1,4 +1,4 @@
1-
name: Deploy Web App
1+
name: Deploy Site (Landing + Web App)
22

33
on:
44
push:
@@ -11,7 +11,7 @@ permissions:
1111

1212
jobs:
1313
deploy:
14-
name: Build & Deploy Web App
14+
name: Build & Deploy Site
1515
runs-on: ubuntu-latest
1616

1717
steps:
@@ -36,10 +36,17 @@ jobs:
3636
VITE_OPENROUTER_API_KEY: ${{ secrets.VITE_OPENROUTER_API_KEY }}
3737
VITE_TLDRAW_LICENSE_KEY: ${{ secrets.VITE_TLDRAW_LICENSE_KEY }}
3838

39+
- name: Assemble site (landing at /, app at /app)
40+
run: |
41+
mkdir -p site
42+
cp -r landing/. site/
43+
mkdir -p site/app
44+
cp -r dist/. site/app/
45+
3946
- name: Deploy to GitHub Pages
4047
uses: peaceiris/actions-gh-pages@v4
4148
with:
4249
github_token: ${{ secrets.GITHUB_TOKEN }}
43-
publish_dir: ./dist
50+
publish_dir: ./site
4451
publish_branch: gh-pages
4552
force_orphan: true

.github/workflows/main.yml

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -150,10 +150,10 @@ jobs:
150150
with:
151151
node-version: 22
152152

153-
- name: Setup JDK 17
153+
- name: Setup JDK 21
154154
uses: actions/setup-java@v4
155155
with:
156-
java-version: '17'
156+
java-version: '21'
157157
distribution: 'temurin'
158158

159159
- name: Setup Android SDK

landing/index.html

Lines changed: 3 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -117,7 +117,7 @@
117117
<a href="#docs">Docs</a>
118118
<a href="#security">Security</a>
119119
<a href="#donate">Support</a>
120-
<a href="https://github.com/AzizX-coder/Delay/releases" class="nav-cta">Download</a>
120+
<a href="./app/" class="nav-cta">Launch Web App</a>
121121
</div>
122122
</div>
123123
</nav>
@@ -132,8 +132,8 @@ <h1>The Super App<br>For Everything You Do.</h1>
132132
Docs, Planner, Schedule, Focus Timer, Capture, Vault, Code Studio, Canvas, Status Dashboard, Voice Studio, and AI Copilot — all in one beautiful SaaS app.
133133
</p>
134134
<div class="hero-btns">
135-
<a href="https://github.com/AzizX-coder/Delay/releases" class="btn-p">↓ Download Free</a>
136-
<a href="#donate" class="btn-o">☕ Buy Us a Coffee</a>
135+
<a href="./app/" class="btn-p">→ Launch Web App</a>
136+
<a href="https://github.com/AzizX-coder/Delay/releases" class="btn-o">↓ Download Desktop / Mobile</a>
137137
</div>
138138

139139
<div style="max-width: 1000px; margin: 60px auto 0;">

package.json

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -1,6 +1,6 @@
11
{
22
"name": "delay",
3-
"version": "3.1.0",
3+
"version": "3.1.1",
44
"description": "Notes, tasks, calendar & AI — beautifully organized.",
55
"author": "AzizX-coder",
66
"license": "Apache-2.0",

0 commit comments

Comments
 (0)