From 1e7c5bf68b16c025012c286d6a55438befc24764 Mon Sep 17 00:00:00 2001 From: Brad Rogan Date: Wed, 29 Nov 2023 11:10:32 -0700 Subject: [PATCH] Reorder Go deps to fix vendoring errors --- go/deps/action.yml | 30 +++++++++++++++--------------- 1 file changed, 15 insertions(+), 15 deletions(-) diff --git a/go/deps/action.yml b/go/deps/action.yml index f1d2781..6658d95 100644 --- a/go/deps/action.yml +++ b/go/deps/action.yml @@ -13,21 +13,6 @@ inputs: runs: using: 'composite' steps: - - name: Generating protobuf code - if: ${{ hashFiles('buf.gen.yaml') != '' }} - run: buf generate - shell: bash - - name: Run go generate - run: go generate ./... - shell: bash - - name: Install mockery - if: ${{ hashFiles('.mockery.yml') != '' }} - run: go install github.com/vektra/mockery/v2 - shell: bash - - name: Generate mocks - if: ${{ hashFiles('.mockery.yml') != '' }} - run: mockery - shell: bash - name: Restoring vendor modules from cache id: vendor-cache uses: actions/cache@v3 @@ -44,5 +29,20 @@ runs: go mod tidy git diff --exit-code -- go.mod go.sum go mod vendor + - name: Generating protobuf code + if: ${{ hashFiles('buf.gen.yaml') != '' }} + run: buf generate + shell: bash + - name: Run go generate + run: go generate ./... + shell: bash + - name: Install mockery + if: ${{ hashFiles('.mockery.yml') != '' }} + run: go install github.com/vektra/mockery/v2 + shell: bash + - name: Generate mocks + if: ${{ hashFiles('.mockery.yml') != '' }} + run: mockery + shell: bash - name: Caching workspace for deploy jobs uses: wishabi/github-actions/cache@v0