From 61aa8676901ffef92600b160c7307765733149bb Mon Sep 17 00:00:00 2001 From: LandonTClipp <11232769+LandonTClipp@users.noreply.github.com> Date: Mon, 20 Jan 2025 12:48:38 -0600 Subject: [PATCH] fix CICD --- .github/workflows/documentation.yml | 4 ++-- .github/workflows/reusable-testing.yml | 2 +- .github/workflows/tag-and-release.yml | 9 ++++----- .github/workflows/testing-dispatch.yml | 2 +- .github/workflows/testing.yml | 10 ++-------- 5 files changed, 10 insertions(+), 17 deletions(-) diff --git a/.github/workflows/documentation.yml b/.github/workflows/documentation.yml index bcb00877..e1f90b6b 100644 --- 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 }} \ No newline at end of file diff --git a/.github/workflows/reusable-testing.yml b/.github/workflows/reusable-testing.yml index 88006bd6..a335ff30 100644 --- 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 \ No newline at end of file diff --git a/.github/workflows/tag-and-release.yml b/.github/workflows/tag-and-release.yml index 24b0afc5..79219c04 100644 --- 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 }} \ No newline at end of file diff --git a/.github/workflows/testing-dispatch.yml b/.github/workflows/testing-dispatch.yml index a1491c4b..a5b4b752 100644 --- 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 }} \ No newline at end of file diff --git a/.github/workflows/testing.yml b/.github/workflows/testing.yml index 0a6df37f..2aad0027 100644 --- 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 \ No newline at end of file