Merge pull request #84 from trilom/1.2.1

releases/v1.2.1 [@trilom] - Merge pull request #83 from trilom/master-rebase Master rebase
trilom · Mar 19, 2020 · 849a4ba · 849a4ba
2 parents 4ee1a1a + 6418cb2
commit 849a4ba
Show file tree

Hide file tree

Showing 4 changed files with 16 additions and 54 deletions.
diff --git a/.github/workflows/integration.yml b/.github/workflows/integration.yml
@@ -7,63 +7,30 @@ on:
   push:
     branches: [master]
 jobs:
-  debugging:
-    name: debugging info
-    runs-on: ubuntu-latest
-    steps:
-# dump event for debugging      
-      - run: |
-          echo '${{toJSON(github.event)}}'
-          echo '${{toJSON(steps)}}'
   integration:
     runs-on: ubuntu-latest
     strategy:
       matrix:
         event_type: ['push', 'pull_request']
-        build: ['true', 'false']
         output: ['json', ',', ''' ''', '_<br />&nbsp;&nbsp;_']
         fileOutput: ['json', ',', ''' ''', '_<br />&nbsp;&nbsp;_']
-        # event_type: ['pull_request']
-        # build: ['true']
-        # output: ['json']
-        # fileOutput: ['json']
     if: (startsWith(github.head_ref, '1.') || startsWith(github.head_ref, '2.')) || contains(github.event.head_commit.message, 'Release merge from') || github.event_name == 'schedule'
     steps:
-      - run: |
-          echo '${{toJSON(github.event)}}'
-          echo '${{toJSON(steps)}}'
       - uses: actions/checkout@v2
-        if: matrix.build
       - run: yarn build
-        if: matrix.build
       - uses: ./
         id: file_changes_build_pr
-        if: matrix.build && matrix.event_type == 'pull_request'
+        if: matrix.event_type == 'pull_request'
         with:
-          prNumber: 36
+          prNumber: 83
           output: ${{ matrix.output }}
           fileOutput: ${{ matrix.fileOutput }}
       - uses: ./
         id: file_changes_build_push
-        if: matrix.build && matrix.event_type == 'push'
-        with:
-          pushBefore: 50c179e5772e4915eb867f4db6552e50aa528591
-          pushAfter: cde426492d870040962d2c03f1921516b86fce64
-          output: ${{ matrix.output }}
-          fileOutput: ${{ matrix.fileOutput }}
-      - uses: trilom/file-changes-action@master-rebase
-        id: file_changes_nobuild_pr
-        if: "! matrix.build && matrix.event_type == 'pull_request'"
-        with:
-          prNumber: 36
-          output: ${{ matrix.output }}
-          fileOutput: ${{ matrix.fileOutput }}
-      - uses: trilom/file-changes-action@master-rebase
-        id: file_changes_nobuild_push
-        if: "! matrix.build && matrix.event_type == 'push'"
+        if: matrix.event_type == 'push'
         with:
-          pushBefore: 50c179e5772e4915eb867f4db6552e50aa528591
-          pushAfter: cde426492d870040962d2c03f1921516b86fce64
+          pushBefore: 6ac7697cd1c4f23a08d4d4edbe7dab06b34c58a2
+          pushAfter: 4ee1a1a2515f4ac1b90a56aaeb060b97f20c8968
           output: ${{ matrix.output }}
           fileOutput: ${{ matrix.fileOutput }}
       - run: chmod +x test.sh && bash test.sh
@@ -72,17 +39,17 @@ jobs:
         env:
           fileOutput: ${{ matrix.fileOutput }}
           output: ${{ matrix.output }}
