Skip to content
This repository was archived by the owner on Dec 16, 2022. It is now read-only.

Commit 9465ace

Browse files
author
Paulo Gomes
authored
Merge pull request #36 from pjbgf/no-thread
Disable libgit2 multi-threading
2 parents 8072fa4 + 460e3f3 commit 9465ace

File tree

6 files changed

+27
-1877
lines changed

6 files changed

+27
-1877
lines changed

‎Dockerfile.libgit2-only

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -2,7 +2,7 @@
22

33
ARG BASE_VARIANT=alpine
44
ARG GO_VERSION=1.18
5-
ARG XX_VERSION=1.1.0
5+
ARG XX_VERSION=1.1.2
66

77
FROM --platform=$BUILDPLATFORM tonistiigi/xx:${XX_VERSION} AS xx
88

‎Dockerfile.test-libgit2-only

Lines changed: 2 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -2,7 +2,7 @@
22

33
ARG BASE_VARIANT=alpine
44
ARG GO_VERSION=1.18
5-
ARG XX_VERSION=1.1.0
5+
ARG XX_VERSION=1.1.2
66

77
FROM --platform=$BUILDPLATFORM tonistiigi/xx:${XX_VERSION} AS xx
88

@@ -129,5 +129,6 @@ COPY --from=build \
129129
/root/smoketest/static-test-runner .
130130

131131
ENV SSL_CERT_FILE=/etc/ssl/certs/ca-certificates.crt
132+
ENV ALLOW_THREADLESS_LIBGIT2=true
132133

133134
RUN /root/smoketest/static-test-runner

‎hack/static.sh

