Skip to content

Commit ed3d9a9

Browse files
committed
Merge branch 'release/4.0.1'
2 parents 00844f8 + ab4412a commit ed3d9a9

40 files changed

+309
-2197
lines changed

.env

Lines changed: 7 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -62,7 +62,7 @@ RABBITMQ_MANAGEMENT="http://intercept.ddev.site:15672/"
6262
RABBITMQ_SPLIT_QUEUE="intercept-core-split-testing"
6363

6464
# Where the main core repo on github is located.
65-
CORE_SPLIT_MAIN_REPO="git@github.com:TYPO3/TYPO3.CMS.git"
65+
CORE_SPLIT_MAIN_REPO="git@github.com:typo3/typo3.git"
6666
# Base path to where the git-split single extension repos reside
6767
CORE_SPLIT_SINGLE_REPOS_BASE="git@github.com:TYPO3.CMS/"
6868
# Where the main core repo on github is located for version 8.
@@ -101,3 +101,9 @@ DISCORD_SERVER_ID=12345
101101
DISCORD_BOT_TOKEN=SomeRandomToken
102102

103103
USERCENTRICS_ID="R9wBKTwzv"
104+
105+
# used for live re-rendering of all docs, see readme
106+
# DOCS User
107+
SSH_LIVE_USER=
108+
# Web directory of docs server (/abs/path/to/Web without trailing slash)
109+
SSH_LIVE_TARGET_DIR=

.gitignore

Lines changed: 2 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -43,3 +43,5 @@ yarn-error.log
4343
.phpunit.result.cache
4444
/phpunit.xml
4545
###< symfony/phpunit-bridge ###
46+
/build/docker-compose.yml
47+
/build/jobfile.json

README.md

Lines changed: 27 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -241,3 +241,30 @@ ddev exec -s graylogmongo rm -rf /dump
241241

242242
If the instance runs with ddev, a `.env.local` file inside `.ddev` is mandatory. It can be copied from the existing .env.example
243243
file. For no performance profiling tasks, the values may be empty. Else, put your account data here. If in doubt, reach out to Susi.
244+
245+
## Re-Render all locally
246+
247+
### Prerequisites
248+
249+
- Server with enough power, `git`, `parallel`, `docker` and ssh access to the docs server (DO NOT DO THIS ON SRV001!)
250+
- up-to-date intercept database (Get a copy of `var/data.db` from the live system before you start)
251+
- clone of this repository
252+
253+
### Commands
254+
255+
```bash
256+
# rm build dir if it exists
257+
rm -Rf var/docs-build-information/
258+
# generate build information - writes build information files to disk at var/docs-build-information/
259+
./bin/console app:docs-dump-render-info --all
260+
# go to the build folder
261+
cd build
262+
# download and update repositories
263+
time find ../var/docs-build-information/ ! -type d | parallel --progress "./download-update.sh {}"
264+
# render all documents (~1h on a modern notebook)
265+
time find ../var/docs-build-information/ ! -type d | parallel --progress "./render.sh {}"
266+
# move docs to final structure locally
267+
time find ../var/docs-build-information/ ! -type d | parallel "./move.sh {}"
268+
# rsync rendered docs to live
269+
./upload.sh
270+
```

build/bamboo-container-functions.sh

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

build/bamboo.sh

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

build/bamboo/.credentials.example

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

build/bamboo/.gitignore

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

build/bamboo/README.md

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

build/bamboo/pom.xml

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

0 commit comments

Comments
 (0)