Use SC with libgit2 race fixes - rerun 5

Signed-off-by: Sunny <darkowlzz@protonmail.com>
fluxcd · Jun 2, 2022 · 0f45f04 · 0f45f04
1 parent c0962f7
commit 0f45f04
Show file tree

Hide file tree

Showing 4 changed files with 10 additions and 8 deletions.
diff --git a/Makefile b/Makefile
@@ -21,7 +21,8 @@ CACHE := cache
 
 # Version of the source-controller from which to get the GitRepository CRD.
 # Pulls source-controller/api's version set in go.mod.
-SOURCE_VER ?= $(shell go list -m github.com/fluxcd/source-controller/api | awk '{print $$2}')
+# SOURCE_VER ?= $(shell go list -m github.com/fluxcd/source-controller/api | awk '{print $$2}')
+SOURCE_VER = v0.25.0
 
 # Version of the image-reflector-controller from which to get the ImagePolicy CRD.
 # Pulls image-reflector-controller/api's version set in go.mod.

diff --git a/go.mod b/go.mod
@@ -15,8 +15,8 @@ require (
  github.com/fluxcd/pkg/gittestserver v0.5.4
  github.com/fluxcd/pkg/runtime v0.16.1
  github.com/fluxcd/pkg/ssh v0.4.1
- github.com/fluxcd/source-controller v0.25.0
- github.com/fluxcd/source-controller/api v0.25.0
+ github.com/fluxcd/source-controller v0.25.1-0.20220602184556-8ce6a05fdd29
+ github.com/fluxcd/source-controller/api v0.25.1-0.20220602184556-8ce6a05fdd29
  github.com/go-logr/logr v1.2.3
  github.com/google/go-containerregistry v0.9.0
  github.com/libgit2/git2go/v33 v33.0.9

diff --git a/go.sum b/go.sum
@@ -196,10 +196,10 @@ github.com/fluxcd/pkg/ssh v0.4.1 h1:O5FCjb5NIZ9PeRjdF2iL9jaPNM+RL+IjrMBZPkqF9W4=
 github.com/fluxcd/pkg/ssh v0.4.1/go.mod h1:KGgOUOy1uI6RC6+qxIBLvP1AeOOs/nLB25Ca6TZMIXE=
 github.com/fluxcd/pkg/version v0.1.0 h1:v+SmCanmCB5Tj2Cx9TXlj+kNRfPGbAvirkeqsp7ZEAQ=
 github.com/fluxcd/pkg/version v0.1.0/go.mod h1:V7Z/w8dxLQzv0FHqa5ox5TeyOd2zOd49EeuWFgnwyj4=
-github.com/fluxcd/source-controller v0.25.0 h1:57FnGVTeMGfGIoRyekSPkhqMqbg+haaW/k/GlxQI7v0=
-github.com/fluxcd/source-controller v0.25.0/go.mod h1:S/VQ8B0bsr5BqhQ5ts5yc662znMkhnNNF8k+De2NI3M=
-github.com/fluxcd/source-controller/api v0.25.0 h1:+uL+hQb/6h2MHuE9/Iq054TrDWF70puAuWBcoBrZK5M=
-github.com/fluxcd/source-controller/api v0.25.0/go.mod h1:tuMrqHHpRt7mxdLeRXGIMtTKAMufLwLTm5uXkEOJWFw=
+github.com/fluxcd/source-controller v0.25.1-0.20220602184556-8ce6a05fdd29 h1:A5s/3lpJnv8HelFyAir+oLNYP+Nr+ULD+cALYAH7xU8=
+github.com/fluxcd/source-controller v0.25.1-0.20220602184556-8ce6a05fdd29/go.mod h1:S/VQ8B0bsr5BqhQ5ts5yc662znMkhnNNF8k+De2NI3M=
+github.com/fluxcd/source-controller/api v0.25.1-0.20220602184556-8ce6a05fdd29 h1:EExn7abufm2zb9h4xC2ZIc0m+/8xZd+pQ+Zi/0UoyKk=
+github.com/fluxcd/source-controller/api v0.25.1-0.20220602184556-8ce6a05fdd29/go.mod h1:tuMrqHHpRt7mxdLeRXGIMtTKAMufLwLTm5uXkEOJWFw=
 github.com/flynn/go-shlex v0.0.0-20150515145356-3f9db97f8568/go.mod h1:xEzjJPgXI435gkrCt3MPfRiAkVrwSbHsst4LCFVfpJc=
 github.com/form3tech-oss/jwt-go v3.2.2+incompatible/go.mod h1:pbq4aXjuKjdthFRnoDwaVPLA+WlJuPGy+QneDUgJi2k=
 github.com/form3tech-oss/jwt-go v3.2.3+incompatible/go.mod h1:pbq4aXjuKjdthFRnoDwaVPLA+WlJuPGy+QneDUgJi2k=

diff --git a/tests/fuzz/oss_fuzz_build.sh b/tests/fuzz/oss_fuzz_build.sh
@@ -70,7 +70,8 @@ echo "replace github.com/fluxcd/image-automation-controller => ../../" >> go.mod
 
 # Version of the source-controller from which to get the GitRepository CRD.
 # Pulls source-controller/api's version set in go.mod.
-SOURCE_VER=$(go list -m github.com/fluxcd/source-controller/api | awk '{print $2}')
+# SOURCE_VER=$(go list -m github.com/fluxcd/source-controller/api | awk '{print $2}')
+SOURCE_VER=v0.25.0
 
 # Version of the image-reflector-controller from which to get the ImagePolicy CRD.
 # Pulls image-reflector-controller/api's version set in go.mod.