From 28b26b57f907662be00d247bb12f0c9bba4083f3 Mon Sep 17 00:00:00 2001 From: Omkar Bhagat Date: Wed, 21 Oct 2020 18:01:27 +0530 Subject: [PATCH 1/5] Update subscriptins github repo URL Updating it from Prospress/woocommerce-subscriptions to woocommerce/woocommerce-subscriptions --- tests/bin/travis.sh | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/tests/bin/travis.sh b/tests/bin/travis.sh index 9f13540..f7dc3ac 100755 --- a/tests/bin/travis.sh +++ b/tests/bin/travis.sh @@ -16,7 +16,7 @@ if [ $1 == 'before' ]; then say "WooCommerce Installed" # place a copy of woocommerce subscriptions where the unit tests etc. expect it to be - needs to be a repo with the test dir - git clone https://$GITHUB_TOKEN@github.com/Prospress/woocommerce-subscriptions.git "../woocommerce-subscriptions" -b $WCS_VERSION + git clone https://$GITHUB_TOKEN@github.com/woocommerce/woocommerce-subscriptions.git "../woocommerce-subscriptions" -b $WCS_VERSION say "WooCommerce Subscriptions Installed" From 7137a907c699fe4aaa262bb84962e25a5cd96a00 Mon Sep 17 00:00:00 2001 From: Omkar Bhagat Date: Thu, 22 Oct 2020 17:19:51 +0530 Subject: [PATCH 2/5] Update script for WCS install --- tests/bin/travis.sh | 15 +++++++++------ 1 file changed, 9 insertions(+), 6 deletions(-) diff --git a/tests/bin/travis.sh b/tests/bin/travis.sh index f7dc3ac..9695c16 100755 --- a/tests/bin/travis.sh +++ b/tests/bin/travis.sh @@ -15,9 +15,12 @@ if [ $1 == 'before' ]; then say "WooCommerce Installed" - # place a copy of woocommerce subscriptions where the unit tests etc. expect it to be - needs to be a repo with the test dir - git clone https://$GITHUB_TOKEN@github.com/woocommerce/woocommerce-subscriptions.git "../woocommerce-subscriptions" -b $WCS_VERSION - - say "WooCommerce Subscriptions Installed" - -fi \ No newline at end of file +fi + +# Install WooCommerce Subscriptions. +if [[ -n "$GITHUB_TOKEN" ]]; then + WCS_GIT_URI="https://$GITHUB_TOKEN@github.com/woocommerce/woocommerce-subscriptions.git" +else + WCS_GIT_URI="git@github.com:woocommerce/woocommerce-subscriptions.git" +fi +git clone --depth=1 --branch="${WCS_VERSION}" "$WCS_GIT_URI" "${WP_CORE_DIR}/wp-content/plugins/woocommerce-subscriptions" From 431533a5971415e22c1cd10043675d533390d90b Mon Sep 17 00:00:00 2001 From: Omkar Bhagat Date: Fri, 23 Oct 2020 20:39:54 +0530 Subject: [PATCH 3/5] Another attempt at fixing the WCS repo URI --- tests/bin/travis.sh | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/tests/bin/travis.sh b/tests/bin/travis.sh index 9695c16..be104d4 100755 --- a/tests/bin/travis.sh +++ b/tests/bin/travis.sh @@ -23,4 +23,4 @@ if [[ -n "$GITHUB_TOKEN" ]]; then else WCS_GIT_URI="git@github.com:woocommerce/woocommerce-subscriptions.git" fi -git clone --depth=1 --branch="${WCS_VERSION}" "$WCS_GIT_URI" "${WP_CORE_DIR}/wp-content/plugins/woocommerce-subscriptions" +git clone "$WCS_GIT_URI" "../woocommerce-subscriptions" --branch="${WCS_VERSION}" \ No newline at end of file From dca26daed66a2202c20e18957a8efb19602650b1 Mon Sep 17 00:00:00 2001 From: Achyuth Ajoy Date: Mon, 9 Nov 2020 20:41:22 +0530 Subject: [PATCH 4/5] Removed conditional script to clone WCS --- tests/bin/travis.sh | 7 +------ 1 file changed, 1 insertion(+), 6 deletions(-) diff --git a/tests/bin/travis.sh b/tests/bin/travis.sh index be104d4..924bdc6 100755 --- a/tests/bin/travis.sh +++ b/tests/bin/travis.sh @@ -18,9 +18,4 @@ if [ $1 == 'before' ]; then fi # Install WooCommerce Subscriptions. -if [[ -n "$GITHUB_TOKEN" ]]; then - WCS_GIT_URI="https://$GITHUB_TOKEN@github.com/woocommerce/woocommerce-subscriptions.git" -else - WCS_GIT_URI="git@github.com:woocommerce/woocommerce-subscriptions.git" -fi -git clone "$WCS_GIT_URI" "../woocommerce-subscriptions" --branch="${WCS_VERSION}" \ No newline at end of file +git clone https://$GITHUB_TOKEN@github.com/woocommerce/woocommerce-subscriptions.git "../woocommerce-subscriptions" --branch $WCS_VERSION From 0adf26231cb7276ec6012110029d50e3e6b0c886 Mon Sep 17 00:00:00 2001 From: Achyuth Ajoy Date: Fri, 18 Dec 2020 16:49:30 +0530 Subject: [PATCH 5/5] Script Refactoring --- tests/bin/travis.sh | 8 +++----- 1 file changed, 3 insertions(+), 5 deletions(-) diff --git a/tests/bin/travis.sh b/tests/bin/travis.sh index 924bdc6..64233ef 100755 --- a/tests/bin/travis.sh +++ b/tests/bin/travis.sh @@ -8,14 +8,12 @@ say() { } if [ $1 == 'before' ]; then - # place a copy of woocommerce where the unit tests etc. expect it to be mkdir -p "../woocommerce" curl -L https://api.github.com/repos/woothemes/woocommerce/tarball/$WC_VERSION?access_token=$GITHUB_TOKEN --silent | tar --strip-components=1 -zx -C "../woocommerce" - say "WooCommerce Installed" + # Install WooCommerce Subscriptions. + git clone https://$GITHUB_TOKEN@github.com/woocommerce/woocommerce-subscriptions.git "../woocommerce-subscriptions" --branch $WCS_VERSION + say "WooCommerce Subscriptions Installed" fi - -# Install WooCommerce Subscriptions. -git clone https://$GITHUB_TOKEN@github.com/woocommerce/woocommerce-subscriptions.git "../woocommerce-subscriptions" --branch $WCS_VERSION