From ddc9f6fc360d251423d1e43c1914afaddc35019b Mon Sep 17 00:00:00 2001 From: Fabian Schmengler Date: Sat, 5 Sep 2020 18:15:14 +0200 Subject: [PATCH 1/2] Set version in CHANGELOG --- CHANGELOG.md | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/CHANGELOG.md b/CHANGELOG.md index e64b6d2..68e06c4 100644 --- a/CHANGELOG.md +++ b/CHANGELOG.md @@ -4,7 +4,7 @@ All notable changes to this project will be documented in this file. The format is based on [Keep a Changelog](http://keepachangelog.com/en/1.0.0/) and this project adheres to [Semantic Versioning](http://semver.org/spec/v2.0.0.html). -## [Unreleased] +## [1.0.0] ### Added - Cronjob that generates rewrite map files for each store and redirect type From 4da868af8b77922bb7a012954694710ccc197fe8 Mon Sep 17 00:00:00 2001 From: Fabian Schmengler Date: Sat, 5 Sep 2020 18:22:14 +0200 Subject: [PATCH 2/2] Enable building pull requests in Travis --- .travis/before_script.sh | 8 ++++++-- 1 file changed, 6 insertions(+), 2 deletions(-) diff --git a/.travis/before_script.sh b/.travis/before_script.sh index 1e3bc8f..1f530ee 100755 --- a/.travis/before_script.sh +++ b/.travis/before_script.sh @@ -23,11 +23,15 @@ cd magento2 # add composer package under test, composer require will trigger update/install composer config minimum-stability dev -composer config repositories.travis_to_test git https://github.com/$TRAVIS_REPO_SLUG.git - +composer config repositories.travis_to_test git https://github.com/${TRAVIS_REPO_SLUG}.git if [ ! -z $TRAVIS_TAG ] then composer require ${COMPOSER_PACKAGE_NAME}:${TRAVIS_TAG} +elif [ ! -z $TRAVIS_PULL_REQUEST_BRANCH ] +then + # For pull requests, use the remote repository + composer config repositories.travis_to_test git https://github.com/${TRAVIS_PULL_REQUEST_SLUG}.git + composer require ${COMPOSER_PACKAGE_NAME}:dev-${TRAVIS_PULL_REQUEST_BRANCH}\#${TRAVIS_PULL_REQUEST_SHA} else composer require ${COMPOSER_PACKAGE_NAME}:dev-${TRAVIS_BRANCH}\#${TRAVIS_COMMIT} fi