Merge branch 'release' into SLB-455-card-subgrid

.github/actions/setup/action.yml

@@ -14,7 +14,7 @@ runs:
     - name: Check xdebug config
       shell: bash
       run: |
-        if ! php --info | grep 'xdebug.mode => develop => develop'; then
+        if ! php --info | grep 'xdebug.mode => no value => no value'; then
           echo 'Error: xdebug.mode should not be set in CI. Have you committed xdebug config by accident? Check devbox.d/php/php.ini'
           exit 1
         fi

.github/workflows/fe_build.yml

@@ -0,0 +1,87 @@
+name: FE Build
+
+on:
+  workflow_dispatch:
+    inputs:
+      publisher_payload:
+        description: Publisher payload
+        required: true
+      env:
+        description: Environment
+        required: true
+
+run-name: 'FE Build [env: ${{ inputs.env }}]'
+
+concurrency:
+  group: fe_build_${{ inputs.env }}
+
+jobs:
+  build:
+    name: Build
+    runs-on: ubuntu-latest
+    steps:
+      - name: Checkout
+        uses: actions/checkout@v4
+        with:
+          fetch-depth: 1
+
+      - name: Setup
+        uses: ./.github/actions/setup
+
+      - name: TurboRepo local server
+        uses: felixmosh/turborepo-gh-artifacts@v2
+        with:
+          server-token: 'local'
+          repo-token: ${{ secrets.GITHUB_TOKEN }}
+
+      - name: Publisher
+        uses: AmazeeLabs/publisher-action@4371b4a90a9fe2c86248e76c0f428e39abf6b610
+        with:
+          success_env_var_name: BUILD_IS_SUCCESSFUL
+          cache_paths: |
+            apps/website/.cache
+            apps/website/public
+          cache_key: 'fe-build-${{ inputs.env }}'
+
+      - name: Prepare
+        run: SKIP_DRUPAL_INSTALL=1 pnpm turbo:prep
+        env:
+          TURBO_API: 'http://127.0.0.1:9080'
+          TURBO_TOKEN: 'local'
+          TURBO_TEAM: 'local'
+
+      - name: Build & deploy
+        run: |
+          set -ex
+          cd apps/website
+
+          # Build
+          if test -d public; then 
+            echo "Single build"
+            pnpm build:gatsby 
+          else 
+            echo "Double build"
+            # To mitigate Gatsby bug:
+            #   The first incremental build rewrites compilation hashes even if
+            #   there are no content changes.
+            pnpm build:gatsby
+            pnpm build:gatsby 
+          fi
+
+          # "netlify deploy" fails to locate edge functions when executed from a
+          # monorepo. Flags like --cwd or --filter do not help. So we deploy the
+          # website app to a dedicated folder first.
+          pnpm deploy --filter "@custom/website" /tmp/deploy --prod
+          cd /tmp/deploy
+
+          # Deploy
+          pnpm netlify env:set AWS_LAMBDA_JS_RUNTIME nodejs20.x
+          pnpm netlify env:set DRUPAL_EXTERNAL_URL $DRUPAL_EXTERNAL_URL
+          pnpm netlify deploy --prodIfUnlocked
+
+          # Report success to Publisher
+          echo "BUILD_IS_SUCCESSFUL=1" >> $GITHUB_ENV
+        env:
+          TURBO_API: 'http://127.0.0.1:9080'
+          TURBO_TOKEN: 'local'
+          TURBO_TEAM: 'local'

.github/workflows/merge_dev_to_stage.yml

@@ -17,5 +17,6 @@ jobs:
         uses: devmasx/[email protected]
         with:
           type: now
+          from_branch: dev
           target_branch: stage
           github_token: ${{ github.token }}

.github/workflows/test.yml

@@ -1,6 +1,15 @@
 name: Test
 on:
   push:
+  workflow_dispatch:
+    inputs:
+      turborepo_caching:
+        description: 'Turborepo caching'
+        type: choice
+        options:
+          - 'On'
+          - 'Off'
+        default: 'On'
 
 jobs:
   test:
