Merge branch 'master' into 312-reduce-error-logs-in-server

GoodDollar · Apr 22, 2021 · 0ad89fd · 0ad89fd
2 parents 9b8db9e + 2a7a4f1
commit 0ad89fd
Show file tree

Hide file tree

Showing 14 changed files with 354 additions and 575 deletions.
diff --git a/.github/workflows/build.yml b/.github/workflows/build.yml
@@ -35,28 +35,29 @@ jobs:
           node-version: 10.21.0
       - uses: actions/checkout@v2
         with:
+          persist-credentials: false
           fetch-depth: 0
           ref: ${{ github.event.inputs.release == 'qa' && 'master' || 'staging' }}
       - name: setup git
         run: |
-          git config user.email techadmin@gooddollar.org
-          git config user.name Techadmin
+          git config --local user.email "techadmin@gooddollar.org"
+          git config --local user.name "Techadmin"
           npm install -g auto-changelog
       - name: update version qa
         if: "github.event.inputs.release == 'qa'"
         run: |
           npm version prerelease -m "chore: release qa version %s [skip build]"
-          git push origin master:${{ github.event.inputs.targetbranch }} --force --follow-tags
-          git push --follow-tags
+          git push https://${{ secrets.GIT_AUTH }}@github.com/GoodDollar/GoodServer master:${{ github.event.inputs.targetbranch }} --force --follow-tags
+          git push https://${{ secrets.GIT_AUTH }}@github.com/GoodDollar/GoodServer master --follow-tags
 
       - name: update version prod
         if: "github.event.inputs.release != 'qa'"
         run: |
           npm version minor -m "chore: release prod version %s [skip build]"
-          git push origin staging:${{ github.event.inputs.targetbranch }} --force --follow-tags
+          git push https://${{ secrets.GIT_AUTH }}@github.com/GoodDollar/GoodServer staging:${{ github.event.inputs.targetbranch }} --force --follow-tags
           git checkout master
           git merge staging
-          git push --follow-tags
+          git push https://${{ secrets.GIT_AUTH }}@github.com/GoodDollar/GoodServer master --follow-tags
 
   setup:
     runs-on: ubuntu-latest

