Merge remote-tracking branch 'origin/master'

dipjyotimetia · Feb 20, 2021 · 2eef8ca · 2eef8ca
2 parents 2f40a70 + 6468c44
commit 2eef8ca
Show file tree

Hide file tree

Showing 3 changed files with 10 additions and 8 deletions.
diff --git a/.github/labels.yml b/.github/labels.yml
@@ -33,7 +33,9 @@
   description: "Feature"
 - name: "enhancement"
   color: "a22eef"
+- name: "dependencies"
+  color: "4FB22E"  
 - name: "wontfix_it"
   color: "08A6C5"
   description: "This will not be worked on"
-  from_name: "wontfix"
+  from_name: "wontfix"
diff --git a/.github/workflows/auto-approve.yml b/.github/workflows/auto-approve.yml
@@ -9,18 +9,18 @@ jobs:
     if: github.actor == 'dependabot[bot]'
     steps:
       - name: automerge
-        uses: actions/github-script@0.2.0
+        uses: actions/github-script@v3
         with:
           script: |
-            github.pullRequests.createReview({
+            github.pull.createReview({
               owner: context.payload.repository.owner.login,
               repo: context.payload.repository.name,
               pull_number: context.payload.pull_request.number,
               event: 'APPROVE'
             })
-            github.pullRequests.merge({
+            github.pull.merge({
               owner: context.payload.repository.owner.login,
               repo: context.payload.repository.name,
               pull_number: context.payload.pull_request.number
             })
-          github-token: ${{GITHUB_TOKEN}}
+          github-token: ${{secrets.GITHUB_TOKEN}}
diff --git a/.github/workflows/docker-publish.yml b/.github/workflows/docker-publish.yml
@@ -56,12 +56,12 @@ jobs:
       - name: Checkout Source
         uses: actions/checkout@v2
       - name: Self sast-scan
-        uses: AppThreat/sast-scan-action@v1.0.0
+        uses: AppThreat/sast-scan-action@1.0.2
         with:
           output: reports
           type: go,bash
       - name: Upload scan reports
-        uses: actions/upload-artifact@v1.0.0
+        uses: actions/upload-artifact@v2.2.2
         with:
           name: sast-scan-reports
           path: reports
@@ -118,7 +118,7 @@ jobs:
           fi
 
       - name: Publish to Registry
-        uses: docker/build-push-action@v1.1.0
+        uses: docker/build-push-action@v2.2.2
         with:
           username: ${{ secrets.DOCKER_USERNAME }}
           password: ${{ secrets.DOCKER_PASSWORD }}