Skip to content

Commit 49e0c70

Browse files
committed
Merge branch '3.4' into 4.1
* 3.4: Migrate PR builds to SymfonyCloud
2 parents 366a653 + b168fea commit 49e0c70

File tree

4 files changed

+13
-21
lines changed

4 files changed

+13
-21
lines changed

.platform/routes.yaml

-16
This file was deleted.

.platform.app.yaml renamed to .symfony.cloud.yaml

+2-5
Original file line numberDiff line numberDiff line change
@@ -5,10 +5,7 @@
55
name: symfonydocs
66

77
# The toolstack used to build the application.
8-
type: "php"
9-
10-
build:
11-
flavor: "composer"
8+
type: "python:3.7"
129

1310
# The configuration of app when it is exposed to the web.
1411
web:
@@ -53,7 +50,7 @@ hooks:
5350
build: |
5451
virtualenv .virtualenv
5552
. .virtualenv/bin/activate
56-
# Platform.sh currently sets PIP_USER=1.
53+
# SymfonyCloud currently sets PIP_USER=1.
5754
export PIP_USER=
5855
pip install pip==9.0.1 wheel==0.29.0
5956
pip install -r _build/.requirements.txt

.symfony/routes.yaml

+11
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,11 @@
1+
https://{default}/:
2+
cache:
3+
cookies:
4+
- '*'
5+
default_ttl: 0
6+
enabled: true
7+
headers:
8+
- Accept
9+
- Accept-Language
10+
type: upstream
11+
upstream: symfonydocs:http
File renamed without changes.

0 commit comments

Comments
 (0)