From eb8c45b482ba32ec7dfbebc1ae9025672d0cc663 Mon Sep 17 00:00:00 2001 From: Matthew Leibowitz Date: Sat, 30 Jul 2022 00:01:33 +0800 Subject: [PATCH 1/8] Update libexpat to 2.4.6 --- externals/skia | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/externals/skia b/externals/skia index 9bc933e2171..ddc569916b7 160000 --- a/externals/skia +++ b/externals/skia @@ -1 +1 @@ -Subproject commit 9bc933e21712f13fc41acc955f702cfc26d23bf1 +Subproject commit ddc569916b7356f9ea3b937bd0aa74205f41db9b From f6c6bd17fb71855078fbfd07b810c01541ebada5 Mon Sep 17 00:00:00 2001 From: Matthew Leibowitz Date: Sat, 30 Jul 2022 00:11:07 +0800 Subject: [PATCH 2/8] New Alpine package keys https://alpinelinux.org/posts/Alpine-edge-signing-keys-rotated.html --- scripts/Docker/alpine/amd64/Dockerfile | 2 ++ 1 file changed, 2 insertions(+) diff --git a/scripts/Docker/alpine/amd64/Dockerfile b/scripts/Docker/alpine/amd64/Dockerfile index 6abf8fdcabd..d052b5f8cb6 100644 --- a/scripts/Docker/alpine/amd64/Dockerfile +++ b/scripts/Docker/alpine/amd64/Dockerfile @@ -3,6 +3,8 @@ FROM amd64/alpine:3.9 # Arguments: # DOTNET_SDK_VERSION - the version of dotnet for the Cake script [ 3.1.412 | * ] +RUN apk add -X https://dl-cdn.alpinelinux.org/alpine/v3.16/main -u alpine-keys + RUN apk add --no-cache bash curl wget python python3 git build-base ninja fontconfig-dev libintl clang RUN apk add --no-cache samurai --repository http://dl-cdn.alpinelinux.org/alpine/edge/main RUN apk add --no-cache gn --repository http://dl-cdn.alpinelinux.org/alpine/edge/community From bc36ad7676a9a429dc2984b1d77825bf76784a11 Mon Sep 17 00:00:00 2001 From: Matthew Leibowitz Date: Sat, 30 Jul 2022 00:48:21 +0800 Subject: [PATCH 3/8] We need the new keys to get the new keys --- scripts/Docker/alpine/amd64/Dockerfile | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/scripts/Docker/alpine/amd64/Dockerfile b/scripts/Docker/alpine/amd64/Dockerfile index d052b5f8cb6..d7d3acb1c21 100644 --- a/scripts/Docker/alpine/amd64/Dockerfile +++ b/scripts/Docker/alpine/amd64/Dockerfile @@ -3,7 +3,7 @@ FROM amd64/alpine:3.9 # Arguments: # DOTNET_SDK_VERSION - the version of dotnet for the Cake script [ 3.1.412 | * ] -RUN apk add -X https://dl-cdn.alpinelinux.org/alpine/v3.16/main -u alpine-keys +RUN apk add -X https://dl-cdn.alpinelinux.org/alpine/v3.16/main -u alpine-keys --allow-untrusted RUN apk add --no-cache bash curl wget python python3 git build-base ninja fontconfig-dev libintl clang RUN apk add --no-cache samurai --repository http://dl-cdn.alpinelinux.org/alpine/edge/main From 6ca79d38210157ddc98a21a1ddec139ff61b60d7 Mon Sep 17 00:00:00 2001 From: Matthew Leibowitz Date: Sat, 30 Jul 2022 09:58:38 +0800 Subject: [PATCH 4/8] Usea newer linux --- scripts/Docker/alpine/amd64/Dockerfile | 7 ++----- 1 file changed, 2 insertions(+), 5 deletions(-) diff --git a/scripts/Docker/alpine/amd64/Dockerfile b/scripts/Docker/alpine/amd64/Dockerfile index d7d3acb1c21..cc786acc508 100644 --- a/scripts/Docker/alpine/amd64/Dockerfile +++ b/scripts/Docker/alpine/amd64/Dockerfile @@ -1,12 +1,9 @@ -FROM amd64/alpine:3.9 +FROM amd64/alpine:3.12 # Arguments: # DOTNET_SDK_VERSION - the version of dotnet for the Cake script [ 3.1.412 | * ] -RUN apk add -X https://dl-cdn.alpinelinux.org/alpine/v3.16/main -u alpine-keys --allow-untrusted - -RUN apk add --no-cache bash curl wget python python3 git build-base ninja fontconfig-dev libintl clang -RUN apk add --no-cache samurai --repository http://dl-cdn.alpinelinux.org/alpine/edge/main +RUN apk add --no-cache bash curl wget python3 git build-base ninja fontconfig-dev libintl clang RUN apk add --no-cache gn --repository http://dl-cdn.alpinelinux.org/alpine/edge/community ARG DOTNET_SDK_VERSION=3.1.412 From e2e97f82c42d3f5e643241b7c8c26eb8fa4ca19a Mon Sep 17 00:00:00 2001 From: Matthew Leibowitz Date: Mon, 1 Aug 2022 22:59:58 +0800 Subject: [PATCH 5/8] Build GN locally --- scripts/Docker/alpine/amd64/Dockerfile | 14 ++++++++++---- 1 file changed, 10 insertions(+), 4 deletions(-) diff --git a/scripts/Docker/alpine/amd64/Dockerfile b/scripts/Docker/alpine/amd64/Dockerfile index cc786acc508..de29bd6ec4e 100644 --- a/scripts/Docker/alpine/amd64/Dockerfile +++ b/scripts/Docker/alpine/amd64/Dockerfile @@ -1,10 +1,16 @@ -FROM amd64/alpine:3.12 +FROM amd64/alpine:3.9 # Arguments: # DOTNET_SDK_VERSION - the version of dotnet for the Cake script [ 3.1.412 | * ] -RUN apk add --no-cache bash curl wget python3 git build-base ninja fontconfig-dev libintl clang -RUN apk add --no-cache gn --repository http://dl-cdn.alpinelinux.org/alpine/edge/community +RUN apk add -X https://dl-cdn.alpinelinux.org/alpine/v3.16/main -u alpine-keys --allow-untrusted +RUN apk add --no-cache bash curl wget python python3 git build-base ninja fontconfig-dev libintl clang + +RUN git clone https://gn.googlesource.com/gn /work/externals/gn \ + && cd /work/externals/gn \ + && python build/gen.py --allow-warning \ + && ninja -C out \ + && /work/externals/gn/out/gn --version ARG DOTNET_SDK_VERSION=3.1.412 @@ -20,6 +26,6 @@ ENV DOTNET_SYSTEM_GLOBALIZATION_INVARIANT 1 RUN dotnet help -ENV GN_EXE=gn NINJA_EXE=ninja +ENV GN_EXE=/work/externals/gn/out/gn NINJA_EXE=ninja WORKDIR /work From 10e325eaabcfc1f11038331f3f9a936db714389f Mon Sep 17 00:00:00 2001 From: Matthew Leibowitz Date: Tue, 2 Aug 2022 02:22:03 +0800 Subject: [PATCH 6/8] use a folder that is not destroyed --- scripts/Docker/alpine/amd64/Dockerfile | 8 ++++---- 1 file changed, 4 insertions(+), 4 deletions(-) diff --git a/scripts/Docker/alpine/amd64/Dockerfile b/scripts/Docker/alpine/amd64/Dockerfile index de29bd6ec4e..4077941fb29 100644 --- a/scripts/Docker/alpine/amd64/Dockerfile +++ b/scripts/Docker/alpine/amd64/Dockerfile @@ -6,11 +6,11 @@ FROM amd64/alpine:3.9 RUN apk add -X https://dl-cdn.alpinelinux.org/alpine/v3.16/main -u alpine-keys --allow-untrusted RUN apk add --no-cache bash curl wget python python3 git build-base ninja fontconfig-dev libintl clang -RUN git clone https://gn.googlesource.com/gn /work/externals/gn \ - && cd /work/externals/gn \ +RUN git clone https://gn.googlesource.com/gn /usr/share/gn \ + && cd /usr/share/gn \ && python build/gen.py --allow-warning \ && ninja -C out \ - && /work/externals/gn/out/gn --version + && /usr/share/gn/out/gn --version ARG DOTNET_SDK_VERSION=3.1.412 @@ -26,6 +26,6 @@ ENV DOTNET_SYSTEM_GLOBALIZATION_INVARIANT 1 RUN dotnet help -ENV GN_EXE=/work/externals/gn/out/gn NINJA_EXE=ninja +ENV GN_EXE=/usr/share/gn/out/gn NINJA_EXE=ninja WORKDIR /work From 787a8b1832d961e895518c4fc92918c918f0ccc6 Mon Sep 17 00:00:00 2001 From: Matthew Leibowitz Date: Tue, 2 Aug 2022 02:46:31 +0800 Subject: [PATCH 7/8] Update libexpat to 2.4.8 --- externals/skia | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/externals/skia b/externals/skia index ddc569916b7..c87a6d21093 160000 --- a/externals/skia +++ b/externals/skia @@ -1 +1 @@ -Subproject commit ddc569916b7356f9ea3b937bd0aa74205f41db9b +Subproject commit c87a6d2109332bff8a903c7c454d1a027102b21d From 16561872b66a5a2c63c34e8c62f32f061b782280 Mon Sep 17 00:00:00 2001 From: Matthew Leibowitz Date: Tue, 2 Aug 2022 21:25:08 +0800 Subject: [PATCH 8/8] externals --- externals/skia | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/externals/skia b/externals/skia index c87a6d21093..d81d89ee752 160000 --- a/externals/skia +++ b/externals/skia @@ -1 +1 @@ -Subproject commit c87a6d2109332bff8a903c7c454d1a027102b21d +Subproject commit d81d89ee752c7d1496b42c4aecfb56792bb4b773