mirror of
https://github.com/bluszcz/cutego.git
synced 2024-09-28 21:25:16 +03:00
fix the CI image builds again + fix for Go 1.14 module issue
This commit is contained in:
parent
fbe09d927c
commit
e1f2cf7157
9 changed files with 15 additions and 11 deletions
|
@ -1,6 +1,6 @@
|
||||||
FROM ubuntu:16.04 as base
|
FROM ubuntu:16.04 as base
|
||||||
|
|
||||||
RUN apt-get -qq update && apt-get --no-install-recommends -qq -y install curl cmake file git build-essential xz-utils software-properties-common
|
RUN apt-get -qq update && apt-get --no-install-recommends -qq -y install curl cmake file git build-essential xz-utils software-properties-common apt-transport-https
|
||||||
|
|
||||||
RUN curl -sL --retry 10 --retry-delay 60 https://apt.llvm.org/llvm-snapshot.gpg.key | apt-key add -
|
RUN curl -sL --retry 10 --retry-delay 60 https://apt.llvm.org/llvm-snapshot.gpg.key | apt-key add -
|
||||||
RUN apt-add-repository "deb http://apt.llvm.org/xenial/ llvm-toolchain-xenial-9 main"
|
RUN apt-add-repository "deb http://apt.llvm.org/xenial/ llvm-toolchain-xenial-9 main"
|
||||||
|
@ -27,7 +27,7 @@ ENV QT_VERSION $QT_API
|
||||||
ENV QT_QMAKE_DIR $GOPATH/src/github.com/therecipe/env_darwin_amd64_513/5.13.0/clang_64/bin
|
ENV QT_QMAKE_DIR $GOPATH/src/github.com/therecipe/env_darwin_amd64_513/5.13.0/clang_64/bin
|
||||||
|
|
||||||
|
|
||||||
RUN apt-get -qq update && apt-get --no-install-recommends -qq -y install curl git build-essential libglib2.0-dev software-properties-common && apt-get -qq clean
|
RUN apt-get -qq update && apt-get --no-install-recommends -qq -y install curl git build-essential libglib2.0-dev software-properties-common apt-transport-https && apt-get -qq clean
|
||||||
|
|
||||||
COPY --from=base /osxcross/target /osxcross/target
|
COPY --from=base /osxcross/target /osxcross/target
|
||||||
RUN ln -s /osxcross/target/bin/xcrun /usr/bin/xcrun
|
RUN ln -s /osxcross/target/bin/xcrun /usr/bin/xcrun
|
||||||
|
|
|
@ -1,6 +1,6 @@
|
||||||
FROM ubuntu:16.04 as base
|
FROM ubuntu:16.04 as base
|
||||||
|
|
||||||
RUN apt-get -qq update && apt-get --no-install-recommends -qq -y install curl cmake file git build-essential xz-utils software-properties-common
|
RUN apt-get -qq update && apt-get --no-install-recommends -qq -y install curl cmake file git build-essential xz-utils software-properties-common apt-transport-https
|
||||||
|
|
||||||
RUN curl -sL --retry 10 --retry-delay 60 https://apt.llvm.org/llvm-snapshot.gpg.key | apt-key add -
|
RUN curl -sL --retry 10 --retry-delay 60 https://apt.llvm.org/llvm-snapshot.gpg.key | apt-key add -
|
||||||
RUN apt-add-repository "deb http://apt.llvm.org/xenial/ llvm-toolchain-xenial-9 main"
|
RUN apt-add-repository "deb http://apt.llvm.org/xenial/ llvm-toolchain-xenial-9 main"
|
||||||
|
@ -27,7 +27,7 @@ ENV QT_VERSION $QT_API
|
||||||
ENV QT_QMAKE_DIR $GOPATH/src/github.com/therecipe/env_darwin_amd64_512/5.12.0/clang_64/bin
|
ENV QT_QMAKE_DIR $GOPATH/src/github.com/therecipe/env_darwin_amd64_512/5.12.0/clang_64/bin
|
||||||
|
|
||||||
|
|
||||||
RUN apt-get -qq update && apt-get --no-install-recommends -qq -y install curl git build-essential libglib2.0-dev software-properties-common && apt-get -qq clean
|
RUN apt-get -qq update && apt-get --no-install-recommends -qq -y install curl git build-essential libglib2.0-dev software-properties-common apt-transport-https && apt-get -qq clean
|
||||||
|
|
||||||
COPY --from=base /osxcross/target /osxcross/target
|
COPY --from=base /osxcross/target /osxcross/target
|
||||||
RUN ln -s /osxcross/target/bin/xcrun /usr/bin/xcrun
|
RUN ln -s /osxcross/target/bin/xcrun /usr/bin/xcrun
|
||||||
|
|
|
@ -1,6 +1,6 @@
|
||||||
FROM ubuntu:16.04 as base
|
FROM ubuntu:16.04 as base
|
||||||
|
|
||||||
RUN apt-get -qq update && apt-get --no-install-recommends -qq -y install curl cmake file git build-essential xz-utils software-properties-common
|
RUN apt-get -qq update && apt-get --no-install-recommends -qq -y install curl cmake file git build-essential xz-utils software-properties-common apt-transport-https
|
||||||
|
|
||||||
RUN curl -sL --retry 10 --retry-delay 60 https://apt.llvm.org/llvm-snapshot.gpg.key | apt-key add -
|
RUN curl -sL --retry 10 --retry-delay 60 https://apt.llvm.org/llvm-snapshot.gpg.key | apt-key add -
|
||||||
RUN apt-add-repository "deb http://apt.llvm.org/xenial/ llvm-toolchain-xenial-9 main"
|
RUN apt-add-repository "deb http://apt.llvm.org/xenial/ llvm-toolchain-xenial-9 main"
|
||||||
|
@ -28,7 +28,7 @@ ENV QT_VERSION $QT_API
|
||||||
ENV QT_QMAKE_DIR $GOPATH/src/github.com/therecipe/env_darwin_amd64_513/5.13.0/clang_64/bin
|
ENV QT_QMAKE_DIR $GOPATH/src/github.com/therecipe/env_darwin_amd64_513/5.13.0/clang_64/bin
|
||||||
|
|
||||||
|
|
||||||
RUN apt-get -qq update && apt-get --no-install-recommends -qq -y install curl git build-essential libglib2.0-dev software-properties-common && apt-get -qq clean
|
RUN apt-get -qq update && apt-get --no-install-recommends -qq -y install curl git build-essential libglib2.0-dev software-properties-common apt-transport-https && apt-get -qq clean
|
||||||
|
|
||||||
COPY --from=base /osxcross/target /osxcross/target
|
COPY --from=base /osxcross/target /osxcross/target
|
||||||
RUN ln -s /osxcross/target/bin/xcrun /usr/bin/xcrun
|
RUN ln -s /osxcross/target/bin/xcrun /usr/bin/xcrun
|
||||||
|
|
|
@ -15,4 +15,4 @@ jobs:
|
||||||
-
|
-
|
||||||
script: 'while ! docker ps 2>/dev/null; do sleep 5; echo "waiting for docker to come up"; docker ps; done'
|
script: 'while ! docker ps 2>/dev/null; do sleep 5; echo "waiting for docker to come up"; docker ps; done'
|
||||||
-
|
-
|
||||||
script: 'cd internal/docker/darwin && ./build.sh && ./save.sh && rm -f darwin.tar.gz && docker build -f Dockerfile.512 .'
|
script: 'cd internal/docker/darwin && ./build.sh && ./save.sh && rm -f darwin.tar.gz && docker build --force-rm -f Dockerfile.512 .'
|
||||||
|
|
|
@ -7,6 +7,6 @@ jobs:
|
||||||
dependsOn: '${{ parameters.dep }}'
|
dependsOn: '${{ parameters.dep }}'
|
||||||
steps:
|
steps:
|
||||||
-
|
-
|
||||||
script: 'docker build -f internal/docker/${{ parameters.file }} -t therecipe/qt:${{ parameters.tag }} .'
|
script: 'docker build --force-rm -f internal/docker/${{ parameters.file }} -t therecipe/qt:${{ parameters.tag }} .'
|
||||||
-
|
-
|
||||||
script: 'docker login -u therecipe -p $(DOCKER_PASSWORD) && docker push therecipe/qt:${{ parameters.tag }} && docker logout'
|
script: 'docker login -u therecipe -p $(DOCKER_PASSWORD) && docker push therecipe/qt:${{ parameters.tag }} && docker logout'
|
||||||
|
|
|
@ -10,7 +10,7 @@ RUN /usr/local/go/bin/go get -tags=no_env github.com/therecipe/qt/cmd/...
|
||||||
|
|
||||||
RUN apt-get -qq update && apt-get --no-install-recommends -qq -y install dbus fontconfig libx11-6 libx11-xcb1
|
RUN apt-get -qq update && apt-get --no-install-recommends -qq -y install dbus fontconfig libx11-6 libx11-xcb1
|
||||||
ENV QT qt-opensource-linux-x64-5.6.3.run
|
ENV QT qt-opensource-linux-x64-5.6.3.run
|
||||||
RUN curl -sL --retry 10 --retry-delay 60 -O https://download.qt.io/archive/qt/5.6/5.6.3/$QT && chmod +x $QT
|
RUN curl -sL --retry 10 --retry-delay 60 -O https://download.qt.io/new_archive/qt/5.6/5.6.3/$QT && chmod +x $QT
|
||||||
RUN apt-get -qq update && apt-get --no-install-recommends -qq -y install libglib2.0-dev libglu1-mesa-dev
|
RUN apt-get -qq update && apt-get --no-install-recommends -qq -y install libglib2.0-dev libglu1-mesa-dev
|
||||||
RUN QT_QPA_PLATFORM=minimal ./$QT --no-force-installations --script $GOPATH/src/github.com/therecipe/qt/internal/ci/iscript.qs LINUX=true VERSION=563
|
RUN QT_QPA_PLATFORM=minimal ./$QT --no-force-installations --script $GOPATH/src/github.com/therecipe/qt/internal/ci/iscript.qs LINUX=true VERSION=563
|
||||||
RUN find /opt/Qt5.6.3/5.6.3 -type f -name "*.debug" -delete
|
RUN find /opt/Qt5.6.3/5.6.3 -type f -name "*.debug" -delete
|
||||||
|
|
|
@ -1,7 +1,7 @@
|
||||||
FROM therecipe/qt:wine_base as base
|
FROM therecipe/qt:wine_base as base
|
||||||
|
|
||||||
ENV QT qt-opensource-windows-x86-mingw492-5.6.3.exe
|
ENV QT qt-opensource-windows-x86-mingw492-5.6.3.exe
|
||||||
RUN curl -sL --retry 10 --retry-delay 60 -O https://download.qt.io/archive/qt/5.6/5.6.3/$QT
|
RUN curl -sL --retry 10 --retry-delay 60 -O https://download.qt.io/new_archive/qt/5.6/5.6.3/$QT
|
||||||
RUN QT_QPA_PLATFORM=minimal xvfb-run wine Z:\\$QT --no-force-installations --script=C:\\gopath\\src\\github.com\\therecipe\\qt\\internal\\ci\\iscript.qs WINDOWS=true VERSION=563 && rm -f $QT
|
RUN QT_QPA_PLATFORM=minimal xvfb-run wine Z:\\$QT --no-force-installations --script=C:\\gopath\\src\\github.com\\therecipe\\qt\\internal\\ci\\iscript.qs WINDOWS=true VERSION=563 && rm -f $QT
|
||||||
RUN rm -f $(find $HOME/.wine/drive_c/Qt/Qt5.6.3/5.6.3/mingw49_32 -name "*d.a" -exec grep -l "gnu_debug" {} \+)
|
RUN rm -f $(find $HOME/.wine/drive_c/Qt/Qt5.6.3/5.6.3/mingw49_32 -name "*d.a" -exec grep -l "gnu_debug" {} \+)
|
||||||
RUN rm -f $(find $HOME/.wine/drive_c/Qt/Qt5.6.3/5.6.3/mingw49_32 -name "*d.dll" -exec grep -l "gnu_debug" {} \+)
|
RUN rm -f $(find $HOME/.wine/drive_c/Qt/Qt5.6.3/5.6.3/mingw49_32 -name "*d.dll" -exec grep -l "gnu_debug" {} \+)
|
||||||
|
|
|
@ -1,7 +1,7 @@
|
||||||
FROM therecipe/qt:wine_base_xp as base
|
FROM therecipe/qt:wine_base_xp as base
|
||||||
|
|
||||||
ENV QT qt-opensource-windows-x86-mingw492-5.6.3.exe
|
ENV QT qt-opensource-windows-x86-mingw492-5.6.3.exe
|
||||||
RUN curl -sL --retry 10 --retry-delay 60 -O https://download.qt.io/archive/qt/5.6/5.6.3/$QT
|
RUN curl -sL --retry 10 --retry-delay 60 -O https://download.qt.io/new_archive/qt/5.6/5.6.3/$QT
|
||||||
RUN QT_QPA_PLATFORM=minimal xvfb-run wine Z:\\$QT --no-force-installations --script=C:\\gopath\\src\\github.com\\therecipe\\qt\\internal\\ci\\iscript.qs WINDOWS=true VERSION=563 && rm -f $QT
|
RUN QT_QPA_PLATFORM=minimal xvfb-run wine Z:\\$QT --no-force-installations --script=C:\\gopath\\src\\github.com\\therecipe\\qt\\internal\\ci\\iscript.qs WINDOWS=true VERSION=563 && rm -f $QT
|
||||||
RUN rm -f $(find $HOME/.wine/drive_c/Qt/Qt5.6.3/5.6.3/mingw49_32 -name "*d.a" -exec grep -l "gnu_debug" {} \+)
|
RUN rm -f $(find $HOME/.wine/drive_c/Qt/Qt5.6.3/5.6.3/mingw49_32 -name "*d.a" -exec grep -l "gnu_debug" {} \+)
|
||||||
RUN rm -f $(find $HOME/.wine/drive_c/Qt/Qt5.6.3/5.6.3/mingw49_32 -name "*d.dll" -exec grep -l "gnu_debug" {} \+)
|
RUN rm -f $(find $HOME/.wine/drive_c/Qt/Qt5.6.3/5.6.3/mingw49_32 -name "*d.dll" -exec grep -l "gnu_debug" {} \+)
|
||||||
|
|
|
@ -425,6 +425,10 @@ func GoList(args ...string) *exec.Cmd {
|
||||||
if UseGOMOD("") {
|
if UseGOMOD("") {
|
||||||
if !(strings.Contains(strings.Join(args, "|"), "github.com/therecipe/qt/internal") && !strings.Contains(strings.Join(args, "|"), "github.com/therecipe/qt/internal/binding/runtime")) {
|
if !(strings.Contains(strings.Join(args, "|"), "github.com/therecipe/qt/internal") && !strings.Contains(strings.Join(args, "|"), "github.com/therecipe/qt/internal/binding/runtime")) {
|
||||||
cmd.Args = append(cmd.Args, GOFLAGS())
|
cmd.Args = append(cmd.Args, GOFLAGS())
|
||||||
|
} else {
|
||||||
|
if GOVERSION_NUM() >= 114 {
|
||||||
|
cmd.Args = append(cmd.Args, "-mod=mod")
|
||||||
|
}
|
||||||
}
|
}
|
||||||
cmd.Dir = filepath.Dir(GOMOD(""))
|
cmd.Dir = filepath.Dir(GOMOD(""))
|
||||||
}
|
}
|
||||||
|
|
Loading…
Reference in a new issue