From abfb8f7d7952163a00146bbf64583957b574173d Mon Sep 17 00:00:00 2001 From: Marko Korhonen Date: Wed, 24 Jun 2020 09:31:33 +0300 Subject: [PATCH] Change master branch to 1.x and 2.x --- README.md | 6 +++--- install.sh | 2 +- make/stonehenge.mk | 2 +- 3 files changed, 5 insertions(+), 5 deletions(-) diff --git a/README.md b/README.md index a299c166..fe917c11 100644 --- a/README.md +++ b/README.md @@ -4,7 +4,7 @@ Local development environment toolset on Docker supporting multiple projects. -[![Build Status](https://travis-ci.org/druidfi/stonehenge.svg?branch=master)](https://travis-ci.org/druidfi/stonehenge) +[![Build Status](https://travis-ci.org/druidfi/stonehenge.svg?branch=2.x)](https://travis-ci.org/druidfi/stonehenge) ## What does it do? @@ -41,13 +41,13 @@ Note: in some systems setup will prompt once for your password as it will setup ### Oneliner ``` -$ sh -c "$(curl -fsSL https://raw.githubusercontent.com/druidfi/stonehenge/master/install.sh)" +$ sh -c "$(curl -fsSL https://raw.githubusercontent.com/druidfi/stonehenge/2.x/install.sh)" ``` ### Or manually with Git ``` -$ git clone -b master https://github.com/druidfi/stonehenge.git ~/stonehenge +$ git clone -b 2.x https://github.com/druidfi/stonehenge.git ~/stonehenge $ cd ~/stonehenge $ make up ``` diff --git a/install.sh b/install.sh index ee2dd0a2..aae1ebbf 100755 --- a/install.sh +++ b/install.sh @@ -8,7 +8,7 @@ shopt -s xpg_echo REPO_FOLDER=~/stonehenge REPO_URL=https://github.com/druidfi/stonehenge.git -REPO_BRANCH=master +REPO_BRANCH=2.x GREEN='\033[0;32m' NC='\033[0m' # No Color diff --git a/make/stonehenge.mk b/make/stonehenge.mk index 9113a2cf..8737c0aa 100644 --- a/make/stonehenge.mk +++ b/make/stonehenge.mk @@ -71,7 +71,7 @@ upgrade: down update ## Upgrade Stonehenge (tear down the current first) PHONY += switch-to-1 switch-to-1: --down $(call step,Change to Stonehenge v1\n\n- Pull the latest code...) - @git checkout master && git pull + @git checkout 1.x && git pull @$(MAKE) up PHONY += switch-to-2