fix CICD

vektra · Jan 20, 2025 · 61aa867 · 61aa867
1 parent a605c4c
commit 61aa867
Show file tree

Hide file tree

Showing 5 changed files with 10 additions and 17 deletions.
diff --git a/.github/workflows/documentation.yml b/.github/workflows/documentation.yml
@@ -1,7 +1,7 @@
 name: documentation
 on:
   push:
-    branches: [ v3 ]
+    branches: [ master, v3 ]
 permissions:
   contents: write
 jobs:
@@ -28,4 +28,4 @@ jobs:
       - name: Deploy docs
         run: "mike deploy --push --update-aliases $(grep VERSION mockery-tools.env | cut -d'=' -f 2 | cut -d'.' -f1-2) v3"
         env:
-          GOOGLE_ANALYTICS_KEY: ${{ secrets.GOOGLE_ANALYTICS_KEY }}
+          GOOGLE_ANALYTICS_KEY: ${{ secrets.GOOGLE_ANALYTICS_KEY }}
diff --git a/.github/workflows/reusable-testing.yml b/.github/workflows/reusable-testing.yml
@@ -27,7 +27,7 @@ jobs:
           go-version: ${{ matrix.go_vers }}
 
       - name: Download dependencies
-        run: go mod download
+        run: go mod download -x
 
       - name: Test
         run: go run github.com/go-task/task/v3/cmd/task test.ci
diff --git a/.github/workflows/tag-and-release.yml b/.github/workflows/tag-and-release.yml
@@ -6,12 +6,11 @@ on:
 permissions:
   contents: write
 jobs:
-  # TODO: temporarily disable testing during alpha development
-  #test:
-  #    uses: ./.github/workflows/reusable-testing.yml
+  test:
+      uses: ./.github/workflows/reusable-testing.yml
   tag:
     runs-on: ubuntu-latest
-    #needs: test
+    needs: test
     outputs:
       tag_result: ${{ steps.tag.outputs.tag_result }}
       requested_version: ${{ steps.tag.outputs.requested_version }}
@@ -96,4 +95,4 @@ jobs:
           GITHUB_TOKEN: ${{ secrets.GORELEASER_GITHUB_TOKEN }}
           HOMEBREW_TAP_TOKEN: ${{ secrets.GORELEASER_HOMEBREW_TAP_TOKEN }}
           GORELEASER_CURRENT_TAG: ${{ needs.tag.outputs.requested_version }}
-          #GORELEASER_PREVIOUS_TAG: ${{ needs.tag.outputs.previous_version }}
+          #GORELEASER_PREVIOUS_TAG: ${{ needs.tag.outputs.previous_version }}
diff --git a/.github/workflows/testing-dispatch.yml b/.github/workflows/testing-dispatch.yml
@@ -12,4 +12,4 @@ jobs:
   test:
       uses: ./.github/workflows/reusable-testing.yml
       with:
-        ref: ${{ inputs.ref }}
+        ref: ${{ inputs.ref }}
diff --git a/.github/workflows/testing.yml b/.github/workflows/testing.yml
@@ -2,14 +2,8 @@ name: Go Test
 
 on:
   pull_request:
-    branches: [v3]
+    branches: [ master, v3 ]
 
 jobs:
   test:
-      runs-on: ubuntu-latest
-      steps:
-        - uses: actions/checkout@v2
-          with:
-            fetch-depth: 0
-        - uses: ./.github/workflows/reusable-testing.yml
-
+      uses: ./.github/workflows/reusable-testing.yml