Skip to content
New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Update golang to 1.13.0 #45

Closed
wants to merge 1 commit into from
Closed

Update golang to 1.13.0 #45

Changes from all commits
Commits
Show all changes
1 commit
Select commit
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
16 changes: 9 additions & 7 deletions Dockerfile
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -1,17 +1,17 @@
ARG GO_VERSION=1.12.16
ARG GO_VERSION=1.13.0

# OS-X SDK parameters
# NOTE: when changing version here, make sure to also change OSX_CODENAME below to match
ARG OSX_SDK=MacOSX10.10.sdk
ARG OSX_SDK_SUM=631b4144c6bf75bf7a4d480d685a9b5bda10ee8d03dbf0db829391e2ef858789
ARG OSX_SDK=MacOSX10.11.sdk
ARG OSX_SDK_SUM=98cdd56e0f6c1f9e1af25e11dd93d2e7d306a4aa50430a2bc6bc083ac67efbb8
Copy link
Contributor Author

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

Once the SDK uploads to s3.dockerproject.org, I can change here. (If you want to re-generate it)


# OSX-cross parameters. Go 1.11 requires OSX >= 10.10
ARG OSX_VERSION_MIN=10.10
# OSX-cross parameters. Go 1.13 requires OSX >= 10.11
ARG OSX_VERSION_MIN=10.11
ARG OSX_CROSS_COMMIT=a9317c18a3a457ca0a657f08cc4d0d43c6cf8953
Copy link
Contributor Author

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

If we need to update to master I have already done it. tao12345666333@afc6f85

The CI has been passed. https://gitlab.com/taobeier/golang-cross/-/jobs/309376124


# Libtool parameters
ARG LIBTOOL_VERSION=2.4.6
ARG OSX_CODENAME=yosemite
ARG OSX_CODENAME=el_capitan

FROM golang:${GO_VERSION}-buster AS base
ARG APT_MIRROR
Expand All @@ -22,7 +22,9 @@ ENV OSX_CROSS_PATH=/osxcross
FROM base AS osx-sdk
ARG OSX_SDK
ARG OSX_SDK_SUM
ADD https://s3.dockerproject.org/darwin/v2/${OSX_SDK}.tar.xz "${OSX_CROSS_PATH}/tarballs/${OSX_SDK}.tar.xz"
# ADD https://s3.dockerproject.org/darwin/v2/${OSX_SDK}.tar.xz "${OSX_CROSS_PATH}/tarballs/${OSX_SDK}.tar.xz"
# FIXME: upload to s3.dockerproject.org
ADD https://github.com/ndeloof/golang-cross/raw/113fix/${OSX_SDK}.tar.xz "${OSX_CROSS_PATH}/tarballs/${OSX_SDK}.tar.xz"
Copy link
Contributor Author

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

I used the SDK https://github.com/phracker/MacOSX-SDKs, but unfortunately it lacks the necessary headers file.
I got some error like this:

testing o32-clang ... osxcross: error: cannot find libc++ headers
osxcross: error: while detecting target

The full job can be found here https://gitlab.com/taobeier/golang-cross/-/jobs/308408417

Later I chose the SDK build by @ndeloof It works well. https://gitlab.com/taobeier/golang-cross/-/jobs/309123113

I think we shoud upload new version SDK to s3.dockerproject.org @thaJeztah

RUN echo "${OSX_SDK_SUM}" "${OSX_CROSS_PATH}/tarballs/${OSX_SDK}.tar.xz" | sha256sum -c -

FROM base AS osx-cross-base
Expand Down