diff --git a/CHANGELOG.md b/CHANGELOG.md
@@ -4,11 +4,93 @@ All notable changes to this project will be documented in this file. Dates are d
 
 Generated by [`auto-changelog`](https://github.com/CookPete/auto-changelog).
 
+#### [v1.22.1-2](https://github.com/GoodDollar/GoodServer/compare/v1.22.1-1...v1.22.1-2)
+
+- hotfix: Cannot destructure property 'emailVerified' [`ff4e5e8`](https://github.com/GoodDollar/GoodServer/commit/ff4e5e82157e011e44e0a735acc4f514baac6daf)
+
+#### [v1.22.1-1](https://github.com/GoodDollar/GoodServer/compare/v1.22.1-0...v1.22.1-1)
+
+> 15 April 2021
+
+- chore: release qa version 1.22.1-1 [skip build] [`3a21055`](https://github.com/GoodDollar/GoodServer/commit/3a21055aa20c6981358074fb2721c29cf0e6438f)
+
+#### [v1.22.1-0](https://github.com/GoodDollar/GoodServer/compare/v1.22.0...v1.22.1-0)
+
+> 14 April 2021
+
+- chore: release qa version 1.22.1-0 [skip build] [`1d117e4`](https://github.com/GoodDollar/GoodServer/commit/1d117e4006fed0ff076ddbe9f19bb742b7a03037)
+
+#### [v1.22.0](https://github.com/GoodDollar/GoodServer/compare/v1.21.1-6...v1.22.0)
+
+> 8 April 2021
+
+- chore: release prod version 1.22.0 [skip build] [`ac643ca`](https://github.com/GoodDollar/GoodServer/commit/ac643ca7cb0c7abf14a7f658c1496641d636e0bf)
+
+#### [v1.21.1-6](https://github.com/GoodDollar/GoodServer/compare/v1.21.1-5...v1.21.1-6)
+
+> 8 April 2021
+
+- chore: release qa version 1.21.1-6 [skip build] [`6a3a839`](https://github.com/GoodDollar/GoodServer/commit/6a3a8390d601a66ab7cb482d7552eae460c6d066)
+
+#### [v1.21.1-5](https://github.com/GoodDollar/GoodServer/compare/v1.21.1-4...v1.21.1-5)
+
+> 8 April 2021
+
+- chore: release qa version 1.21.1-5 [skip build] [`15818be`](https://github.com/GoodDollar/GoodServer/commit/15818be697e9e58bdbe47a3ed3103581ecde3f4c)
+
+#### [v1.21.1-4](https://github.com/GoodDollar/GoodServer/compare/v1.21.1-3...v1.21.1-4)
+
+> 6 April 2021
+
+- chore(deps): bump y18n from 3.2.1 to 3.2.2 [`#316`](https://github.com/GoodDollar/GoodServer/pull/316)
+- chore: release qa version 1.21.1-4 [skip build] [`a5b9670`](https://github.com/GoodDollar/GoodServer/commit/a5b967087fef02b5cfbcc087181e77d92ab0b8ea)
+
+#### [v1.21.1-3](https://github.com/GoodDollar/GoodServer/compare/v1.21.1-2...v1.21.1-3)
+
+> 6 April 2021
+
+- chore: release qa version 1.21.1-3 [skip build] [`791767e`](https://github.com/GoodDollar/GoodServer/commit/791767e410185f9707aeab630fe621fc6a164898)
+
+#### [v1.21.1-2](https://github.com/GoodDollar/GoodServer/compare/v1.21.1-1...v1.21.1-2)
+
+> 6 April 2021
+
+- chore: release qa version 1.21.1-2 [skip build] [`e53ff4c`](https://github.com/GoodDollar/GoodServer/commit/e53ff4c653916943a991277a9cd83ef85af79759)
+
+#### [v1.21.1-1](https://github.com/GoodDollar/GoodServer/compare/v1.21.1-0...v1.21.1-1)
+
+> 5 April 2021
+
+- chore: release qa version 1.21.1-1 [skip build] [`94bf2ab`](https://github.com/GoodDollar/GoodServer/commit/94bf2ab23c378df4e6728015dc3ac2815adb59c3)
+
+#### [v1.21.1-0](https://github.com/GoodDollar/GoodServer/compare/v1.21.0...v1.21.1-0)
+
+> 31 March 2021
+
+- fix: re-verify existing email using torus [`#315`](https://github.com/GoodDollar/GoodServer/pull/315)
+- chore: release qa version 1.21.1-0 [skip build] [`9ed41cb`](https://github.com/GoodDollar/GoodServer/commit/9ed41cb390a87fd16ce34fabdc440f3406dd0ebb)
+- chore: release prod version 1.21.0 [skip build] [`6c7196c`](https://github.com/GoodDollar/GoodServer/commit/6c7196c893cfac7da3aef5ca33d1c2dc93e448c0)
+- Revert "wip: use github_token" [`e0d4c33`](https://github.com/GoodDollar/GoodServer/commit/e0d4c3319953498ee4fcdc874c3e6441bd9f020f)
+
+#### [v1.21.0](https://github.com/GoodDollar/GoodServer/compare/v1.20.1-4...v1.21.0)
+
+> 25 March 2021
+
+- chore: release prod version 1.21.0 [skip build] [`90fa6b9`](https://github.com/GoodDollar/GoodServer/commit/90fa6b9f64b0a1ff889e2caa47b97480be6c4e76)
+
+#### [v1.20.1-4](https://github.com/GoodDollar/GoodServer/compare/v1.20.1-3...v1.20.1-4)
+
+> 22 March 2021
+
+- chore: release qa version 1.20.1-4 [skip build] [`fba8530`](https://github.com/GoodDollar/GoodServer/commit/fba85301d67181cf5cfc86ca125f0d2a32c18001)
+
 #### [v1.20.1-3](https://github.com/GoodDollar/GoodServer/compare/v1.20.1-2...v1.20.1-3)
 
+> 18 March 2021
+
+- chore: release qa version 1.20.1-3 [skip build] [`7733f6c`](https://github.com/GoodDollar/GoodServer/commit/7733f6c83f8355af6902cc1aed8a29b14b3c0bc6)
 - wip: use github_token [`1dedd23`](https://github.com/GoodDollar/GoodServer/commit/1dedd2321d1d59251a93b271fc61c1cd9a3fe09e)
 - wip: use github_token [`abe7ada`](https://github.com/GoodDollar/GoodServer/commit/abe7adaccc6c61adfefb9f38ade6a2932b02cc53)
-- wip: github_token [`8a87cc0`](https://github.com/GoodDollar/GoodServer/commit/8a87cc00447e3de8f161bb8700f5a72478c79e67)
 
 #### [v1.20.1-2](https://github.com/GoodDollar/GoodServer/compare/v1.20.1-1...v1.20.1-2)