Skip to content

Commit

Permalink
Merge dev into stage
Browse files Browse the repository at this point in the history
  • Loading branch information
github-actions[bot] authored Dec 4, 2024
2 parents 119b0b6 + 6f7b80b commit 2fcf86d
Show file tree
Hide file tree
Showing 195 changed files with 3,672 additions and 6,004 deletions.
2 changes: 0 additions & 2 deletions .eslintignore

This file was deleted.

57 changes: 0 additions & 57 deletions .eslintrc.json

This file was deleted.

2 changes: 1 addition & 1 deletion .github/actions/setup/action.yml
Original file line number Diff line number Diff line change
Expand Up @@ -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
Expand Down
1 change: 1 addition & 0 deletions .github/workflows/merge_dev_to_stage.yml
Original file line number Diff line number Diff line change
Expand Up @@ -17,5 +17,6 @@ jobs:
uses: devmasx/[email protected]
with:
type: now
from_branch: dev
target_branch: stage
github_token: ${{ github.token }}
10 changes: 10 additions & 0 deletions .github/workflows/test.yml
Original file line number Diff line number Diff line change
@@ -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:
Expand All @@ -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'
Expand Down
53 changes: 0 additions & 53 deletions .github/workflows/test_without_turbo_cache.yml

This file was deleted.

2 changes: 1 addition & 1 deletion .gitignore
Original file line number Diff line number Diff line change
Expand Up @@ -10,4 +10,4 @@ dts
apps/website/.env
.DS_Store
.turbo
_local
/_local
File renamed without changes.
62 changes: 1 addition & 61 deletions README.md
Original file line number Diff line number Diff line change
Expand Up @@ -127,67 +127,7 @@ Navigate to an app/package folder and run `pnpm dev`.
When working on integration tasks, it may be required to re-run
`pnpm turbo:prep` from the repo root.

### Turborepo

<details>
<summary>How it works in general</summary>

Turborepo allows to cache results for scripts from `package.json` files.

Minimal example:

- The `build` script compiles files from `src` folder and puts the result into
`dist` folder
- We can setup a Turborepo pipeline
```json
"build": {
"inputs": ["src/**"],
"outputs": ["dist/**"]
}
```
- On the first `turbo build` run Turborepo will
- calculate hashes for files from `src` folder, and save them into cache,
- save `dist` folder into cache.
- On the second `turbo build` run Turborepo will compare `src` hashes with
cache. If hashes do match, it will restore `dist` folder from the cache
without running the `build` script.

More in docs: https://turbo.build/repo/docs/core-concepts/caching

</details>

<details>
<summary>Turborepo setup: local vs CI</summary>

Locally, Turborepo stores caches under `node_modules/.cache/turbo` folder.

In CI, the caches are saved in Github artifacts.

</details>

<details>
<summary>Debug Turborepo issues in CI</summary>

It can happen that some script fails in CI because of a misconfigured Turborepo
pipeline. The following can be used in order to debug this locally:

- Setup https://github.com/ducktors/turborepo-remote-cache locally
- Run `turborepo-remote-cache` with `TURBO_TOKEN=local pnpm dev`
- Run tests in the target repo with

```shell
# Clean the repo
rm -rf node_modules && git clean -dxff -e '/.turbo' -e '_local' -e '/.idea' && find . -type d -empty -delete && \
# Install dependencies
pnpm i && \
# Run tests with
# - local Turborepo server
# - Turborepo debug info
# - simulated CI
TURBO_API=http://0.0.0.0:3000 TURBO_TOKEN=local TURBO_TEAM=local TURBO_RUN_SUMMARY=true CI=true pnpm turbo:test
```

</details>
More info on Turborepo: [docs/turborepo.md](docs/turborepo.md).

### Drupal

Expand Down
2 changes: 2 additions & 0 deletions apps/cms/composer.json
Original file line number Diff line number Diff line change
Expand Up @@ -32,6 +32,7 @@
"amazeelabs/default-content": "^1.2.11",
"amazeelabs/graphql_directives": "^2.4",
"amazeelabs/silverback-cli": "^2.9.13",
"amazeelabs/silverback_ai": "^1.1",
"amazeelabs/silverback_autosave": "^1.1",
"amazeelabs/silverback_campaign_urls": "^1.0.5",
"amazeelabs/silverback_cloudinary": "^1.3.0",
Expand Down Expand Up @@ -173,6 +174,7 @@
},
"require-dev": {
"drupal/core-dev": "^10",
"drupal/devel": "^5.3",
"phpspec/prophecy-phpunit": "^2.0.2"
}
}
Loading

0 comments on commit 2fcf86d

Please sign in to comment.