Lines changed: 3 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -46,7 +46,9 @@ function build_libgit2_only(){
4646
cmake "${CMAKE_PARAMS}" \
4747
-DCMAKE_C_COMPILER="${C_COMPILER}" \
4848
-DCMAKE_INSTALL_PREFIX="${TARGET_DIR}" \
49-
-DTHREADSAFE:BOOL=ON \
49+
-DTHREADSAFE:BOOL=OFF \
50+
-DGIT_THREADS:BOOL=OFF \
51+
-DUSE_THREADS:BOOL=OFF \
5052
-DBUILD_CLAR:BOOL=OFF \
5153
-DBUILD_SHARED_LIBS=OFF \
5254
-DCMAKE_POSITION_INDEPENDENT_CODE:BOOL=ON \
@@ -60,7 +62,6 @@ function build_libgit2_only(){
6062
-DCMAKE_BUILD_TYPE="RelWithDebInfo" \
6163
..
6264

63-
6465
cmake --build . --target install
6566

6667
popd

‎tests/smoketest/go.mod

Lines changed: 10 additions & 121 deletions
Original file line numberDiff line numberDiff line change
@@ -2,6 +2,16 @@ module github.com/fluxcd/golang-with-libgit2/tests/sample
22

33
go 1.18
44

5+
// A temporary fork of git2go was created to enable use
6+
// of libgit2 without thread support to fix:
7+
// fluxcd/image-automation-controller/#339.
8+
//
9+
// This can be removed once libgit2/git2go#918 is merged.
10+
//
11+
// The fork automatically releases new patches based on upstream:
12+
// https://github.com/pjbgf/git2go/commit/d72e39cdc20f7fe014ba73072b01ba7b569e9253
13+
replace github.com/libgit2/git2go/v33 => github.com/pjbgf/git2go/v33 v33.0.9-nothread-check
14+
515
require (
616
github.com/fluxcd/pkg/gittestserver v0.5.2
717
github.com/fluxcd/pkg/ssh v0.3.2
@@ -11,159 +21,38 @@ require (
1121
)
1222

1323
require (
14-
cloud.google.com/go v0.100.2 // indirect
15-
cloud.google.com/go/compute v1.6.0 // indirect
16-
cloud.google.com/go/iam v0.3.0 // indirect
17-
cloud.google.com/go/storage v1.22.0 // indirect
18-
github.com/Azure/azure-sdk-for-go/sdk/azcore v0.22.0 // indirect
19-
github.com/Azure/azure-sdk-for-go/sdk/azidentity v0.13.2 // indirect
20-
github.com/Azure/azure-sdk-for-go/sdk/internal v0.9.1 // indirect
21-
github.com/Azure/azure-sdk-for-go/sdk/storage/azblob v0.3.0 // indirect
22-
github.com/Azure/go-ansiterm v0.0.0-20210617225240-d185dfc1b5a1 // indirect
23-
github.com/AzureAD/microsoft-authentication-library-for-go v0.4.0 // indirect
24-
github.com/Masterminds/semver/v3 v3.1.1 // indirect
2524
github.com/Microsoft/go-winio v0.5.2 // indirect
2625
github.com/ProtonMail/go-crypto v0.0.0-20220407094043-a94812496cf5 // indirect
27-
github.com/PuerkitoBio/purell v1.1.1 // indirect
28-
github.com/PuerkitoBio/urlesc v0.0.0-20170810143723-de5bf2ad4578 // indirect
2926
github.com/acomagu/bufpipe v1.0.3 // indirect
30-
github.com/beorn7/perks v1.0.1 // indirect
31-
github.com/cespare/xxhash/v2 v2.1.2 // indirect
32-
github.com/containerd/containerd v1.6.1 // indirect
33-
github.com/cyphar/filepath-securejoin v0.2.3 // indirect
34-
github.com/davecgh/go-spew v1.1.1 // indirect
35-
github.com/docker/cli v20.10.11+incompatible // indirect
36-
github.com/docker/distribution v2.8.0+incompatible // indirect
37-
github.com/docker/docker v20.10.12+incompatible // indirect
38-
github.com/docker/docker-credential-helpers v0.6.4 // indirect
39-
github.com/docker/go-connections v0.4.0 // indirect
40-
github.com/docker/go-metrics v0.0.1 // indirect
41-
github.com/docker/go-units v0.4.0 // indirect
42-
github.com/dustin/go-humanize v1.0.0 // indirect
4327
github.com/emirpasic/gods v1.12.0 // indirect
44-
github.com/evanphx/json-patch v5.6.0+incompatible // indirect
45-
github.com/fluxcd/pkg/apis/acl v0.0.3 // indirect
46-
github.com/fluxcd/pkg/apis/meta v0.13.0 // indirect
47-
github.com/fluxcd/pkg/gitutil v0.1.0 // indirect
48-
github.com/fluxcd/pkg/lockedfile v0.1.0 // indirect
49-
github.com/fluxcd/pkg/runtime v0.14.2 // indirect
50-
github.com/fluxcd/pkg/untar v0.1.0 // indirect
51-
github.com/fluxcd/pkg/version v0.1.0 // indirect
52-
github.com/fluxcd/source-controller/api v0.24.4 // indirect
53-
github.com/fsnotify/fsnotify v1.5.1 // indirect
54-
github.com/go-errors/errors v1.0.1 // indirect
5528
github.com/go-git/gcfg v1.5.0 // indirect
5629
github.com/go-git/go-billy/v5 v5.3.1 // indirect
5730
github.com/go-git/go-git/v5 v5.4.2 // indirect
5831
github.com/go-logr/logr v1.2.3 // indirect
59-
github.com/go-logr/zapr v1.2.0 // indirect
60-
github.com/go-openapi/jsonpointer v0.19.5 // indirect
61-
github.com/go-openapi/jsonreference v0.19.5 // indirect
62-
github.com/go-openapi/swag v0.19.14 // indirect
6332
github.com/gofrs/uuid v4.2.0+incompatible // indirect
6433
github.com/gogo/protobuf v1.3.2 // indirect
65-
github.com/golang-jwt/jwt v3.2.1+incompatible // indirect
66-
github.com/golang/groupcache v0.0.0-20210331224755-41bb18bfe9da // indirect
67-
github.com/golang/protobuf v1.5.2 // indirect
68-
github.com/google/btree v1.0.1 // indirect
6934
github.com/google/go-cmp v0.5.7 // indirect
7035
github.com/google/gofuzz v1.2.0 // indirect
71-
github.com/google/shlex v0.0.0-20191202100458-e7afc7fbc510 // indirect
72-
github.com/google/uuid v1.3.0 // indirect
73-
github.com/googleapis/gax-go/v2 v2.3.0 // indirect
74-
github.com/googleapis/gnostic v0.5.5 // indirect
75-
github.com/googleapis/go-type-adapters v1.0.0 // indirect
76-
github.com/gorilla/mux v1.8.0 // indirect
77-
github.com/gregjones/httpcache v0.0.0-20180305231024-9cad4c3443a7 // indirect
78-
github.com/hashicorp/go-cleanhttp v0.5.2 // indirect
79-
github.com/hashicorp/go-retryablehttp v0.7.0 // indirect
8036
github.com/imdario/mergo v0.3.12 // indirect
81-
github.com/inconshreveable/mousetrap v1.0.0 // indirect
8237
github.com/jbenet/go-context v0.0.0-20150711004518-d14ea06fba99 // indirect
83-
github.com/josharian/intern v1.0.0 // indirect
8438
github.com/json-iterator/go v1.1.12 // indirect
8539
github.com/kevinburke/ssh_config v1.1.0 // indirect
86-
github.com/klauspost/compress v1.13.6 // indirect
87-
github.com/klauspost/cpuid v1.3.1 // indirect
88-
github.com/kylelemons/godebug v1.1.0 // indirect
89-
github.com/liggitt/tabwriter v0.0.0-20181228230101-89fcab3d43de // indirect
90-
github.com/mailru/easyjson v0.7.6 // indirect
91-
github.com/matttproud/golang_protobuf_extensions v1.0.2-0.20181231171920-c182affec369 // indirect
92-
github.com/minio/md5-simd v1.1.0 // indirect
93-
github.com/minio/minio-go/v7 v7.0.24 // indirect
94-
github.com/minio/sha256-simd v0.1.1 // indirect
95-
github.com/mitchellh/copystructure v1.2.0 // indirect
9640
github.com/mitchellh/go-homedir v1.1.0 // indirect
97-
github.com/mitchellh/reflectwalk v1.0.2 // indirect
98-
github.com/moby/locker v1.0.1 // indirect
99-
github.com/moby/term v0.0.0-20210610120745-9d4ed1856297 // indirect
10041
github.com/modern-go/concurrent v0.0.0-20180306012644-bacd9c7ef1dd // indirect
10142
github.com/modern-go/reflect2 v1.0.2 // indirect
102-
github.com/monochromegane/go-gitignore v0.0.0-20200626010858-205db1a8cc00 // indirect
103-
github.com/morikuni/aec v1.0.0 // indirect
104-
github.com/onsi/gomega v1.19.0 // indirect
105-
github.com/opencontainers/go-digest v1.0.0 // indirect
106-
github.com/opencontainers/image-spec v1.0.2 // indirect
107-
github.com/peterbourgon/diskv v2.0.1+incompatible // indirect
108-
github.com/pkg/browser v0.0.0-20210115035449-ce105d075bb4 // indirect
109-
github.com/pkg/errors v0.9.1 // indirect
110-
github.com/pmezard/go-difflib v1.0.0 // indirect
111-
github.com/prometheus/client_golang v1.12.1 // indirect
112-
github.com/prometheus/client_model v0.2.0 // indirect
113-
github.com/prometheus/common v0.32.1 // indirect
114-
github.com/prometheus/procfs v0.7.3 // indirect
115-
github.com/rs/xid v1.2.1 // indirect
116-
github.com/satori/go.uuid v1.2.0 // indirect
11743
github.com/sergi/go-diff v1.2.0 // indirect
118-
github.com/sirupsen/logrus v1.8.1 // indirect
11944
github.com/sosedoff/gitkit v0.3.0 // indirect
120-
github.com/spf13/cobra v1.3.0 // indirect
121-
github.com/spf13/pflag v1.0.5 // indirect
122-
github.com/stretchr/testify v1.7.1 // indirect
12345
github.com/xanzy/ssh-agent v0.3.1 // indirect
124-
github.com/xeipuuv/gojsonpointer v0.0.0-20180127040702-4e3ac2762d5f // indirect
125-
github.com/xeipuuv/gojsonreference v0.0.0-20180127040603-bd5ef7bd5415 // indirect
126-
github.com/xeipuuv/gojsonschema v1.2.0 // indirect
127-
github.com/xlab/treeprint v0.0.0-20181112141820-a009c3971eca // indirect
128-
go.opencensus.io v0.23.0 // indirect
129-
go.starlark.net v0.0.0-20200306205701-8dd3e2ee1dd5 // indirect
130-
go.uber.org/atomic v1.7.0 // indirect
131-
go.uber.org/multierr v1.6.0 // indirect
132-
go.uber.org/zap v1.21.0 // indirect
13346
golang.org/x/net v0.0.0-20220412020605-290c469a71a5 // indirect
134-
golang.org/x/oauth2 v0.0.0-20220411215720-9780585627b5 // indirect
135-
golang.org/x/sync v0.0.0-20210220032951-036812b2e83c // indirect
13647
golang.org/x/sys v0.0.0-20220412211240-33da011f77ad // indirect
137-
golang.org/x/term v0.0.0-20210927222741-03fcf44c2211 // indirect
13848
golang.org/x/text v0.3.7 // indirect
139-
golang.org/x/time v0.0.0-20220210224613-90d013bbcef8 // indirect
140-
golang.org/x/xerrors v0.0.0-20220411194840-2f41105eb62f // indirect
141-
gomodules.xyz/jsonpatch/v2 v2.2.0 // indirect
142-
google.golang.org/api v0.77.0 // indirect
143-
google.golang.org/appengine v1.6.7 // indirect
144-
google.golang.org/genproto v0.0.0-20220414192740-2d67ff6cf2b4 // indirect
145-
google.golang.org/grpc v1.45.0 // indirect
146-
google.golang.org/protobuf v1.28.0 // indirect
14749
gopkg.in/inf.v0 v0.9.1 // indirect
148-
gopkg.in/ini.v1 v1.66.2 // indirect
14950
gopkg.in/warnings.v0 v0.1.2 // indirect
15051
gopkg.in/yaml.v2 v2.4.0 // indirect
151-
gopkg.in/yaml.v3 v3.0.0-20210107192922-496545a6307b // indirect
152-
helm.sh/helm/v3 v3.8.2 // indirect
15352
k8s.io/api v0.23.6 // indirect
154-
k8s.io/apiextensions-apiserver v0.23.5 // indirect
15553
k8s.io/apimachinery v0.23.6 // indirect
156-
k8s.io/cli-runtime v0.23.5 // indirect
157-
k8s.io/client-go v0.23.6 // indirect
158-
k8s.io/component-base v0.23.5 // indirect
15954
k8s.io/klog/v2 v2.50.0 // indirect
160-
k8s.io/kube-openapi v0.0.0-20220124234850-424119656bbf // indirect
16155
k8s.io/utils v0.0.0-20220210201930-3a6ce19ff2f9 // indirect
162-
oras.land/oras-go v1.1.1 // indirect
163-
sigs.k8s.io/controller-runtime v0.11.2 // indirect
16456
sigs.k8s.io/json v0.0.0-20211208200746-9f7c6b3444d2 // indirect
165-
sigs.k8s.io/kustomize/api v0.10.1 // indirect
166-
sigs.k8s.io/kustomize/kyaml v0.13.0 // indirect
16757
sigs.k8s.io/structured-merge-diff/v4 v4.2.1 // indirect
168-
sigs.k8s.io/yaml v1.3.0 // indirect
16958
)

0 commit comments

Comments
 (0)