Merge branch 'master' into dependabot/go_modules/github.com/hashicorp…

…/terraform-plugin-sdk/v2-2.26.1
Mongey · Apr 1, 2023 · 0d3f69e · 0d3f69e
2 parents 621599f + 3241c61
commit 0d3f69e
Show file tree

Hide file tree

Showing 2 changed files with 8 additions and 4 deletions.
diff --git a/.github/workflows/snapshot.yml b/.github/workflows/snapshot.yml
@@ -3,7 +3,9 @@ name: Build Snapshots
 on:
   push:
     branches:
-      - '**'
+      - master
+      - main
+  pull_request:
 
 jobs:
   goreleaser:

diff --git a/.github/workflows/test.yml b/.github/workflows/test.yml
@@ -2,11 +2,10 @@ name: test
 
 on:
   push:
-    branches:
-      - '**'
-  pull_request:
     branches:
       - master
+      - main
+  pull_request:
 
 jobs:
   test:
@@ -38,6 +37,9 @@ jobs:
       - uses: actions/checkout@v3
       - name: golangci-lint
         uses: golangci/golangci-lint-action@v3
+        with: 
+          args: --timeout=3m
+
 
   acctest:
     runs-on: ubuntu-latest