From 4470dce049fe3e11e8c176564cc0fc4b7aefce00 Mon Sep 17 00:00:00 2001 From: William Desportes Date: Fri, 8 Jan 2021 21:45:45 +0100 Subject: [PATCH 1/2] Update Debian link to use the DEP-14 convention I applied DEP-14 on the Debian repo. master branch does not exist anymore. Cherry-pick: 8f44729648547b14031c3da10fef9bbaa6c30a0a Signed-off-by: William Desportes --- doc/setup.rst | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/doc/setup.rst b/doc/setup.rst index 6c614a6eb5..0d1719c66d 100644 --- a/doc/setup.rst +++ b/doc/setup.rst @@ -38,7 +38,7 @@ some ways from the official phpMyAdmin documentation. Specifically, it does: .. seealso:: - More information can be found in `README.Debian `_ + More information can be found in `README.Debian `_ (it is installed as :file:`/usr/share/doc/phpmyadmin/README.Debian` with the package). OpenSUSE From b1ed10e4800fa134b265be6e0808ab7a3868a361 Mon Sep 17 00:00:00 2001 From: William Desportes Date: Sat, 23 Jan 2021 16:00:24 +0100 Subject: [PATCH 2/2] #16583 - Remove useless yarn installs and things from TravisCI config Signed-off-by: William Desportes --- .travis.yml | 16 ++++------------ 1 file changed, 4 insertions(+), 12 deletions(-) diff --git a/.travis.yml b/.travis.yml index c58d811d5e..d00c9b8b98 100644 --- a/.travis.yml +++ b/.travis.yml @@ -3,15 +3,11 @@ dist: xenial language: php stages: - - name: "Lint and analyse code" - name: "PHP Unit tests" - name: "Other tests" - - name: "Documentation" install: - - nvm install 10 - composer install --no-interaction - - yarn install --non-interactive script: - ./scripts/generate-mo --quiet @@ -35,16 +31,12 @@ jobs: - stage: "PHP Unit tests" php: nightly name: "PHP nightly" - env: CI_MODE=test install: - composer install --no-interaction --ignore-platform-reqs - - nvm install 10 - - yarn install --non-interactive - stage: "PHP Unit tests" name: "OSX" os: osx - env: CI_MODE=test language: node_js node_js: 10 before_install: @@ -63,12 +55,8 @@ jobs: os: windows language: node_js node_js: 10 - env: - - CI_MODE=test - - YARN_GPG=no install: - composer install --no-interaction --ignore-platform-reqs - - yarn install --non-interactive before_install: - choco install php composer - export PATH=/c/tools/php80:/c/ProgramData/ComposerSetup/bin:$PATH @@ -88,6 +76,10 @@ jobs: - TESTSUITE_SELENIUM_HOST="127.0.0.1" - TESTSUITE_SELENIUM_PORT="4444" - SKIP_STANDALONE=1 + install: + - nvm install 10 + - composer install --no-interaction + - yarn install --non-interactive before_install: - docker run -d -e SCREEN_WIDTH=1920 -e SCREEN_HEIGHT=1080 --rm --name=selenium --net=host -v /dev/shm:/dev/shm selenium/standalone-chrome:3.141.59 - phpenv config-rm xdebug.ini