release: v3.0.1 (develop → main)

.dockerignore

@@ -0,0 +1,18 @@
+.git
+.github
+.turbo
+.bundle-check
+.history
+.idea
+.vscode
+**/.next
+**/.turbo
+**/node_modules
+**/android
+**/ios
+**/vendor
+**/.env*
+**/coverage
+**/dist
+**/out
+*.md

.github/actions/setup-android-env/action.yml

@@ -1,19 +1,18 @@
 name: Setup Android Environment
-description: Setup Node, Java, Corepack, and install dependencies
+description: Setup Node, pnpm, Java, and install dependencies
 
 runs:
   using: composite
   steps:
+    - name: Setup pnpm
+      uses: pnpm/action-setup@v4
+
     - name: Setup Node
       uses: actions/setup-node@v6.3.0
       with:
-        node-version: 20
-        cache: yarn
-        cache-dependency-path: yarn.lock
-
-    - name: Enable Corepack
-      run: corepack enable
-      shell: bash
+        node-version: 22.13
+        cache: pnpm
+        cache-dependency-path: pnpm-lock.yaml
 
     - name: Setup Java
       uses: actions/setup-java@v5.2.0
@@ -22,14 +21,6 @@ runs:
         java-version: 17
         cache: gradle
 
-    - name: Restore node_modules cache
-      id: cache_node_modules
-      uses: actions/cache@v4
-      with:
-        path: node_modules
-        key: ${{ runner.os }}-node-modules-${{ hashFiles('yarn.lock', 'package.json', 'patches/**') }}
-
     - name: Install dependencies
-      if: steps.cache_node_modules.outputs.cache-hit != 'true'
-      run: yarn install --frozen-lockfile --prefer-offline
+      run: pnpm install --frozen-lockfile
       shell: bash

.github/actions/setup-node-env/action.yml

@@ -1,28 +1,19 @@
 name: Setup Node Environment
-description: Setup Node, Corepack, and install dependencies (with node_modules cache)
+description: Setup Node and pnpm, then install dependencies
 
 runs:
   using: composite
   steps:
+    - name: Setup pnpm
+      uses: pnpm/action-setup@v4
+
     - name: Setup Node
       uses: actions/setup-node@v6.3.0
       with:
-        node-version: 20
-        cache: yarn
-        cache-dependency-path: yarn.lock
-
-    - name: Enable Corepack
-      run: corepack enable
-      shell: bash
-
-    - name: Restore node_modules cache
-      id: cache_node_modules
-      uses: actions/cache@v4
-      with:
-        path: node_modules
-        key: ${{ runner.os }}-node-modules-${{ hashFiles('yarn.lock', 'package.json', 'patches/**') }}
+        node-version: 22.13
+        cache: pnpm
+        cache-dependency-path: pnpm-lock.yaml
 
     - name: Install dependencies
-      if: steps.cache_node_modules.outputs.cache-hit != 'true'
-      run: yarn install --frozen-lockfile --prefer-offline
+      run: pnpm install --frozen-lockfile
       shell: bash

.github/workflows/_deploy-web.yml

