From 50b0d259ba9b31cfe5c94da82d9fdf1838de6e46 Mon Sep 17 00:00:00 2001
From: noud-github <arnoud@yoast.com>
Date: Fri, 14 May 2021 11:54:41 +0200
Subject: [PATCH 1/9] add initial steps for deploy to yoast-dist in .travis.yml

---
 .travis.yml                         |  32 ++++++++++++++
 config/travis/deploy_to_dist.sh     |  66 ++++++++++++++++++++++++++++
 config/travis/id_rsa_yoast_dist.enc | Bin 0 -> 3248 bytes
 3 files changed, 98 insertions(+)
 create mode 100755 config/travis/deploy_to_dist.sh
 create mode 100644 config/travis/id_rsa_yoast_dist.enc

diff --git a/.travis.yml b/.travis.yml
index 796722803..13b69782d 100644
--- a/.travis.yml
+++ b/.travis.yml
@@ -37,6 +37,38 @@ jobs:
       env: LINT=1 PHPUNIT=1
     - php: "nightly"
       env: LINT=1 PHPUNIT=1
+    - stage: 🚀 deployment
+      name: "Deploy to Yoast-dist"
+      php: 7.2
+      install:
+        - yarn global add grunt-cli
+        - yarn install
+      before_script: skip
+      script:
+        - |
+          if [[ ! -z "$TRAVIS_TAG" ]]; then
+            grunt set-version -new-version=$TRAVIS_TAG
+            grunt update-version
+          fi
+        - grunt artifact
+      if: ( tag IS present OR branch =~ /^feature\// OR branch =~ /^release\// OR branch =~ /^hotfix\// OR branch = trunk ) AND type != pull_request
+      before_install:
+        - nvm install lts/*
+        - curl -o- -L https://yarnpkg.com/install.sh | bash
+        - export PATH=$HOME/.yarn/bin:$PATH
+        - openssl aes-256-cbc -K $encrypted_e268719177eb_key -iv $encrypted_e268719177eb_iv -in config/travis/deploy_keys/id_rsa_yoast_dist.enc -out config/travis/deploy_keys/id_rsa_yoast_dist -d
+        - chmod 600 config/travis/deploy_keys/id_rsa_yoast_dist
+        - eval $(ssh-agent -s)
+        - ssh-add config/travis/deploy_keys/id_rsa_yoast_dist
+
+      # If the commit was tagged, create an artifact and push it to the distribution github
+      deploy:
+        skip_cleanup: true
+        provider: script
+        script: bash config/travis/deploy_to_dist.sh ${TRAVIS_TAG:-$TRAVIS_BRANCH} duplicate-post
+        on:
+          repo: $TRAVIS_REPO_SLUG
+          all_branches: true
 
   allow_failures:
     - php: "nightly"
diff --git a/config/travis/deploy_to_dist.sh b/config/travis/deploy_to_dist.sh
new file mode 100755
index 000000000..c1e1d0023
--- /dev/null
+++ b/config/travis/deploy_to_dist.sh
@@ -0,0 +1,66 @@
+#!/usr/bin/env bash
+
+######################
+## Deployment script #
+######################
+## arg 1: git tag   ##
+## arg 2: repo-name ##
+######################
+
+set -ex
+
+if [ -z "$1" ]; then
+    echo 'The first argument should be the version you want to deploy to dist.'
+    exit 1
+fi
+
+if [ -z "$2" ]; then
+    echo 'The second argument should be the repo name.'
+    exit 1
+fi
+
+# Repo to deploy to:
+USER="Yoast-dist"
+REPO=$2
+REPO_URL="git@github.com:$USER/$REPO.git"
+
+# Get the latest tag.
+lastTag=$1
+branch="master"
+mainDir=$(pwd)
+
+if [[ $lastTag =~ ^feature/* || $lastTag =~ ^release/* || $lastTag =~ ^hotfix/* || $lastTag == "develop" ]]; then
+  branch=$lastTag
+fi
+
+# Clone the dist repo.
+rm -rf ./dist-repo
+git clone ${REPO_URL} dist-repo
+cd dist-repo
+git checkout $branch 2>/dev/null || git checkout -b $branch
+cd ..
+
+# Copy the git folder with the entire history.
+cp -r ./dist-repo/.git ./artifact
+cp composer.json ./artifact
+
+# Remove the vendor directory from the artifact, composer will generate it's own autoload.
+rm -rf ./artifact/vendor
+
+# Navigate to the to be committed folder.
+cd ./artifact
+
+# Commit the files.
+git add -A
+
+# If it's a feature, release or trunk branch.
+if [[ $lastTag =~ ^feature/* || $lastTag =~ ^release/* || $lastTag =~ ^hotfix/* || $lastTag == "develop" ]]; then
+  git commit --allow-empty -m "${TRAVIS_COMMIT_MESSAGE}"
+else
+  git commit -m "Release ${lastTag}"
+   # Tag the commit.
+  git tag ${lastTag}
+fi
+
+# Push to remote.
+git push -u origin $branch --tags
diff --git a/config/travis/id_rsa_yoast_dist.enc b/config/travis/id_rsa_yoast_dist.enc
new file mode 100644
index 0000000000000000000000000000000000000000..e34372b90a141559e464ecbd132b9df05d993d78
GIT binary patch
literal 3248
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

literal 0
HcmV?d00001


From 3e010406969af6f9ea4acb366dcc31d4233445ef Mon Sep 17 00:00:00 2001
From: noud-github <arnoud@yoast.com>
Date: Fri, 14 May 2021 12:01:17 +0200
Subject: [PATCH 2/9] revert travis.yml to see it work without mod.

---
 .travis.yml | 32 --------------------------------
 1 file changed, 32 deletions(-)

diff --git a/.travis.yml b/.travis.yml
index 13b69782d..796722803 100644
--- a/.travis.yml
+++ b/.travis.yml
@@ -37,38 +37,6 @@ jobs:
       env: LINT=1 PHPUNIT=1
     - php: "nightly"
       env: LINT=1 PHPUNIT=1
-    - stage: 🚀 deployment
-      name: "Deploy to Yoast-dist"
-      php: 7.2
-      install:
-        - yarn global add grunt-cli
-        - yarn install
-      before_script: skip
-      script:
-        - |
-          if [[ ! -z "$TRAVIS_TAG" ]]; then
-            grunt set-version -new-version=$TRAVIS_TAG
-            grunt update-version
-          fi
-        - grunt artifact
-      if: ( tag IS present OR branch =~ /^feature\// OR branch =~ /^release\// OR branch =~ /^hotfix\// OR branch = trunk ) AND type != pull_request
-      before_install:
-        - nvm install lts/*
-        - curl -o- -L https://yarnpkg.com/install.sh | bash
-        - export PATH=$HOME/.yarn/bin:$PATH
-        - openssl aes-256-cbc -K $encrypted_e268719177eb_key -iv $encrypted_e268719177eb_iv -in config/travis/deploy_keys/id_rsa_yoast_dist.enc -out config/travis/deploy_keys/id_rsa_yoast_dist -d
-        - chmod 600 config/travis/deploy_keys/id_rsa_yoast_dist
-        - eval $(ssh-agent -s)
-        - ssh-add config/travis/deploy_keys/id_rsa_yoast_dist
-
-      # If the commit was tagged, create an artifact and push it to the distribution github
-      deploy:
-        skip_cleanup: true
-        provider: script
-        script: bash config/travis/deploy_to_dist.sh ${TRAVIS_TAG:-$TRAVIS_BRANCH} duplicate-post
-        on:
-          repo: $TRAVIS_REPO_SLUG
-          all_branches: true
 
   allow_failures:
     - php: "nightly"

From 9cc511984d0640f94f656c3c3c1862f67a53ec3d Mon Sep 17 00:00:00 2001
From: noud-github <arnoud@yoast.com>
Date: Fri, 14 May 2021 12:14:33 +0200
Subject: [PATCH 3/9] Revert "revert travis.yml to see it work without mod."

This reverts commit 3e010406969af6f9ea4acb366dcc31d4233445ef.
---
 .travis.yml | 32 ++++++++++++++++++++++++++++++++
 1 file changed, 32 insertions(+)

diff --git a/.travis.yml b/.travis.yml
index 796722803..13b69782d 100644
--- a/.travis.yml
+++ b/.travis.yml
@@ -37,6 +37,38 @@ jobs:
       env: LINT=1 PHPUNIT=1
     - php: "nightly"
       env: LINT=1 PHPUNIT=1
+    - stage: 🚀 deployment
+      name: "Deploy to Yoast-dist"
+      php: 7.2
+      install:
+        - yarn global add grunt-cli
+        - yarn install
+      before_script: skip
+      script:
+        - |
+          if [[ ! -z "$TRAVIS_TAG" ]]; then
+            grunt set-version -new-version=$TRAVIS_TAG
+            grunt update-version
+          fi
+        - grunt artifact
+      if: ( tag IS present OR branch =~ /^feature\// OR branch =~ /^release\// OR branch =~ /^hotfix\// OR branch = trunk ) AND type != pull_request
+      before_install:
+        - nvm install lts/*
+        - curl -o- -L https://yarnpkg.com/install.sh | bash
+        - export PATH=$HOME/.yarn/bin:$PATH
+        - openssl aes-256-cbc -K $encrypted_e268719177eb_key -iv $encrypted_e268719177eb_iv -in config/travis/deploy_keys/id_rsa_yoast_dist.enc -out config/travis/deploy_keys/id_rsa_yoast_dist -d
+        - chmod 600 config/travis/deploy_keys/id_rsa_yoast_dist
+        - eval $(ssh-agent -s)
+        - ssh-add config/travis/deploy_keys/id_rsa_yoast_dist
+
+      # If the commit was tagged, create an artifact and push it to the distribution github
+      deploy:
+        skip_cleanup: true
+        provider: script
+        script: bash config/travis/deploy_to_dist.sh ${TRAVIS_TAG:-$TRAVIS_BRANCH} duplicate-post
+        on:
+          repo: $TRAVIS_REPO_SLUG
+          all_branches: true
 
   allow_failures:
     - php: "nightly"

From ef131ce5949befd4527cd0eb8f67218b3c99c733 Mon Sep 17 00:00:00 2001
From: noud-github <arnoud@yoast.com>
Date: Fri, 14 May 2021 12:22:54 +0200
Subject: [PATCH 4/9] add branch to travis.yml

---
 .travis.yml | 1 +
 1 file changed, 1 insertion(+)

diff --git a/.travis.yml b/.travis.yml
index 13b69782d..f22271879 100644
--- a/.travis.yml
+++ b/.travis.yml
@@ -10,6 +10,7 @@ branches:
     - /^feature\/*/
     # Also build tags like 1.1.1 or 1.1 for deployment.
     - /^\d+\.\d+(\.\d+)?(-\S*)?$/
+    - push-to-dist
 
 cache:
   directories:

From 82063ca9d071641afdc4cc5338a47bd44769b565 Mon Sep 17 00:00:00 2001
From: noud-github <arnoud@yoast.com>
Date: Fri, 14 May 2021 12:48:16 +0200
Subject: [PATCH 5/9] add branch to stage deploy travis.yml

---
 .travis.yml | 3 ++-
 1 file changed, 2 insertions(+), 1 deletion(-)

diff --git a/.travis.yml b/.travis.yml
index f22271879..54773e2cf 100644
--- a/.travis.yml
+++ b/.travis.yml
@@ -10,6 +10,7 @@ branches:
     - /^feature\/*/
     # Also build tags like 1.1.1 or 1.1 for deployment.
     - /^\d+\.\d+(\.\d+)?(-\S*)?$/
+    # for testing deploy
     - push-to-dist
 
 cache:
@@ -52,7 +53,7 @@ jobs:
             grunt update-version
           fi
         - grunt artifact
-      if: ( tag IS present OR branch =~ /^feature\// OR branch =~ /^release\// OR branch =~ /^hotfix\// OR branch = trunk ) AND type != pull_request
+      if: ( tag IS present OR branch =~ /^feature\// OR branch =~ /^release\// OR branch =~ /^hotfix\// OR branch = trunk OR branch = push-to-dist ) AND type != pull_request
       before_install:
         - nvm install lts/*
         - curl -o- -L https://yarnpkg.com/install.sh | bash

From e4106241c06190195a12b587ecea40314dd3e110 Mon Sep 17 00:00:00 2001
From: noud-github <arnoud@yoast.com>
Date: Tue, 18 May 2021 10:32:45 +0200
Subject: [PATCH 6/9] add yoast-dist config

---
 .travis.yml                                     |   2 +-
 config/travis/deploy_keys/id_rsa_yoast_dist.enc | Bin 0 -> 3264 bytes
 config/travis/id_rsa_yoast_dist.enc             | Bin 3248 -> 0 bytes
 3 files changed, 1 insertion(+), 1 deletion(-)
 create mode 100644 config/travis/deploy_keys/id_rsa_yoast_dist.enc
 delete mode 100644 config/travis/id_rsa_yoast_dist.enc

diff --git a/.travis.yml b/.travis.yml
index 54773e2cf..4678b6af5 100644
--- a/.travis.yml
+++ b/.travis.yml
@@ -58,7 +58,7 @@ jobs:
         - nvm install lts/*
         - curl -o- -L https://yarnpkg.com/install.sh | bash
         - export PATH=$HOME/.yarn/bin:$PATH
-        - openssl aes-256-cbc -K $encrypted_e268719177eb_key -iv $encrypted_e268719177eb_iv -in config/travis/deploy_keys/id_rsa_yoast_dist.enc -out config/travis/deploy_keys/id_rsa_yoast_dist -d
+        - openssl aes-256-cbc -K $encrypted_6c01239ec342_key -iv $encrypted_6c01239ec342_iv -in config/travis/deploy_keys/id_rsa_yoast_dist.enc -out config/travis/deploy_keys/id_rsa_yoast_dist -d
         - chmod 600 config/travis/deploy_keys/id_rsa_yoast_dist
         - eval $(ssh-agent -s)
         - ssh-add config/travis/deploy_keys/id_rsa_yoast_dist
diff --git a/config/travis/deploy_keys/id_rsa_yoast_dist.enc b/config/travis/deploy_keys/id_rsa_yoast_dist.enc
new file mode 100644
index 0000000000000000000000000000000000000000..47b28d025017a2bfb64db9627420cf83744e96bd
GIT binary patch
literal 3264
zcmV;x3_tUT9Lft?gIM$lBpw39%sVD^D8s%EpveJ1th!~xf~a?(QL6DLjOKRu4a|Z_
zM=3|+eb;R!INcXeAv{||F;~BO01~XpZ*Q%*2%!9Ex1uamcKLG}zY%Z&PuyuLTB$!P
z=-wEJ=KS!<MLPT!e=eChR#193g+4?2JDAYk079n5nkUhi4q`~17t`jN<`KSC+y(Fy
zXbRlB7DDQ(i?My8xWJPB-Y^OnX@;$?(Lc4W4`hgAjxQgM4$5@XWQI!w87ohg3whi#
z)DW(<RGq`qnLin9*pN0ss1oO9s{$y;s)@-t$kN$eAoo!8flOgMsJB-ZKfwZb`&l|Q
zj6PzSm%c%6=DdnodROqZe1Q$ApIO6Z{OP2;SrcjTP0vy_YRu%f$n<n+rzLgV;kS{g
zS%+zoBk~<Ei7nJd;wO=tUUOCOcf2fwXg_G}J&&*j(qJQ;+Nuvf<Xw%r^rTZ)J4CyY
z6})H+cEBgdR>dT}wOP?+K4Bj18S^(;?aXfJnKxn*9a%a}bLm;QA#1ie{2Q7=#F@(D
zU{T&s1O<V7sbOCgPX@|HI!4BHvoxde*u?QYwcz|tI@%pK_n5&$DE?I;)W^Gtd!R1B
z;{eh?PWdGg|4$^_)AGBbOzCj!P#mH*3%om)pZ4DgS3=a>A<k__Fn4B!CY6|*X;cEm
zDks#hi>bIC=F!UPtLUiVA^!Ye{e@U6OBc-3WJ^NGPF@3|YP(-P!1?{atqr>IcuNu|
zyIe60eFrZpV$iIb;zi><H0@CM65!D`4xaBED@9Wm%jQc^WNIoz?A2$f)EZ+(5n<#t
zl@-S;H6jf!VeYl0_ac6o!34aGPh%GI2tj{iU4v<V>I)F2C>sj{BRMHIG1kxE(50eu
zQ4?wTs3A^2X}>^KLe(dBb1S{$l&e<1M(a75^37q}XQ+Caa%a%v5>+Mc6<gImf2rpJ
z$6nsa@g4tJ<rd6Bm$P@+T}zGA$iJTJL00M67qO9PsT0EW!tEHl13wKN1wlu;wW}k$
z`);Q$$xBso&$sU!^_la%!@6>BllQY_d==~vq?3ECaHSo50Uu3F^rG&^+?+!$@0H$h
zVK_=|R>p6$<O8c>LACKxP6KJi&>r6NBB=E>I<WpvCuP%7oZ=;ZzsbcOSEN!Oql?z6
zGKf)4F!sM@^76?Xy%Bs&cc{cai9QDXtQyxnAd$d2icq!Ea%kzhPzZRmY}E!NPmK6o
z+W$4w`BOs)*%1o-hW6he59zh1<{7b-ewP*!NNERsD&Hx6C;I|>6_1020=wkNwi9H@
zKM~W~k?lsMwYG!52r;T9XXkDDizn{fG4MoPmGE90C*YpLZ>>5Vy`PyqW?=%yCN*dR
zvfpX#`#|(*7_Lmi!P1!VrnM=+aB;#M1vG660v}htkS#JJ(LV)RUwi+UcWR6=2lKXZ
zRl0)lhv5QP8;-Zk@tL2nqbzA);-mp?6jd6@DODL47B@q9L3Ws4^l1gxl(|>{f1Y;w
ze}<&3gwqqnq>}>g#P6a}O}LVpWtUbfHA)n>KR!uv;YCRdoja_Y2CYKkmQ9nboLj~a
z?rhslk~XA<w?>tl5Xa82i_bQW#UU{AYXc%68fZI8vLxx``Tpy;l)+gm5JYbSvUm`1
zZxY9Rc7n^d&C6|%-Hlr0(jeRD>!q?kOWIEJFU&p8A3MI*HRuDrzxd+}&Kml%kGkP6
z>NR1$eZMpHTDA82hadSw%Sa`~+o&!_03YH+<J8|{&F{BUpG1?C#6%i@8A<NxjJEWI
zywMW>tnN<w>Ug#q2mjp0nNQ);rKmwpY@5zFT;hgajnadzg@;L9AZle;tJ#~uNeN#Z
z!nNQmW~bq`D`9xiMc>bRU~e^4!^7Q{PDgyz<LR@ye=Ep@ugHpGy5zF-&QK>72|9U^
z?<sKU_Nbzlb*JM2SbVptCFEYFTBia+Q+`w+s+xJm<l1++N1Q4uH|(62T=k&6-)>LT
z1m&6Ddp<9Nti>ngdY#&Zrt}?vSXw*5txa(OR*#U;tTwDq;5&q9&Gn^xB-%L|Bo6$`
z-Fl=uhK8(U8sQnW54NcL-Bouo92|rBd#<T;UXiL=I~|~&dcGc=AhHRCGrf%Z__Ei4
zxGs$C7~5{I7BL*je;_vI|3_y;(RwDg9gWch?HYWQKJcNP*Y~<Vf32Qt5XR)Dpe(St
zWk8(A#VbZEZZd%qo0RS=_A`*FFJy>7pK*G2gr*zFbSor=PK9O|-k%NqPOyg~JasHd
zb*UMFxM$<r0UJC?BpsIRuB~|Jz-8XO%Xv~{F?O~c%vw_^$z63GcaTUF{ra8h8_WB6
z<(jSAkWCv2F8M%K%--kbCO=_bBwtn*ZWOoFo%NSzUzHe~7bz2`rrjWIT2VBWZ^x)r
zerSnOa5AY*OW-vU<d0^^>J5tgYTWmR3pCYTxjnSGRfFxqCbfkmWlYF7q<j99@&0{b
zm#fqj6eaGoBYt2!ESa)iV3nC(>Hi^o-OAYwQDFpxNF5%CW`NM6V~A5=B9A1c@l9l?
z<zl#U3fq*Dbo~<|gngdbE?-`~8Uxq@e{Ko57N;H4d_N}>ox@w`7vG@IHX#Ut6ZTNx
zk||Pd;=I$JnIb9L(L}Y<)Tv{GU}A7Fthf8o1<Sj$9=|3fLM=9d0z7{81JeCn`rs({
zEx9@zHJiX}Z0}oqr|weDxG+Ujpw{UohU=&f19cjE2(jF^*2l^ez_X%0q73NC;Uw?c
z)^VU#{I{$0#P^)9p1g3NGxEo+R%S#x5@!O}M2u+!q1{C9)xwdOqg|Y@e81Lqqd%mJ
z^t_G&;G^0MytU=FOBKje$?#!<K_0NLnba4~UT}#l%7Tvn3}sns)l#1o(!F7UN8~~@
zInx$XqL}A$&`}MJ#{-*)fw7UaJOGxRnGY3BIpA0<s*_{SHEeDqlm*<@I6;D|wWvAk
z9YYl>%mrs22TO6z6&<|#%j~t{CdoB<##jQGarLK!iSG#;r=KN<J@Rs9UoRGuYi;G?
z?c=owCw$#Q!_tA{{fLH$K37nNgKCw6Y+yOftQX5a*TM)Hr2>s5Wz!_CB(AgSs*vp&
z$QNaeK1OmM;UVixeyU;WG2VSOc9tkOH4C{aBA~FL;}SJ~OA-*lOj%qr@G=F?7`=_I
zX}+#_U5sXVgllLTq;#~XDuPdc;9-Knr~nCdse!*h>-9LBkFoI)Fj!1kwZ>)jeNSq_
zBq$x)O$ER*dSdSslH;U+UHf7*ECJ}g+(1;6KvZg(4yS{_)nTDF@<gY<awynknEle*
zlmmHX+25G2ecFHS;v|qAPY0Z$NU6jKS=1cmFFaVeXx)i%=M~f^tn+WI7OkDU!PH9?
zG%Q##GbIp2sN<i~VbqD6&i_@vF}$(=OeOcNaPbwDO4OWi<Ck>qETdu}2lG*@?yS%|
zER4eSP7Gvhi73M<dWDdAvAa>#6n@&o8qzBDZfM4q&nWVpfjJ!G{ZKpNka7xp<x3AB
zFj_{k<B9*t+~?u*Jk%BmR6h!Yo2~G<qx(T!dg&F1%g|ynxr+SZ|30t~#WNVlTr|S$
zk<cFbds(pW_Ig_!I5Md<IJ!~;-9N;gOi1&Frzq=2o@cZr+Yt1nXR~qYOEG#Kp8J%R
z9Et@9?4~R>Sxy>m`_eo+qwI|rR&VIjAd+(bUVkf;rw3$CBZh@HLSY=M$;Fls5z$s_
z9_A&`$dePI5+S;=!R6(bMHqC8#-eH%8dgHfTYa?}#(;G^Kw$k7+Z{DkNFtMi#E9eC
z)R~a!rbcN<8+ocWR8;DtN}cqf4=+4wKSzxuv1iVY>n%-_9`mE+Z~G0gWlZb%is0hk
z_bGI@DAfD9<8TcEh*vq!3#qDEDAa|L?pSrIJ|$TmhXNF{hY1R8uYs8hJ%q0=1ki7=
zda1Des;}f?!f4a3!_E3T>LcC15gp9al~E5T#0^-eNl)ckAh_K|j30#bv%~~U{(dcA
zZ-ib0j7V3IR0P4cZ>)oHkAJmguapGd-Ft|<5~|v@t}(AxD=X^@{E|pVHANu8kRK~W
zw{hetu#BRCO!G$bJ-~o(Af?T15*BbZX`JiPWY`9JblW2-_iC|X5^%|}X%1P>{cU5B
zbBpKQ{gxCOOseX_H?L}nN{Xwv!)SCYUHQ2Q9SnHXZq4gn1!;h<v00;2unnfql@{K?
zTOl8JzG>LkR#FPxifcHi3m)>BOy2`-Br09Z@T$?hC@?k8285a9=mm6|S*Uhk_68l{
ye+)k@$LL4o6Y3Bc?AD~XEhRT=b??H+u5Y9Yloff+^Xmu2LPCC+T_QJ9ivlBpWnPQ`

literal 0
HcmV?d00001

diff --git a/config/travis/id_rsa_yoast_dist.enc b/config/travis/id_rsa_yoast_dist.enc
deleted file mode 100644
index e34372b90a141559e464ecbd132b9df05d993d78..0000000000000000000000000000000000000000
GIT binary patch
literal 0
HcmV?d00001

literal 3248
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


From 5e962b103c77046873699e97745a1ac9569fa586 Mon Sep 17 00:00:00 2001
From: noud-github <arnoud@yoast.com>
Date: Tue, 18 May 2021 12:38:27 +0200
Subject: [PATCH 7/9] add new yoast-dist config

---
 .travis.yml                                    |   2 +-
 .../travis/deploy_keys/id_rsa_yoast_dist.enc   | Bin 3264 -> 416 bytes
 2 files changed, 1 insertion(+), 1 deletion(-)

diff --git a/.travis.yml b/.travis.yml
index 4678b6af5..ded1989d1 100644
--- a/.travis.yml
+++ b/.travis.yml
@@ -58,7 +58,7 @@ jobs:
         - nvm install lts/*
         - curl -o- -L https://yarnpkg.com/install.sh | bash
         - export PATH=$HOME/.yarn/bin:$PATH
-        - openssl aes-256-cbc -K $encrypted_6c01239ec342_key -iv $encrypted_6c01239ec342_iv -in config/travis/deploy_keys/id_rsa_yoast_dist.enc -out config/travis/deploy_keys/id_rsa_yoast_dist -d
+        - openssl aes-256-cbc -K $encrypted_d1beccaa5494_key -iv $encrypted_d1beccaa5494_iv -in config/travis/deploy_keys/id_rsa_yoast_dist.enc -out config/travis/deploy_keys/id_rsa_yoast_dist -d
         - chmod 600 config/travis/deploy_keys/id_rsa_yoast_dist
         - eval $(ssh-agent -s)
         - ssh-add config/travis/deploy_keys/id_rsa_yoast_dist
diff --git a/config/travis/deploy_keys/id_rsa_yoast_dist.enc b/config/travis/deploy_keys/id_rsa_yoast_dist.enc
index 47b28d025017a2bfb64db9627420cf83744e96bd..f423139d7a039d56f72f0ec7b1e39802dc50bee2 100644
GIT binary patch
literal 416
zcmV;R0bl+qP(~kc3n`D(6q@vnmU|!WN2E9N*42aDC$Ngp2f~<KX8GeuIU$SfNb@Jt
zr?dzLcu!%j*TD<aW+**JxIV*N`9cG=H;yZE#t;itF49qkgKA00WsE|VzBmq!WE@_p
zQLKL0kURXSS=K3O<6yS!l=mRZp&@uGAINZL2vnF1w4C-W<;?durz$<j6r=~{{GCAP
zw>!&5TK1s;kpRM-@4YzaEo<#SA9EfeRe;C#j?!2mE*#!r+$5pzuZotK$i+}%)^wj+
zUY_=QghIAsoqkaz7X8XJGfnKJDkKB%K}WKX19UxopfHYePPpZTJVDYq4X-PTj@<!0
zD|Xs1c|Vb$k1BjVn^GPLqo%Z&U}+vnfAvpYW7K9fF}1L!YTBn5jW^&F*!FRRp+_2=
zt_fNulxC34d$91m-*2wU^uqo7G<IlmeFsc_+Wuw{QNym#GuO)6xmzq12^af7nmO^T
z8Z-K}t%)3px?gb{(AIcGL73&H*{`Wfxu!OxnK;t=epAU`ieW~^c2F_5h}0K6V;{R=
K1Shfss8~JIpUZUs

literal 3264
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


From 945f7d5c6b9a9371464fba0d695b2711d8c4d651 Mon Sep 17 00:00:00 2001
From: noud-github <arnoud@yoast.com>
Date: Tue, 18 May 2021 13:02:13 +0200
Subject: [PATCH 8/9] fix branch for test push

---
 config/travis/deploy_to_dist.sh | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

diff --git a/config/travis/deploy_to_dist.sh b/config/travis/deploy_to_dist.sh
index c1e1d0023..3a8bca7f4 100755
--- a/config/travis/deploy_to_dist.sh
+++ b/config/travis/deploy_to_dist.sh
@@ -29,7 +29,7 @@ lastTag=$1
 branch="master"
 mainDir=$(pwd)
 
-if [[ $lastTag =~ ^feature/* || $lastTag =~ ^release/* || $lastTag =~ ^hotfix/* || $lastTag == "develop" ]]; then
+if [[ $lastTag =~ ^feature/* || $lastTag =~ ^release/* || $lastTag =~ ^hotfix/* || $lastTag == "develop" || $lastTag == "push-to-dist" ]]; then
   branch=$lastTag
 fi
 
@@ -54,7 +54,7 @@ cd ./artifact
 git add -A
 
 # If it's a feature, release or trunk branch.
-if [[ $lastTag =~ ^feature/* || $lastTag =~ ^release/* || $lastTag =~ ^hotfix/* || $lastTag == "develop" ]]; then
+if [[ $lastTag =~ ^feature/* || $lastTag =~ ^release/* || $lastTag =~ ^hotfix/* || $lastTag == "develop" || $lastTag == "push-to-dist" ]]; then
   git commit --allow-empty -m "${TRAVIS_COMMIT_MESSAGE}"
 else
   git commit -m "Release ${lastTag}"

From ec22d76feaf6db9dbf7b4a7dcc054297c6c2d750 Mon Sep 17 00:00:00 2001
From: noud-github <arnoud@yoast.com>
Date: Thu, 20 May 2021 09:16:21 +0200
Subject: [PATCH 9/9] add push to dist to travis task

---
 .travis.yml                     | 5 ++---
 config/travis/deploy_to_dist.sh | 4 ++--
 2 files changed, 4 insertions(+), 5 deletions(-)

diff --git a/.travis.yml b/.travis.yml
index ded1989d1..7b74136fd 100644
--- a/.travis.yml
+++ b/.travis.yml
@@ -4,14 +4,13 @@ language: php
 branches:
   only:
     - master
+    - trunk
     - develop
     - /^release\/*/
     - /^hotfix\/\d+\.\d+(\.\d+)?(-\S*)?$/
     - /^feature\/*/
     # Also build tags like 1.1.1 or 1.1 for deployment.
     - /^\d+\.\d+(\.\d+)?(-\S*)?$/
-    # for testing deploy
-    - push-to-dist
 
 cache:
   directories:
@@ -53,7 +52,7 @@ jobs:
             grunt update-version
           fi
         - grunt artifact
-      if: ( tag IS present OR branch =~ /^feature\// OR branch =~ /^release\// OR branch =~ /^hotfix\// OR branch = trunk OR branch = push-to-dist ) AND type != pull_request
+      if: ( tag IS present OR branch =~ /^feature\// OR branch =~ /^release\// OR branch =~ /^hotfix\// OR branch = trunk OR branch = develop ) AND type != pull_request
       before_install:
         - nvm install lts/*
         - curl -o- -L https://yarnpkg.com/install.sh | bash
diff --git a/config/travis/deploy_to_dist.sh b/config/travis/deploy_to_dist.sh
index 3a8bca7f4..924419478 100755
--- a/config/travis/deploy_to_dist.sh
+++ b/config/travis/deploy_to_dist.sh
@@ -29,7 +29,7 @@ lastTag=$1
 branch="master"
 mainDir=$(pwd)
 
-if [[ $lastTag =~ ^feature/* || $lastTag =~ ^release/* || $lastTag =~ ^hotfix/* || $lastTag == "develop" || $lastTag == "push-to-dist" ]]; then
+if [[ $lastTag =~ ^feature/* || $lastTag =~ ^release/* || $lastTag =~ ^hotfix/* || $lastTag == "develop" || $lastTag == "trunk" ]]; then
   branch=$lastTag
 fi
 
@@ -54,7 +54,7 @@ cd ./artifact
 git add -A
 
 # If it's a feature, release or trunk branch.
-if [[ $lastTag =~ ^feature/* || $lastTag =~ ^release/* || $lastTag =~ ^hotfix/* || $lastTag == "develop" || $lastTag == "push-to-dist" ]]; then
+if [[ $lastTag =~ ^feature/* || $lastTag =~ ^release/* || $lastTag =~ ^hotfix/* || $lastTag == "develop" || $lastTag == "trunk" ]]; then
   git commit --allow-empty -m "${TRAVIS_COMMIT_MESSAGE}"
 else
   git commit -m "Release ${lastTag}"