Merge 3.x into master

sonata-project · Feb 26, 2020 · b4bf2cd · b4bf2cd
2 parents b01f970 + a36fa7a
commit b4bf2cd
Show file tree

Hide file tree

Showing 4 changed files with 1 addition and 3 deletions.
diff --git a/.github/stale.yml b/.github/stale.yml
diff --git a/.github/workflows/lint.yml → .github/workflows/lint.yaml b/.github/workflows/lint.yml → .github/workflows/lint.yaml
@@ -59,7 +59,7 @@ jobs:
             - name: "Checkout"
               uses: actions/checkout@v2
 
-            - run: sudo apt-get install libxml2-utils
+            - run: sudo apt-get update && sudo apt-get install libxml2-utils
 
             - name: "Linting..."
               run: make lint-xml
diff --git a/.github/workflows/stale.yml → .github/workflows/stale.yaml b/.github/workflows/stale.yml → .github/workflows/stale.yaml
diff --git a/.travis.yml b/.travis.yml
@@ -41,7 +41,6 @@ matrix:
     - php: '7.3'
       env: SYMFONY_DEPRECATIONS_HELPER=0
   allow_failures:
-    - php: 7.4snapshot
     - php: nightly
     - env: SYMFONY_DEPRECATIONS_HELPER=0
     - env: SYMFONY='dev-master as 4.4.x-dev'