Merge pull request #1267 from getsops/tweak-cli-workflow

build: ensure clean working tree

.github/workflows/cli.yml

@@ -24,37 +24,49 @@ jobs:
       VAULT_TOKEN: "root"
       VAULT_ADDR: "http://127.0.0.1:8200"
     steps:
-      - name: Install dependencies
-        run: sudo apt-get update && sudo apt-get install git -y
       - name: Set up Go 1.20
         uses: actions/setup-go@v3
         with:
           go-version: '1.20'
         id: go
+
       - name: Check out code into the Go module directory
         uses: actions/checkout@v3
+
       - uses: actions/cache@v3
         with:
           path: ~/go/pkg/mod
           key: ${{ runner.os }}-go-${{ hashFiles('**/go.sum') }}
           restore-keys: |
             ${{ runner.os }}-go-
+
+      - name: Vendor Go Modules
+        run: make vendor
+
+      - name: Ensure clean working tree
+        run: git diff --exit-code
+
       - name: Build Linux and Darwin
         if: matrix.os != 'windows'
         run: GOOS=${{ matrix.os }} GOARCH=${{ matrix.arch }} go build -o sops-${{ matrix.os }}-${{ matrix.arch }}-${{ github.sha }} -v ./cmd/sops
+
       - name: Build Windows
         if: matrix.os == 'windows'
         run: GOOS=${{ matrix.os }} go build -o sops-${{ matrix.os }}-${{ github.sha }} -v ./cmd/sops
+
       - name: Import test GPG keys
         run: for i in 1 2 3 4 5; do gpg --import pgp/sops_functional_tests_key.asc && break || sleep 15; done
+
       - name: Test
         run: make test
+
       - name: Upload artifact for Linux and Darwin
         if: matrix.os != 'windows'
         uses: actions/upload-artifact@v3
         with:
           name: sops-${{ matrix.os }}-${{ matrix.arch }}-${{ github.sha }}
           path: sops-${{ matrix.os }}-${{ matrix.arch }}-${{ github.sha }}
+
       - name: Upload artifact for Windows
         if: matrix.os == 'windows'
         uses: actions/upload-artifact@v3
@@ -72,23 +84,32 @@ jobs:
     steps:
       - name: Install rustup
         run: curl --proto '=https' --tlsv1.2 -sSf https://sh.rustup.rs | bash -s -- -y --default-toolchain 1.70.0
+
       - name: Check out code
         uses: actions/checkout@v3
+
       - uses: actions/download-artifact@v3
         with:
           name: sops-linux-amd64-${{ github.sha }}
+
       - name: Move SOPS binary
         run: mv sops-linux-amd64-${{ github.sha }} ./functional-tests/sops
+
       - name: Make SOPS binary executable
         run: chmod +x ./functional-tests/sops
+
       - name: Download Vault
         run: curl -O "https://releases.hashicorp.com/vault/${VAULT_VERSION}/vault_${VAULT_VERSION}_linux_amd64.zip" && sudo unzip vault_${VAULT_VERSION}_linux_amd64.zip -d /usr/local/bin/
+
       - name: Start Vault server
         run: vault server -dev -dev-root-token-id="$VAULT_TOKEN" &
+
       - name: Enable Vault KV
         run: vault secrets enable -version=1 kv
+
       - name: Import test GPG keys
         run: for i in 1 2 3 4 5; do gpg --import pgp/sops_functional_tests_key.asc && break || sleep 15; done
+
       - name: Run tests
         run: cargo test
         working-directory: ./functional-tests

go.mod

@@ -38,7 +38,6 @@ require (
 	golang.org/x/sys v0.11.0
 	golang.org/x/term v0.11.0
 	google.golang.org/api v0.138.0
-	google.golang.org/genproto v0.0.0-20230822172742-b8732ec3820d
 	google.golang.org/genproto/googleapis/rpc v0.0.0-20230822172742-b8732ec3820d
 	google.golang.org/grpc v1.57.0
 	google.golang.org/protobuf v1.31.0
@@ -125,6 +124,7 @@ require (
 	golang.org/x/tools v0.7.0 // indirect
 	golang.org/x/xerrors v0.0.0-20220907171357-04be3eba64a2 // indirect
 	google.golang.org/appengine v1.6.7 // indirect
+	google.golang.org/genproto v0.0.0-20230822172742-b8732ec3820d // indirect
 	google.golang.org/genproto/googleapis/api v0.0.0-20230803162519-f966b187b2e5 // indirect
 	gopkg.in/check.v1 v1.0.0-20190902080502-41f04d3bba15 // indirect
 	gopkg.in/yaml.v2 v2.4.0 // indirect