fix: re-order buf build to fix mod errors from missing codegen (#147)

* Fix go mod errors * oops... * oops... * moved back to v0 tag
wishabi · Dec 1, 2023 · 1dcd9c7 · 1dcd9c7
1 parent 97c21dd
commit 1dcd9c7
Show file tree

Hide file tree

Showing 2 changed files with 8 additions and 8 deletions.
diff --git a/go/deps/action.yml b/go/deps/action.yml
@@ -20,6 +20,13 @@ runs:
         path: vendor
         key: vendor-cache-${{ hashFiles('go.mod','go.sum') }}
         restore-keys: vendor-cache-${{ hashFiles('go.mod','go.sum') }}
+    - name: Generating protobuf code
+      if: ${{ hashFiles('buf.gen.yaml') != '' }}
+      run: buf generate
+      shell: bash
+    - name: Run go generate
+      run: go generate ./...
+      shell: bash
     - name: Setting up private modules access
       if: steps.vendor-cache.outputs.cache-hit != 'true'
       shell: bash
@@ -29,13 +36,6 @@ 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

diff --git a/go/smoke-test/action.yml b/go/smoke-test/action.yml
@@ -41,7 +41,7 @@ runs:
         go test ./tests/smoke --tags=smoke
       shell: bash
     - name: Rollback on failure
-      if: failure() $$ inputs.ROLLBACK_ON_FAIL == 'true'
+      if: failure() && inputs.ROLLBACK_ON_FAIL == 'true'
       run: |
         chmod +x ./deploy/build.sh && ./deploy/build.sh service rollback --env=${{ inputs.ENV }}
       shell: bash