Dependency upgrade for go and Vitess and CI rules fix (#296)

* feat: upgrade go dependency Signed-off-by: Manan Gupta <[email protected]> * feat:upgrade vitess dependency Signed-off-by: Manan Gupta <[email protected]> * feat: fix ci workflows to also run on release-branches Signed-off-by: Manan Gupta <[email protected]>
planetscale · Jul 28, 2022 · a5087ed · a5087ed
1 parent 2372a57
commit a5087ed
Show file tree

Hide file tree

Showing 7 changed files with 22 additions and 16 deletions.
diff --git a/.buildkite/pipeline.yml b/.buildkite/pipeline.yml
@@ -7,10 +7,10 @@ steps:
   - name: "Upgrade Test"
     command:
     - apk add g++ make bash curl mysql mysql-client
-    - wget https://golang.org/dl/go1.18.3.linux-amd64.tar.gz
-    - tar -C /usr/local -xzf go1.18.3.linux-amd64.tar.gz
+    - wget https://golang.org/dl/go1.18.4.linux-amd64.tar.gz
+    - tar -C /usr/local -xzf go1.18.4.linux-amd64.tar.gz
     - export PATH=$PATH:/usr/local/go/bin
-    - rm go1.18.3.linux-amd64.tar.gz
+    - rm go1.18.4.linux-amd64.tar.gz
     - make upgrade-test
     concurrency: 1
     concurrency_group: 'vtop/upgrade-downgrade-test'
@@ -25,10 +25,10 @@ steps:
   - name: "Backup Restore Test"
     command:
     - apk add g++ make bash curl mysql mysql-client
-    - wget https://golang.org/dl/go1.18.3.linux-amd64.tar.gz
-    - tar -C /usr/local -xzf go1.18.3.linux-amd64.tar.gz
+    - wget https://golang.org/dl/go1.18.4.linux-amd64.tar.gz
+    - tar -C /usr/local -xzf go1.18.4.linux-amd64.tar.gz
     - export PATH=$PATH:/usr/local/go/bin
-    - rm go1.18.3.linux-amd64.tar.gz
+    - rm go1.18.4.linux-amd64.tar.gz
     - make backup-restore-test
     concurrency: 1
     concurrency_group: 'vtop/backup-restore-test'
@@ -43,10 +43,10 @@ steps:
   - name: "VTOrc and VTAdmin Test"
     command:
     - apk add g++ make bash curl mysql mysql-client chromium
-    - wget https://golang.org/dl/go1.18.3.linux-amd64.tar.gz
-    - tar -C /usr/local -xzf go1.18.3.linux-amd64.tar.gz
+    - wget https://golang.org/dl/go1.18.4.linux-amd64.tar.gz
+    - tar -C /usr/local -xzf go1.18.4.linux-amd64.tar.gz
     - export PATH=$PATH:/usr/local/go/bin
-    - rm go1.18.3.linux-amd64.tar.gz
+    - rm go1.18.4.linux-amd64.tar.gz
     - make vtorc-vtadmin-test
     concurrency: 1
     concurrency_group: 'vtop/vtorc-vtadmin-test'

diff --git a/.github/workflows/integration-test.yaml b/.github/workflows/integration-test.yaml
@@ -3,9 +3,11 @@ on:
   push:
     branches:
     - main
+    - release-**
   pull_request:
     branches:
     - main
+    - release-**
 jobs:
   build:
     name: Integration Test
@@ -15,7 +17,7 @@ jobs:
     - name: Set up Go
       uses: actions/setup-go@v2
       with:
-        go-version: 1.18.3
+        go-version: 1.18.4
       id: go
 
     - name: Check out code into the Go module directory

diff --git a/.github/workflows/make-generate-and-diff.yaml b/.github/workflows/make-generate-and-diff.yaml
@@ -3,9 +3,11 @@ on:
   push:
     branches:
     - main
+    - release-**
   pull_request:
     branches:
     - main
+    - release-**
 jobs:
   build:
     name: Block generated files from becoming outdated
@@ -15,7 +17,7 @@ jobs:
     - name: Set up Go
       uses: actions/setup-go@v2
       with:
-        go-version: 1.18.3
+        go-version: 1.18.4
       id: go
 
     - name: Check out code into the Go module directory

diff --git a/.github/workflows/unit-test.yaml b/.github/workflows/unit-test.yaml
@@ -3,9 +3,11 @@ on:
   push:
     branches:
     - main
+    - release-**
   pull_request:
     branches:
     - main
+    - release-**
 jobs:
   build:
     name: Unit Test
@@ -15,7 +17,7 @@ jobs:
     - name: Set up Go
       uses: actions/setup-go@v2
       with:
-        go-version: 1.18.3
+        go-version: 1.18.4
       id: go
 
     - name: Check out code into the Go module directory

diff --git a/build/Dockerfile.release b/build/Dockerfile.release
@@ -11,7 +11,7 @@
 # without messing up file permissions, since the Docker container doesn't run as
 # your actual user.
 
-FROM golang:1.18.3 AS build
+FROM golang:1.18.4 AS build
 
 ENV GO111MODULE=on
 WORKDIR /go/src/planetscale.dev/vitess-operator

diff --git a/go.mod b/go.mod
@@ -20,7 +20,7 @@ require (
 	sigs.k8s.io/controller-runtime v0.9.7
 	sigs.k8s.io/controller-tools v0.6.2
 	sigs.k8s.io/kustomize v2.0.3+incompatible
-	vitess.io/vitess v0.14.0
+	vitess.io/vitess v0.14.1
 )
 
 require (

diff --git a/go.sum b/go.sum
@@ -1473,5 +1473,5 @@ sigs.k8s.io/structured-merge-diff/v4 v4.2.1/go.mod h1:j/nl6xW8vLS49O8YvXW1ocPhZa
 sigs.k8s.io/yaml v1.1.0/go.mod h1:UJmg0vDUVViEyp3mgSv9WPwZCDxu4rQW1olrI1uml+o=
 sigs.k8s.io/yaml v1.2.0 h1:kr/MCeFWJWTwyaHoR9c8EjH9OumOmoF9YGiZd7lFm/Q=
 sigs.k8s.io/yaml v1.2.0/go.mod h1:yfXDCHCao9+ENCvLSE62v9VSji2MKu5jeNfTrofGhJc=
-vitess.io/vitess v0.14.0 h1:YoIJBKzrpsrcf3q8oHgbTWXZR4TRltni5XzwrmXdPq0=
-vitess.io/vitess v0.14.0/go.mod h1:kOA0C53JqlYY68HoXfpgFqa8WFOn69KVM9bvhWIXuLo=
+vitess.io/vitess v0.14.1 h1:/dxeH41mpi01xt5dg327BDLvBz/XXH3CbKQWRinKw0o=
+vitess.io/vitess v0.14.1/go.mod h1:kOA0C53JqlYY68HoXfpgFqa8WFOn69KVM9bvhWIXuLo=