Skip to content

Commit b4d7829

Browse files
authored
Merge pull request #959 from cakephp/5.x-docs
adjustments to make 3.x docs deploy work
2 parents e71bfc6 + 31b93d2 commit b4d7829

File tree

5 files changed

+38
-11
lines changed

5 files changed

+38
-11
lines changed
Lines changed: 24 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,24 @@
1+
---
2+
name: 'deploy_docs_5x'
3+
4+
on:
5+
push:
6+
branches:
7+
- 5.x
8+
workflow_dispatch:
9+
10+
jobs:
11+
deploy:
12+
runs-on: ubuntu-latest
13+
steps:
14+
- name: Cloning repo
15+
uses: actions/checkout@v4
16+
with:
17+
fetch-depth: 0
18+
19+
- name: Push to dokku
20+
uses: dokku/github-action@master
21+
with:
22+
git_remote_url: 'ssh://[email protected]:22/debugkit-docs-5'
23+
git_push_flags: '-f'
24+
ssh_private_key: ${{ secrets.DOKKU_SSH_PRIVATE_KEY }}

Dockerfile

Lines changed: 4 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -1,7 +1,7 @@
11
# Basic docker based environment
22
# Necessary to trick dokku into building the documentation
33
# using dockerfile instead of herokuish
4-
FROM ubuntu:17.04
4+
FROM ubuntu:22.04
55

66
# Add basic tools
77
RUN apt-get update && \
@@ -13,9 +13,11 @@ RUN apt-get update && \
1313
libffi-dev \
1414
libssl-dev
1515

16+
# Prevent interactive timezone input
17+
ENV DEBIAN_FRONTEND=noninteractive
1618
RUN LC_ALL=C.UTF-8 add-apt-repository ppa:ondrej/php && \
1719
apt-get update && \
18-
apt-get install -y php7.2-cli php7.2-mbstring php7.2-xml php7.2-zip php7.2-intl php7.2-opcache php7.2-sqlite
20+
apt-get install -y php8.1-cli php8.1-mbstring php8.1-xml php8.1-zip php8.1-intl php8.1-opcache php8.1-sqlite
1921

2022
WORKDIR /code
2123

README.md

Lines changed: 3 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -38,7 +38,7 @@ $this->addPlugin('DebugKit');
3838

3939
If you don't see a CakePHP icon on the bottom right of your page DebugKit is not be
4040
working correctly. Some common problems are:
41-
41+
4242
1. Your PHP environment doesn't have SQLite installed. Check your application
4343
logs to confirm if this happening. You can either configure DebugKit to use
4444
a different database, or install the PDO SQLite 3 extension.
@@ -61,5 +61,5 @@ requests](https://help.github.com/articles/using-pull-requests) or open
6161

6262
## Documentation
6363

64-
Documentation for DebugKit can be found in the
65-
[CakePHP documentation](https://book.cakephp.org/debugkit/4/en/index.html).
64+
Documentation for DebugKit can be found in the
65+
[CakePHP documentation](https://book.cakephp.org/debugkit/5/en/index.html).

docs.Dockerfile

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -20,7 +20,7 @@ FROM ghcr.io/cakephp/docs-builder:runtime as runtime
2020
# Configure search index script
2121
ENV LANGS="en fr ja pt"
2222
ENV SEARCH_SOURCE="/usr/share/nginx/html"
23-
ENV SEARCH_URL_PREFIX="/debugkit/4"
23+
ENV SEARCH_URL_PREFIX="/debugkit/5"
2424

2525
COPY --from=builder /data/docs /data/docs
2626
COPY --from=builder /data/website /data/website

docs/config/all.py

Lines changed: 6 additions & 5 deletions
Original file line numberDiff line numberDiff line change
@@ -10,10 +10,10 @@
1010
#
1111

1212
# The full version, including alpha/beta/rc tags.
13-
release = '4.x'
13+
release = '5.x'
1414

1515
# The search index version.
16-
search_version = 'debugkit-4'
16+
search_version = 'debugkit-5'
1717

1818
# The marketing display name for the book.
1919
version_name = ''
@@ -24,18 +24,19 @@
2424
# Other versions that display in the version picker menu.
2525
version_list = [
2626
{'name': '3.x', 'number': 'debugkit/3.x', 'title': '3.x'},
27-
{'name': '4.x', 'number': 'debugkit/4.x', 'title': '4.x', 'current': True},
27+
{'name': '4.x', 'number': 'debugkit/4.x', 'title': '4.x'},
28+
{'name': '5.x', 'number': 'debugkit/5.x', 'title': '5.x', 'current': True},
2829
]
2930

3031
# Languages available.
3132
languages = ['en', 'fr', 'ja', 'pt']
3233

3334
# The GitHub branch name for this version of the docs
3435
# for edit links to point at.
35-
branch = '4.x'
36+
branch = '5.x'
3637

3738
# Current version being built
38-
version = '4.x'
39+
version = '5.x'
3940

4041
# Language in use for this directory.
4142
language = 'en'

0 commit comments

Comments
 (0)