@@ -0,0 +1,65 @@
+name: Deploy web image
+
+on:
+  workflow_call:
+    inputs:
+      ocir_repository:
+        description: OCIR repository that receives the web image
+        required: true
+        type: string
+      gitops_overlay_path:
+        description: Kustomize overlay path in waffle-world-oci
+        required: true
+        type: string
+    secrets:
+      OCI_AUTH_TOKEN:
+        required: true
+      DEPLOYER_APP_PRIVATE_KEY:
+        required: true
+
+permissions:
+  contents: read
+
+jobs:
+  deploy:
+    name: Build and push web image
+    runs-on: ubuntu-24.04-arm
+    concurrency:
+      group: deploy-${{ inputs.ocir_repository }}
+      cancel-in-progress: true
+
+    env:
+      IMAGE_TAG: ${{ github.run_id }}-${{ github.run_attempt }}
+      OCIR_REGISTRY: yny.ocir.io
+      OCIR_NAMESPACE: ax1dvc8vmenm
+      OCIR_REPOSITORY: ${{ inputs.ocir_repository }}
+
+    steps:
+      - name: Checkout merged commit
+        uses: actions/checkout@v5.0.1
+        with:
+          ref: ${{ github.event.pull_request.merge_commit_sha }}
+
+      - name: Login to OCIR
+        run: echo "${{ secrets.OCI_AUTH_TOKEN }}" | docker login "$OCIR_REGISTRY" -u "$OCIR_NAMESPACE/members/waffle-deployer" --password-stdin
+
+      - name: Build web image
+        run: |
+          docker build \
+            --file apps/web/Dockerfile \
+            --platform linux/arm64 \
+            --tag "$OCIR_REGISTRY/$OCIR_NAMESPACE/$OCIR_REPOSITORY:$IMAGE_TAG" \
+            .
+
+      - name: Push web image
+        run: docker push "$OCIR_REGISTRY/$OCIR_NAMESPACE/$OCIR_REPOSITORY:$IMAGE_TAG"
+
+      - name: Update GitOps image tag
+        uses: wafflestudio/waffle-world-oci/.github/actions/update-image@main
+        with:
+          image: ${{ env.OCIR_REGISTRY }}/${{ env.OCIR_NAMESPACE }}/${{ env.OCIR_REPOSITORY }}
+          tag: ${{ env.IMAGE_TAG }}
+          # The OCIR repository includes the service suffix, while the GitOps
+          # overlay is rooted at the environment directory (for example, argocd/allclear-dev).
+          overlay-path: ${{ inputs.gitops_overlay_path }}
+          private-key: ${{ secrets.DEPLOYER_APP_PRIVATE_KEY }}

.github/workflows/android-dev-internal.yml

@@ -27,6 +27,7 @@ jobs:
 
       - name: Restore Android local config
         shell: bash
+        working-directory: apps/mobile
         env:
           ANDROID_ENV_LOCAL: ${{ secrets.ANDROID_ENV_LOCAL }}
           ANDROID_GOOGLE_SERVICES_JSON: ${{ secrets.ANDROID_GOOGLE_SERVICES_JSON }}
@@ -51,6 +52,7 @@ jobs:
           chmod 600 android/app/debug.keystore
 
       - name: Build standalone dev APK
+        working-directory: apps/mobile
         run: |
           chmod +x android/gradlew
           cd android
@@ -60,7 +62,7 @@ jobs:
         uses: actions/upload-artifact@v4
         with:
           name: android-dev-release-apk-${{ github.run_number }}
