Skip to content

Commit

Permalink
Change master branch to 1.x and 2.x
Browse files Browse the repository at this point in the history
  • Loading branch information
back-2-95 committed Jun 24, 2020
1 parent d1e770b commit abfb8f7
Show file tree
Hide file tree
Showing 3 changed files with 5 additions and 5 deletions.
6 changes: 3 additions & 3 deletions README.md
Original file line number Diff line number Diff line change
Expand Up @@ -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?

Expand Down Expand Up @@ -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
```
Expand Down
2 changes: 1 addition & 1 deletion install.sh
Original file line number Diff line number Diff line change
Expand Up @@ -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
Expand Down
2 changes: 1 addition & 1 deletion make/stonehenge.mk
Original file line number Diff line number Diff line change
Expand Up @@ -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
Expand Down

0 comments on commit abfb8f7

Please sign in to comment.