-          files: ${{ format('{0}{1}{2}{3}', toJSON(steps.file_changes_build_pr.outputs.files), toJSON(steps.file_changes_build_push.outputs.files), toJSON(steps.file_changes_nobuild_pr.outputs.files), toJSON(steps.file_changes_nobuild_push.outputs.files)) }}
-          files_modified: ${{ format('{0}{1}{2}{3}', toJSON(steps.file_changes_build_pr.outputs.files_modified), toJSON(steps.file_changes_build_push.outputs.files_modified), toJSON(steps.file_changes_nobuild_pr.outputs.files_modified), toJSON(steps.file_changes_nobuild_push.outputs.files_modified)) }}
-          files_added: ${{ format('{0}{1}{2}{3}', toJSON(steps.file_changes_build_pr.outputs.files_added), toJSON(steps.file_changes_build_push.outputs.files_added), toJSON(steps.file_changes_nobuild_pr.outputs.files_added), toJSON(steps.file_changes_nobuild_push.outputs.files_added)) }}
-          files_deleted: ${{ format('{0}{1}{2}{3}', toJSON(steps.file_changes_build_pr.outputs.files_deleted), toJSON(steps.file_changes_build_push.outputs.files_deleted), toJSON(steps.file_changes_nobuild_pr.outputs.files_deleted), toJSON(steps.file_changes_nobuild_push.outputs.files_deleted)) }}
+          files: ${{ format('{0}{1}', toJSON(steps.file_changes_build_pr.outputs.files), toJSON(steps.file_changes_build_push.outputs.files)) }}
+          files_modified: ${{ format('{0}{1}', toJSON(steps.file_changes_build_pr.outputs.files_modified), toJSON(steps.file_changes_build_push.outputs.files_modified)) }}
+          files_added: ${{ format('{0}{1}', toJSON(steps.file_changes_build_pr.outputs.files_added), toJSON(steps.file_changes_build_push.outputs.files_added)) }}
+          files_deleted: ${{ format('{0}{1}', toJSON(steps.file_changes_build_pr.outputs.files_deleted), toJSON(steps.file_changes_build_push.outputs.files_deleted)) }}
       - run: chmod +x test.sh && bash test.sh
         working-directory: .github/actions/integration
         if: success() && matrix.output != 'json'
         env:
           fileOutput: ${{ matrix.fileOutput }}
           output: ${{ matrix.output }}
-          files: ${{ format('{0}{1}{2}{3}', steps.file_changes_build_pr.outputs.files, steps.file_changes_build_push.outputs.files, steps.file_changes_nobuild_pr.outputs.files, steps.file_changes_nobuild_push.outputs.files) }}
-          files_modified: ${{ format('{0}{1}{2}{3}', steps.file_changes_build_pr.outputs.files_modified, steps.file_changes_build_push.outputs.files_modified, steps.file_changes_nobuild_pr.outputs.files_modified, steps.file_changes_nobuild_push.outputs.files_modified) }}
-          files_added: ${{ format('{0}{1}{2}{3}', steps.file_changes_build_pr.outputs.files_added, steps.file_changes_build_push.outputs.files_added, steps.file_changes_nobuild_pr.outputs.files_added, steps.file_changes_nobuild_push.outputs.files_added) }}
-          files_deleted: ${{ format('{0}{1}{2}{3}', steps.file_changes_build_pr.outputs.files_deleted, steps.file_changes_build_push.outputs.files_deleted, steps.file_changes_nobuild_pr.outputs.files_deleted, steps.file_changes_nobuild_push.outputs.files_deleted) }}
+          files: ${{ format('{0}{1}', steps.file_changes_build_pr.outputs.files, steps.file_changes_build_push.outputs.files ) }}
+          files_modified: ${{ format('{0}{1}', steps.file_changes_build_pr.outputs.files_modified, steps.file_changes_build_push.outputs.files ) }}
+          files_added: ${{ format('{0}{1}', steps.file_changes_build_pr.outputs.files_added, steps.file_changes_build_push.outputs.files ) }}
+          files_deleted: ${{ format('{0}{1}', steps.file_changes_build_pr.outputs.files_deleted, steps.file_changes_build_push.outputs.files ) }}
diff --git a/.github/workflows/push.yml b/.github/workflows/push.yml
@@ -134,7 +134,7 @@ jobs:
           sed -i '/semantic-release-bot/d' AUTHORS
           sed -i '/carnoco@gmail.com/d' AUTHORS
           sed -i '/GitHub <noreply@github.com>/d' AUTHORS
-          sed -i '/dependabot[bot]/d' AUTHORS
+          sed -i '/dependabot/d' AUTHORS
           echo -e "\r\n$(date)" >> AUTHORS
           git add -A
           git diff-index --quiet HEAD || git commit -m "Updating AUTHORS 📓" -a

diff --git a/AUTHORS b/AUTHORS
@@ -1,11 +1,5 @@
 Bryan Killian <bryan.v.killian@gmail.com>
-Bryan Killian <carnoco@gmail.com>
 Daniel Orner <daniel.orner@wishabi.com>
-GitHub <noreply@github.com>
-Trilom-bot <61434887+trilom-bot@users.noreply.github.com>
 dependabot[bot] <49699333+dependabot[bot]@users.noreply.github.com>
-semantic-release-bot <semantic-release-bot@martynus.net>
-trilom-bot <trilom-bot@trailmix.me>
-trilom-bot@trailmix.me <trilom-bot>
 
-Sun Mar 15 23:54:25 UTC 2020
+Thu Mar 19 12:25:14 UTC 2020
diff --git a/dist/index.js b/dist/index.js