Upgrade to golang-with-libgit2:1.1.1.6 and use static libraries for in development #562
Conversation
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
pjbgf
force-pushed
the
test-alpine
branch
2 times, most recently
from
95ab956
to
3a14cb8
Compare
pjbgf
force-pushed
the
test-alpine
branch
6 times, most recently
from
1870e29
to
cd5eefe
Compare
pjbgf
changed the title
|
This fails on Apple Silicon with: $ uname -a
Darwin stefan-m1-max.lan 21.2.0 Darwin Kernel Version 21.2.0: Sun Nov 28 20:28:41 PST 2021; root:xnu-8019.61.5~1/RELEASE_ARM64_T6000 arm64
$ make test
IMG_TAG=ghcr.io/fluxcd/golang-with-libgit2:libgit2-1.1.1-4 ./hack/extract-libraries.sh
+ IMG_TAG=ghcr.io/fluxcd/golang-with-libgit2:libgit2-1.1.1-4
+ setup_current
+ '[' -d ./hack/libgit2 ']'
+ DIR=x86_64-alpine-linux-musl
+ PLATFORM=linux/amd64
++ uname -m
+ '[' arm64 = armv7l ']'
++ uname -m
+ '[' arm64 = aarch64 ']'
+ setup linux/amd64 x86_64-alpine-linux-musl
+ PLATFORM=linux/amd64
+ DIR=x86_64-alpine-linux-musl
+ extract linux/amd64 x86_64-alpine-linux-musl
+ PLATFORM=linux/amd64
+ DIR=x86_64-alpine-linux-musl
++ docker create --platform=linux/amd64 ghcr.io/fluxcd/golang-with-libgit2:libgit2-1.1.1-4
+ id=1a11d719c1ebf1b0b014a457670c22388b736a3c9926546133b69b2f738949c4
+ docker cp 1a11d719c1ebf1b0b014a457670c22388b736a3c9926546133b69b2f738949c4:/usr/local -
+ docker rm -v 1a11d719c1ebf1b0b014a457670c22388b736a3c9926546133b69b2f738949c4
1a11d719c1ebf1b0b014a457670c22388b736a3c9926546133b69b2f738949c4
+ tar -xf output.tar.gz local/x86_64-alpine-linux-musl --strip-component=1
tar: --strip-component=1: Not found in archive
tar: Error exit delayed from previous errors.
make: *** [Makefile:146: /Users/stefanprodan/go/src/github.com/fluxcd/source-controller/hack/libgit2/lib/libgit2.a] Error 1 |
@stefanprodan thank you for testing, the output was quite useful. Do you mind testing it again with the latest change? |
|
Now it fails with: |
pjbgf
force-pushed
the
test-alpine
branch
2 times, most recently
from
990099e
to
75dee8f
Compare
|
75dee8f fails with: |
pjbgf
force-pushed
the
test-alpine
branch
9 times, most recently
from
eb5f1ae
to
a923945
Compare
|
Running I initially thought the problem was the temporary folder was failing to be created, but then even after changing it to create the files at ./build/tmp/ it still errors. I removed the I executed the same command on a arm/v8 machine (rpi 4), and this worked fine (apart from some disk related tests): |
added 3 commits
February 7, 2022 13:00
Signed-off-by: Paulo Gomes <[email protected]>
Fix issues developing in amd64, arm64 and apple silicon Signed-off-by: Paulo Gomes <[email protected]>
Signed-off-by: Paulo Gomes <[email protected]>
pjbgf
force-pushed
the
test-alpine
branch
9 times, most recently
from
6a9afb5
to
598c350
Compare
Signed-off-by: Paulo Gomes <[email protected]>
|
This has been tested on the physical environments:
Pending the final test that @aryan9600 is going to run on |
|
92718e5 fails with: |
Signed-off-by: Paulo Gomes <[email protected]>
pjbgf
changed the title
pjbgf
commented
Feb 8, 2022
Comment on lines
+61
to
+63
| mkdir tmp-download; cd tmp-download; go mod init go-download; | ||
| GOBIN="${GITHUB_WORKSPACE}/build/gobin" go install sigs.k8s.io/controller-runtime/tools/setup-envtest@latest | ||
| cd ..; rm -rf tmp-download |
There was a problem hiding this comment.
Our arm64 runners don't seem to be able to deal with Makefile's go-install-tool when installing setup-envtest. Although it works fine for all other targets.
hiddeco
approved these changes
Feb 8, 2022
hiddeco
added
area/ci
stefanprodan
approved these changes
Feb 8, 2022
There was a problem hiding this comment.
LGTM
Tested this on Apple Silicon and works great. Thanks @pjbgf 🏅
Sign up for free
to join this conversation on GitHub.
Already have an account?
Sign in to comment
Add this suggestion to a batch that can be applied as a single commit.
This suggestion is invalid because no changes were made to the code.
Suggestions cannot be applied while the pull request is closed.
Suggestions cannot be applied while viewing a subset of changes.
Only one suggestion per line can be applied in a batch.
Add this suggestion to a batch that can be applied as a single commit.
Applying suggestions on deleted lines is not supported.
You must change the existing code in this line in order to create a valid suggestion.
Outdated suggestions cannot be applied.
This suggestion has been applied or marked resolved.
Suggestions cannot be applied from pending reviews.
Suggestions cannot be applied on multi-line comments.
Suggestions cannot be applied while the pull request is queued to merge.
Suggestion cannot be applied right now. Please check back later.
Main changes:
golang-with-libgit2:1.1.1.6to speed up build time when cross compiling. Previous version was compiling in emulation mode instead, which added +10x overhead.make testis executed against the exact same libraries that will be shipped on the built image.Makefileto reduce its complexity.linux-amd64download static libraries from the official container image.linux-arm64on top of the above, requires static musl tool chain (automatically downloaded).darwin-amd64anddarwin-arm64download universal static libraries fordarwinfrom https://github.com/fluxcd/golang-with-libgit2 releases.Depends on:
Fix: #568