Skip to content

Commit

Permalink
Merge branch 'refs/heads/release' into SLB-222-Font-loading
Browse files Browse the repository at this point in the history
  • Loading branch information
pmelab committed May 7, 2024
2 parents 7a9af77 + 78386c6 commit 0b49745
Show file tree
Hide file tree
Showing 104 changed files with 4,234 additions and 260 deletions.
2 changes: 2 additions & 0 deletions .github/workflows/test.yml
Original file line number Diff line number Diff line change
Expand Up @@ -59,6 +59,8 @@ jobs:
storybookBaseDir: packages/ui
onlyChanged: true
exitOnceUploaded: true
externals: |
static/stories/webforms/**
if: ${{ steps.chromatic-check.outputs.available == 'true' }}

- name: Deploy storybook to netlify
Expand Down
17 changes: 15 additions & 2 deletions .github/workflows/test_without_turbo_cache.yml
Original file line number Diff line number Diff line change
Expand Up @@ -3,11 +3,14 @@ on:
workflow_dispatch:

jobs:

test:
name: Test
runs-on: ubuntu-20.04
steps:
- name: Init check
if: ${{ github.repository != 'AmazeeLabs/silverback-template'}}
run: echo 'Please run the INIT script. See the root README.md for instructions.' && false

- name: Checkout
uses: actions/checkout@v3
with:
Expand All @@ -16,8 +19,18 @@ jobs:
- 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: Test
run: pnpm turbo:test
run: pnpm turbo:test:force
env:
TURBO_API: 'http://127.0.0.1:9080'
TURBO_TOKEN: 'local'
TURBO_TEAM: 'local'

- name: Upload Playwright report
uses: actions/upload-artifact@v3
Expand Down
6 changes: 6 additions & 0 deletions .lagoon.yml
Original file line number Diff line number Diff line change
Expand Up @@ -36,6 +36,8 @@ environments:
- example.cms.amazeelabs.dev
- build:
- example.build.amazeelabs.dev
- preview:
- example.preview.amazeelabs.dev
cronjobs:
- name: drush cron
schedule: '*/15 * * * *'
Expand All @@ -47,6 +49,8 @@ environments:
- stage-example.cms.amazeelabs.dev
- build:
- stage-example.build.amazeelabs.dev
- preview:
- stage-example.preview.amazeelabs.dev
cronjobs:
- name: drush cron
schedule: '*/15 * * * *'
Expand All @@ -58,6 +62,8 @@ environments:
- dev-example.cms.amazeelabs.dev
- build:
- dev-example.build.amazeelabs.dev
- preview:
- dev-example.preview.amazeelabs.dev
cronjobs:
- name: drush cron
schedule: '*/15 * * * *'
Expand Down
14 changes: 13 additions & 1 deletion .lagoon/Dockerfile
Original file line number Diff line number Diff line change
Expand Up @@ -15,7 +15,7 @@ RUN npm install -g [email protected] && pnpm config set store-dir /tmp/cache/pnpm

# Copy pnpm lockfile and install dependencies.
COPY pnpm-lock.yaml .npmrc /app/
#COPY patches /app/patches
# COPY patches /app/patches
RUN --mount=type=cache,target=/tmp/cache pnpm fetch && \
# There is a bug in pnpm: `pnpm fetch` creates _some_ node_modules folders
# with _some_ packages. This can lead to an incomplete package installation.
Expand Down Expand Up @@ -47,6 +47,7 @@ RUN --mount=type=cache,target=/tmp/cache pnpm i && \
# Deploy apps.
RUN --mount=type=cache,target=/tmp/cache pnpm deploy --filter "@custom/cms" /tmp/.deploy/cms --prod
RUN --mount=type=cache,target=/tmp/cache pnpm deploy --filter "@custom/website" /tmp/.deploy/website --prod
RUN --mount=type=cache,target=/tmp/cache pnpm deploy --filter "@custom/preview" /tmp/.deploy/preview --prod

# ====================================================================================================
# CLI IMAGE
Expand Down Expand Up @@ -82,11 +83,22 @@ FROM uselagoon/nginx-drupal as nginx

COPY --from=cli /app /app
RUN cd /app/web && cp ../node_modules/@custom/ui/build/gutenberg.css .
RUN cd /app/web && cp ../node_modules/@custom/ui/build/iframe.css .
COPY .lagoon/nginx-conf/redirects-map.conf /etc/nginx/redirects-map.conf

WORKDIR /app
ENV WEBROOT=web

# ====================================================================================================
# PREVIEW IMAGE
# ====================================================================================================

FROM uselagoon/node-18:23.12.0 as preview

RUN npm install -g [email protected]
COPY --from=builder /tmp/.deploy/preview /app
CMD pnpm start

# ====================================================================================================
# PUBLISHER IMAGE
# ====================================================================================================
Expand Down
4 changes: 3 additions & 1 deletion .vscode/settings.json
Original file line number Diff line number Diff line change
Expand Up @@ -31,5 +31,7 @@
"*.profile": "php"
},
"graphql-config.load.filePath": ".graphqlrc.json",
"graphql-config.load.rootDir": "packages/schema"
"graphql-config.load.rootDir": "packages/schema",
"phpsab.executablePathCBF": "./apps/cms/vendor/bin/phpcbf",
"phpsab.executablePathCS": "./apps/cms/vendor/bin/phpcs"
}
8 changes: 8 additions & 0 deletions apps/cms/.idea/.gitignore

Some generated files are not rendered by default. Learn more about how customized files appear on GitHub.

Loading

0 comments on commit 0b49745

Please sign in to comment.