Skip to content

Commit cd61980

Browse files
committedOct 4, 2015
Merge branch 'pr-14'
* pr-14: Remove the empty config.yaml file Auto-release. Sun Sep 27 02:25:40 CDT 2015. Auto-release. Sat Sep 26 10:50:03 CDT 2015. Auto-release. Mon Jul 6 00:40:37 CDT 2015. Auto-release. Wed Jun 17 10:42:55 CDT 2015. Fix installation instructions Auto-release. Thu Apr 23 13:24:57 BST 2015. Auto-release. Tue Apr 14 20:23:48 BST 2015. Disabling debug to do a release
2 parents 0d9a15e + 2e228c1 commit cd61980

File tree

1,089 files changed

+40320
-17543
lines changed

Some content is hidden

Large Commits have some content hidden by default. Use the searchbox below for content that may be hidden.

1,089 files changed

+40320
-17543
lines changed
 

‎README.md

+1-1
Original file line numberDiff line numberDiff line change
@@ -31,7 +31,7 @@ This is something that composer [very explicitly](https://github.com/composer/in
3131
Run the following command to include the vagrant environment provided by PuPHPet in your project:
3232

3333
```shell
34-
$ composer require --dev loadsys/puphpet-release:~0.0.4
34+
$ composer require --dev "phpfu/puphpet:@stable"
3535
```
3636

3737

‎bin/scrape-release.sh

+2-2
Original file line numberDiff line numberDiff line change
@@ -5,7 +5,7 @@
55

66

77
# Disables `git push` when set. Comment out to enable `git push`.
8-
DEBUG=On
8+
#DEBUG=On
99

1010
DIR="$( cd -P "$( dirname "$0" )"/.. >/dev/null 2>&1 && pwd )"
1111

@@ -72,7 +72,7 @@ fi
7272

7373
echo "## Staging release into \`${RELEASE_DIR}\`."
7474
mv -f "${TMP_UNZIP_DIR}/${RANDOM_SUB_DIR}" "${RELEASE_DIR}"
75-
75+
rm "${RELEASE_DIR}/puphpet/config.yaml"
7676

7777

7878
# Commit any and all changes to the release/ folder back into git.

0 commit comments

Comments
 (0)