@@ -25,6 +34,7 @@ jobs:
         run: pnpm test:format
 
       - name: TurboRepo local server
+        if: ${{ github.event.inputs.turborepo_caching != 'Off' }}
         uses: felixmosh/turborepo-gh-artifacts@v2
         with:
           server-token: 'local'
@@ -122,6 +132,22 @@ jobs:
           DASHBOARD_ACCESS_TOKEN: ${{ secrets.DASHBOARD_ACCESS_TOKEN }}
         run: amazeelabs-estimator update
 
+  init_script:
+    name: Init script
+    runs-on: ubuntu-latest
+    steps:
+      - name: Checkout
+        uses: actions/checkout@v4
+        with:
+          fetch-depth: 0
+      - name: Setup
+        uses: ./.github/actions/setup
+      - name: Test init script
+        run:
+          pnpm --filter @custom/init run init --project-human-name "Foo Bar"
+          --project-machine-name foo_bar | grep 'Run `pnpm i` to update the lock
+          file'
+
   docker_build:
     name: Docker Build
     if:
@@ -133,22 +159,24 @@ jobs:
         uses: actions/checkout@v4
         with:
           fetch-depth: 1
-      - name: Setup Ruby
-        uses: ruby/setup-ruby@v1
-        with:
-          ruby-version: 2
-          bundler-cache: true
       - name: Install Pygmy
-        run: gem install pygmy
+        run: |
+          set -ex
+          git clone https://github.com/pygmystack/pygmy.git
+          cd pygmy
+          make build
+          ls -lisa ./builds
+          cp ./builds/pygmy-linux-amd64 /usr/local/bin/pygmy
+          chmod +x /usr/local/bin/pygmy
       - name: Start Pygmy
         run: pygmy up
       - name: Docker Build & Up
-        run: DOCKER_BUILDKIT=1 docker-compose up -d --build
+        run: DOCKER_BUILDKIT=1 docker compose up -d --build
       - name: Wait a bit
         run: sleep 5
       - name: Check containers status
         run: |
-          if docker-compose ps | grep Exit
+          if docker compose ps | grep Exit
           then
             echo "Docker container(s) exited"
             exit 1

.gitignore

@@ -10,4 +10,4 @@ dts
 apps/website/.env
 .DS_Store
 .turbo
-_local
+/_local

.gitpod.Dockerfile

@@ -1,18 +1,18 @@
 FROM gitpod/workspace-full
 
-RUN bash -c 'VERSION="18.19.0" \
+RUN bash -c 'VERSION="20.18.1" \
     && source $HOME/.nvm/nvm.sh && nvm install $VERSION \
     && nvm use $VERSION && nvm alias default $VERSION'
 
 RUN echo "nvm use default &>/dev/null" >> ~/.bashrc.d/51-nvm-fix
 
-RUN sudo update-alternatives --set php $(which php8.2)
-RUN sudo install-packages php8.2-gd php8.2-mbstring php8.2-curl php8.2-sqlite3 php8.2-zip php8.2-xdebug php8.2-imagick
+RUN sudo update-alternatives --set php $(which php8.3)
+RUN sudo install-packages php8.3-gd php8.3-mbstring php8.3-curl php8.3-sqlite3 php8.3-zip php8.3-xdebug php8.3-imagick
 RUN pnpx [email protected] install-deps
 RUN pnpx [email protected] install
 RUN npm install -g [email protected] @withgraphite/graphite-cli
 
-COPY .gitpod/xdebug.ini /etc/php/8.2/mods-available/xdebug.ini
+COPY .gitpod/xdebug.ini /etc/php/8.3/mods-available/xdebug.ini
 RUN curl -fsSL https://deno.land/x/install/install.sh | sh
 RUN /home/gitpod/.deno/bin/deno completions bash > /home/gitpod/.bashrc.d/90-deno && \
   echo 'export DENO_INSTALL="/home/gitpod/.deno"' >> /home/gitpod/.bashrc.d/90-deno && \