-          path: android/app/build/outputs/apk/devRelease/*.apk
+          path: apps/mobile/android/app/build/outputs/apk/devRelease/*.apk
           if-no-files-found: error
           retention-days: 7
 
@@ -81,6 +83,7 @@ jobs:
 
       - name: Cleanup local config
         if: always()
+        working-directory: apps/mobile
         run: |
           rm -f .env.local
           rm -f android/app/google-services.json

.github/workflows/android-main-internal-testing.yml

@@ -32,6 +32,7 @@ jobs:
 
       - name: Restore Android release config
         shell: bash
+        working-directory: apps/mobile
         env:
           ANDROID_ENV_PROD: ${{ secrets.ANDROID_ENV_PROD }}
           ANDROID_GOOGLE_SERVICES_JSON_PROD: ${{ secrets.ANDROID_GOOGLE_SERVICES_JSON_PROD }}
@@ -76,11 +77,12 @@ jobs:
       - name: Compute version code
         shell: bash
         run: |
-          version_code=$((100009 + GITHUB_RUN_NUMBER))
+          version_code=$((100011 + GITHUB_RUN_NUMBER))
           echo "VERSION_CODE=${version_code}" >> "$GITHUB_ENV"
           echo "RELEASE_NAME=main internal ${version_code}" >> "$GITHUB_ENV"
 
       - name: Build release bundle
+        working-directory: apps/mobile
         run: |
           chmod +x android/gradlew
           cd android
@@ -91,7 +93,7 @@ jobs:
         with:
           serviceAccountJsonPlainText: ${{ secrets.PLAY_SERVICE_ACCOUNT_JSON }}
           packageName: com.padocorp.clubhouse.applicationId
-          releaseFiles: android/app/build/outputs/bundle/release/app-release.aab
+          releaseFiles: apps/mobile/android/app/build/outputs/bundle/release/app-release.aab
           track: internal
           status: completed
           releaseName: ${{ env.RELEASE_NAME }}
@@ -111,6 +113,7 @@ jobs:
 
       - name: Cleanup local config
         if: always()
+        working-directory: apps/mobile
         run: |
           rm -f .env.prod
           rm -f android/app/google-services.json

.github/workflows/ci.yml

@@ -24,11 +24,21 @@ jobs:
       - name: Setup Node environment
         uses: ./.github/actions/setup-node-env
 
-      - name: Lint
-        run: yarn lint
+      - name: Lint, typecheck, and test
+        run: pnpm verify
 
-      - name: Typecheck
-        run: yarn typecheck
+  build-web:
+    runs-on: ubuntu-latest
+
+    steps:
+      - name: Checkout
+        uses: actions/checkout@v5.0.1
+
+      - name: Setup Node environment
+        uses: ./.github/actions/setup-node-env
+
+      - name: Build web
+        run: pnpm --filter allclear-web build
 
   bundle:
     runs-on: ubuntu-latest
@@ -46,4 +56,4 @@ jobs:
         uses: ./.github/actions/setup-node-env
 
       - name: Bundle (${{ matrix.platform }})
-        run: yarn bundle:${{ matrix.platform }}
+        run: pnpm --dir apps/mobile run bundle:${{ matrix.platform }}

.github/workflows/deploy-web-dev.yml

@@ -0,0 +1,27 @@
+name: Deploy web to development
+
+on:
+  pull_request:
+    branches: [develop]
+    types: [closed]
+    paths:
+      - apps/web/**
+      - package.json
+      - pnpm-lock.yaml
+      - pnpm-workspace.yaml
+      - turbo.json
+      - biome.json
+      - .dockerignore
+      - .github/workflows/_deploy-web.yml
+      - .github/workflows/deploy-web-dev.yml
+
+jobs:
+  deploy:
+    if: github.event.pull_request.merged == true
+    uses: ./.github/workflows/_deploy-web.yml
+    with:
+      ocir_repository: allclear-dev/allclear-web
+      gitops_overlay_path: argocd/allclear-dev
+    secrets:
+      OCI_AUTH_TOKEN: ${{ secrets.OCI_AUTH_TOKEN }}
+      DEPLOYER_APP_PRIVATE_KEY: ${{ secrets.DEPLOYER_APP_PRIVATE_KEY }}

.github/workflows/deploy-web-prod.yml

@@ -0,0 +1,27 @@
+name: Deploy web to production
+
+on:
+  pull_request:
+    branches: [main]
+    types: [closed]
+    paths:
+      - apps/web/**
+      - package.json
+      - pnpm-lock.yaml
+      - pnpm-workspace.yaml
+      - turbo.json
+      - biome.json
+      - .dockerignore
+      - .github/workflows/_deploy-web.yml
+      - .github/workflows/deploy-web-prod.yml
+
+jobs:
+  deploy:
+    if: github.event.pull_request.merged == true
+    uses: ./.github/workflows/_deploy-web.yml
+    with:
+      ocir_repository: allclear-prod/allclear-web
+      gitops_overlay_path: argocd/allclear-prod
+    secrets:
+      OCI_AUTH_TOKEN: ${{ secrets.OCI_AUTH_TOKEN }}
+      DEPLOYER_APP_PRIVATE_KEY: ${{ secrets.DEPLOYER_APP_PRIVATE_KEY }}

.gitignore

@@ -179,6 +179,9 @@ web_modules/
 # Optional stylelint cache
 .stylelintcache
 
+# Turborepo cache
+.turbo/
+
 # Microbundle cache
 .rpt2_cache/
 .rts2_cache_cjs/
@@ -196,6 +199,7 @@ web_modules/
 
 # dotenv environment variable files
 .env.*
+!.env.example
 
 # parcel-bundler cache (https://parceljs.org/)
 .cache
@@ -218,6 +222,9 @@ dist
 # vuepress build output
 .vuepress/dist
 
+# Local task planning
+tasks/
+
 # vuepress v2.x temp and cache directory
 .temp
 
@@ -501,8 +508,9 @@ $RECYCLE.BIN/
 # .pnp.*
 
 #CocoaPods
-ios/Pods
-ios/tmp.xcconfig
+apps/mobile/ios/Pods
+apps/mobile/ios/tmp.xcconfig
+apps/mobile/ios/.xcode.env.local
 
 
 # End of https://www.toptal.com/developers/gitignore/api/reactnative,windows,macos,intellij+all,visualstudiocode,yarn,node