Merge branch 'master' into dependabot/npm_and_yarn/ts-jest-26.5.4

nblagoev · Mar 17, 2021 · 0846191 · 0846191
2 parents 875f679 + 4d80caf
commit 0846191
Show file tree

Hide file tree

Showing 5 changed files with 80 additions and 68 deletions.
diff --git a/.github/workflows/build-pr.yml b/.github/workflows/build-pr.yml
@@ -10,26 +10,28 @@ jobs:
       matrix:
         node-version: [12.x, 14.x]
     steps:
-    - uses: actions/checkout@v2
-    - name: Use Node.js ${{ matrix.node-version }}
-      uses: actions/setup-node@v1
-      with:
-        node-version: ${{ matrix.node-version }}
-    - name: install and build
-      run: |
-        yarn install --frozen-lockfile
-        yarn run coverage
-        yarn run build
-      env:
-        CI: true
-    - run: ./node_modules/.bin/codecov -f coverage/*.json
-    - name: Save PR number
-      if: ${{ github.actor == 'dependabot[bot]' }}
-      run: |
-        mkdir -p ./pr
-        echo ${{ github.event.number }} > ./pr/number
-    - uses: actions/upload-artifact@v2
-      if: ${{ github.actor == 'dependabot[bot]' }}
-      with:
-        name: pr
-        path: pr/
+      - uses: actions/checkout@v2
+      - name: Use Node.js ${{ matrix.node-version }}
+        uses: actions/setup-node@v1
+        with:
+          node-version: ${{ matrix.node-version }}
+      - name: install and build
+        run: |
+          yarn install --frozen-lockfile
+          yarn run coverage
+          yarn run build
+        env:
+          CI: true
+      - run: ./node_modules/.bin/codecov -f coverage/*.json
+  save-pr:
+    runs-on: ubuntu-latest
+    steps:
+      - name: Save PR number
+        run: |
+          mkdir -p ./pr
+          echo ${{ github.event.number }} > ./pr/number
+
+      - uses: actions/upload-artifact@v2
+        with:
+          name: pr
+          path: pr/
diff --git a/.github/workflows/build.yml b/.github/workflows/build.yml
@@ -12,16 +12,16 @@ jobs:
       matrix:
         node-version: [12.x, 14.x]
     steps:
-    - uses: actions/checkout@v2
-    - name: Use Node.js ${{ matrix.node-version }}
-      uses: actions/setup-node@v1
-      with:
-        node-version: ${{ matrix.node-version }}
-    - name: install and build
-      run: |
-        yarn install --frozen-lockfile
-        yarn run coverage
-        yarn run build
-      env:
-        CI: true
-    - run: ./node_modules/.bin/codecov -f coverage/*.json
+      - uses: actions/checkout@v2
+      - name: Use Node.js ${{ matrix.node-version }}
+        uses: actions/setup-node@v1
+        with:
+          node-version: ${{ matrix.node-version }}
+      - name: install and build
+        run: |
+          yarn install --frozen-lockfile
+          yarn run coverage
+          yarn run build
+        env:
+          CI: true
+      - run: ./node_modules/.bin/codecov -f coverage/*.json
diff --git a/.github/workflows/dependabot-pr.yml b/.github/workflows/dependabot-pr.yml
@@ -32,8 +32,10 @@ jobs:
 
             var fs = require('fs');
             fs.writeFileSync('${{github.workspace}}/pr.zip', Buffer.from(download.data));
+
       - run: unzip pr.zip
-      - name: Approve PR
+
+      - name: Approve and Merge PR
         uses: actions/github-script@v3
         with:
           github-token: ${{ secrets.GITHUB_TOKEN }}
@@ -48,4 +50,12 @@ jobs:
               pull_number: pr_number,
               event: "APPROVE"
             })
-            core.debug(`Approved pull request #${pr.number}`)
+            core.debug(`Approved pull request #${pr_number}`)
+
+            core.debug(`Merging pull request #${pr_number}`)
+            await github.pulls.merge({
+              owner: context.repo.owner,
+              repo: context.repo.repo,
+               pull_number: pr_number,
+            })
+            core.debug(`Merged pull request #${pr_number}`)
diff --git a/.github/workflows/draft-release.yml b/.github/workflows/draft-release.yml
@@ -60,20 +60,20 @@ jobs:
       matrix:
         node-version: [12.x, 14.x]
     steps:
-    - uses: actions/checkout@v2
+      - uses: actions/checkout@v2
 
-    - name: Use Node.js ${{ matrix.node-version }}
-      uses: actions/setup-node@v1
-      with:
-        node-version: ${{ matrix.node-version }}
+      - name: Use Node.js ${{ matrix.node-version }}
+        uses: actions/setup-node@v1
+        with:
+          node-version: ${{ matrix.node-version }}
 
-    - name: install and build
-      run: |
-        yarn install --frozen-lockfile
-        yarn run coverage
-        yarn run build
-      env:
-        CI: true
+      - name: install and build
+        run: |
+          yarn install --frozen-lockfile
+          yarn run coverage
+          yarn run build
+        env:
+          CI: true
 
   release:
     name: Create release

diff --git a/.github/workflows/publish.yml b/.github/workflows/publish.yml
@@ -7,26 +7,26 @@ jobs:
     name: Publish to NPM
     runs-on: ubuntu-latest
     steps:
-    - uses: actions/checkout@v2
-    - uses: actions/setup-node@v1
-      with:
-        node-version: '12.x'
-        registry-url: 'https://registry.npmjs.org'
-    - run: yarn install --frozen-lockfile
-    - run: yarn publish --access public
-      env:
-        NODE_AUTH_TOKEN: ${{ secrets.NPM_TOKEN }}
+      - uses: actions/checkout@v2
+      - uses: actions/setup-node@v1
+        with:
+          node-version: '12.x'
+          registry-url: 'https://registry.npmjs.org'
+      - run: yarn install --frozen-lockfile
+      - run: yarn publish --access public
+        env:
+          NODE_AUTH_TOKEN: ${{ secrets.NPM_TOKEN }}
 
   publish-ghp:
     name: Publish to GitHub Packages
     runs-on: ubuntu-latest
     steps:
-    - uses: actions/checkout@v2
-    - uses: actions/setup-node@v1
-      with:
-        node-version: '12.x'
-        registry-url: 'https://npm.pkg.github.com'
-    - run: yarn install --frozen-lockfile
-    - run: yarn publish --access public
-      env:
-        NODE_AUTH_TOKEN: ${{ secrets.GITHUB_TOKEN }}
+      - uses: actions/checkout@v2
+      - uses: actions/setup-node@v1
+        with:
+          node-version: '12.x'
+          registry-url: 'https://npm.pkg.github.com'
+      - run: yarn install --frozen-lockfile
+      - run: yarn publish --access public
+        env:
+          NODE_AUTH_TOKEN: ${{ secrets.GITHUB_TOKEN }}