From f64c4017e499430895e973b4cece2dcec78e0160 Mon Sep 17 00:00:00 2001 From: Scott Kingsley Clark Date: Mon, 10 Aug 2015 15:26:07 -0500 Subject: [PATCH 1/4] Readme tweaks --- README.md | 12 ++++++------ 1 file changed, 6 insertions(+), 6 deletions(-) diff --git a/README.md b/README.md index 3d814a32d1..914d47da01 100644 --- a/README.md +++ b/README.md @@ -1,8 +1,8 @@ # [Pods Framework](http://pods.io) # -[![Travis](https://secure.travis-ci.org/pods-framework/pods.png?branch=2.x)](http://travis-ci.org/pods-framework/pods) -[![Scrutinizer Code Quality](https://scrutinizer-ci.com/g/pods-framework/pods/badges/quality-score.png?b=2.x)](https://scrutinizer-ci.com/g/pods-framework/pods/?branch=2.x) -[![Code Coverage](https://scrutinizer-ci.com/g/pods-framework/pods/badges/coverage.png?b=2.x)](https://scrutinizer-ci.com/g/pods-framework/pods/?branch=2.x) -[![License](https://img.shields.io/badge/license-GPL--2.0%2B-green.svg)](https://github.com/pods-framework/pods/blob/2.x/license.txt) +[![Travis](https://secure.travis-ci.org/pods-framework/pods.png?branch=master)](http://travis-ci.org/pods-framework/pods) +[![Scrutinizer Code Quality](https://scrutinizer-ci.com/g/pods-framework/pods/badges/quality-score.png?b=master)](https://scrutinizer-ci.com/g/pods-framework/pods/?branch=master) +[![Code Coverage](https://scrutinizer-ci.com/g/pods-framework/pods/badges/coverage.png?b=master)](https://scrutinizer-ci.com/g/pods-framework/pods/?branch=master) +[![License](https://img.shields.io/badge/license-GPL--2.0%2B-green.svg)](https://github.com/pods-framework/pods/blob/master/license.txt) [![WordPress Plugin version](https://img.shields.io/wordpress/plugin/v/pods.svg?style=flat)](https://wordpress.org/plugins/pods/) [![WordPress Plugin WP tested version](https://img.shields.io/wordpress/v/pods.svg?style=flat)](https://wordpress.org/plugins/pods/) @@ -21,7 +21,7 @@ Check out for our User Guide and many other resources to help For detailed setup instructions, visit the official [Documentation](http://pods.io/docs/) page. 1. You can clone the GitHub repository: `https://github.com/pods-framework/pods.git` -2. Or download it directly as a ZIP file: `https://github.com/pods-framework/pods/archive/2.x.zip` +2. Or download it directly as a ZIP file: `https://github.com/pods-framework/pods/archive/master.zip` This will download the latest stable copy of Pods Framework. @@ -35,7 +35,7 @@ If you find an issue that you believe to be a *bug*, [let us know](https://githu ## Contributions Welcome -Anyone is welcome to contribute to Pods Framework. Please read the [guidelines for contributing](https://github.com/pods-framework/pods/blob/2.x/CONTRIBUTING.md) to this repository. +Anyone is welcome to contribute to Pods Framework. Please read the [guidelines for contributing](https://github.com/pods-framework/pods/blob/master/CONTRIBUTING.md) to this repository. There are various ways you can contribute: From c79cb01d4966797e33c1d96a266e8f8f9b258259 Mon Sep 17 00:00:00 2001 From: Scott Kingsley Clark Date: Mon, 10 Aug 2015 15:33:02 -0500 Subject: [PATCH 2/4] Gruntfile fix --- Gruntfile.js | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/Gruntfile.js b/Gruntfile.js index 6fbcc0700a..89a66b395a 100644 --- a/Gruntfile.js +++ b/Gruntfile.js @@ -161,7 +161,7 @@ module.exports = function ( grunt ) { //release tasks grunt.registerTask( 'version_number', [ 'replace:reamdme_txt', 'replace:init_php' ] ); grunt.registerTask( 'pre_vcs', [ 'version_number', 'glotpress_download', 'clean:post_build', 'mkdir:build' ] ); - grunt.registerTask( 'do_svn', [ 'svn_checkout', 'copy:svn_trunk', 'copy:svn_tag', 'push_svn' ] ); + grunt.registerTask( 'do_svn', [ 'svn_checkout', 'copy:svn_trunk', 'push_svn' ] ); grunt.registerTask( 'do_git', [ 'gitcommit', 'gittag', 'gitpush' ] ); grunt.registerTask( 'release', [ 'pre_vcs', 'do_svn', 'do_git', 'clean:post_build' ] ); From 819f9eee1014573e2dc5efde0bd66f91445fdf88 Mon Sep 17 00:00:00 2001 From: Scott Kingsley Clark Date: Mon, 10 Aug 2015 15:35:35 -0500 Subject: [PATCH 3/4] Pods 2.5.4 --- Gruntfile.js | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/Gruntfile.js b/Gruntfile.js index 89a66b395a..4657436768 100644 --- a/Gruntfile.js +++ b/Gruntfile.js @@ -161,7 +161,7 @@ module.exports = function ( grunt ) { //release tasks grunt.registerTask( 'version_number', [ 'replace:reamdme_txt', 'replace:init_php' ] ); grunt.registerTask( 'pre_vcs', [ 'version_number', 'glotpress_download', 'clean:post_build', 'mkdir:build' ] ); - grunt.registerTask( 'do_svn', [ 'svn_checkout', 'copy:svn_trunk', 'push_svn' ] ); + grunt.registerTask( 'do_svn', [ 'svn_checkout', 'copy:svn_trunk', 'push_svn', 'svn_copy' ] ); grunt.registerTask( 'do_git', [ 'gitcommit', 'gittag', 'gitpush' ] ); grunt.registerTask( 'release', [ 'pre_vcs', 'do_svn', 'do_git', 'clean:post_build' ] ); From 33580ff72599c0037cfc4d5aefa685f805db607a Mon Sep 17 00:00:00 2001 From: Scott Kingsley Clark Date: Mon, 10 Aug 2015 15:58:29 -0500 Subject: [PATCH 4/4] Fixed remote copy in release workflow --- Gruntfile.js | 5 ++++- 1 file changed, 4 insertions(+), 1 deletion(-) diff --git a/Gruntfile.js b/Gruntfile.js index 4657436768..ab5c2615f6 100644 --- a/Gruntfile.js +++ b/Gruntfile.js @@ -132,7 +132,10 @@ module.exports = function ( grunt ) { svn_copy: { options: {}, files: { - 'http://plugins.svn.wordpress.org/<%= pkg.name %>/trunk' : 'http://plugins.svn.wordpress.org/<%= pkg.name %>/tags/<%= pkg.version %>' + // This is switched, dest = source and src = target, svn_copy code is wrong + // See: https://github.com/ColmMcBarron/grunt-svn-copy/issues/1 + dest: 'http://plugins.svn.wordpress.org/<%= pkg.name %>/trunk', + src: 'http://plugins.svn.wordpress.org/<%= pkg.name %>/tags/<%= pkg.version %> -m "<%= pkg.name %>/<%= pkg.version %>"' } },