Merge 3.x into master

sonata-project · Feb 12, 2020 · 3306f9a · 3306f9a
2 parents c83dc65 + f9b5c0d
commit 3306f9a
Show file tree

Hide file tree

Showing 6 changed files with 56 additions and 29 deletions.
diff --git a/.github/workflows/documentation.yaml b/.github/workflows/documentation.yaml
@@ -0,0 +1,53 @@
+on:
+    push:
+        paths:
+            - 'docs/**'
+
+    pull_request:
+        paths:
+            - 'docs/**'
+
+name: Documentation
+
+jobs:
+    build:
+        name: Build
+
+        runs-on: ubuntu-latest
+
+        steps:
+            - name: "Checkout"
+              uses: actions/checkout@v2
+
+            - name: "Set up Python 3.7"
+              uses: actions/setup-python@v1
+              with:
+                  python-version: '3.7' # Semantic version range syntax or exact version of a Python version
+
+            - name: "Display Python version"
+              run: python -c "import sys; print(sys.version)"
+
+            - name: "Install Sphinx dependencies"
+              run: sudo apt-get install python-dev build-essential
+
+            - name: "Install custom requirements via pip"
+              run: pip install -r docs/requirements.txt
+
+            - name: "Build documentation"
+              run: make docs
+
+    doctor-rst:
+        name: DOCtor-RST
+
+        runs-on: ubuntu-latest
+
+        steps:
+            - name: "Checkout"
+              uses: actions/checkout@master
+
+            - name: "Run DOCtor-RST"
+              uses: docker://oskarstark/doctor-rst
+              with:
+                  args: --short
+              env:
+                  DOCS_DIR: 'docs/'
diff --git a/.github/workflows/lint.yaml b/.github/workflows/lint.yaml
diff --git a/.travis.yml b/.travis.yml
@@ -38,8 +38,6 @@ env:
 matrix:
   fast_finish: true
   include:
-    - php: '7.3'
-      env: TARGET=docs
     - php: '7.3'
       env: TARGET=lint
     - php: '7.2'

diff --git a/.travis/check_relevant_docs.sh b/.travis/check_relevant_docs.sh
diff --git a/.travis/install_docs.sh b/.travis/install_docs.sh
diff --git a/composer.json b/composer.json
@@ -37,13 +37,13 @@
         "sonata-project/user-bundle": "^4.0",
         "symfony/config": "^3.4 || ^4.0",
         "symfony/console": "^3.4 || ^4.0",
-        "symfony/dependency-injection": "^3.4 || ^4.0",
+        "symfony/dependency-injection": "^3.4.26 || ^4.1.12",
         "symfony/doctrine-bridge": "^3.4 || ^4.0",
         "symfony/event-dispatcher": "^3.4 || ^4.0",
         "symfony/filesystem": "^3.4 || ^4.0",
         "symfony/form": "^3.4 || ^4.0",
-        "symfony/framework-bundle": "^3.4 || ^4.0",
-        "symfony/http-foundation": "^3.4 || ^4.0",
+        "symfony/framework-bundle": "^3.4.26 || ^4.1.12",
+        "symfony/http-foundation": "^3.4.35 || ^4.2.12",
         "symfony/http-kernel": "^3.4 || ^4.0",
         "symfony/intl": "^3.4 || ^4.0",
         "symfony/options-resolver": "^3.4 || ^4.0",