From 18c55bfb57452d93494317fdee8d16d8420ffffd Mon Sep 17 00:00:00 2001 From: Lars Bilke Date: Wed, 8 Nov 2023 15:01:46 +0100 Subject: [PATCH 1/6] [cmake] Try to apply git patch for metis only once. Should fix errors when NOT using CPM_SOURCE_CACHE such as error: programs/CMakeLists.txt: patch does not apply Attention: If you delete the CMakeCache.txt then you have to delete build/_deps/metis-* as well! --- scripts/cmake/Dependencies.cmake | 1 + 1 file changed, 1 insertion(+) diff --git a/scripts/cmake/Dependencies.cmake b/scripts/cmake/Dependencies.cmake index f736749892a..a02ce8a5e01 100644 --- a/scripts/cmake/Dependencies.cmake +++ b/scripts/cmake/Dependencies.cmake @@ -412,6 +412,7 @@ if(OGS_BUILD_UTILS) GIT_REPOSITORY https://github.com/KarypisLab/METIS VERSION 5.2.1 EXCLUDE_FROM_ALL YES + UPDATE_DISCONNECTED ON PATCH_COMMAND git apply ${PROJECT_SOURCE_DIR}/scripts/cmake/metis.patch OPTIONS ${_metis_options} From d96baba8f1ba8d6a1691f87a97f8642eddd78570 Mon Sep 17 00:00:00 2001 From: project_120_bot2 Date: Wed, 8 Nov 2023 14:14:01 +0000 Subject: [PATCH 2/6] [versions] Updated cpm cache info. --- web/data/versions.json | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/web/data/versions.json b/web/data/versions.json index 0685f0472e0..5908476f645 100644 --- a/web/data/versions.json +++ b/web/data/versions.json @@ -72,8 +72,8 @@ } }, "cpm": { - "package_file_id": 1029, - "package_file_sha256": "baca0a575a0c7053e4c7a5bffb32bb30d8dce0ae97308858b3bf8a690063b303" + "package_file_id": 1048, + "package_file_sha256": "fe5b6489d66351dfac09622ac53d3fd987b2b7d81df01038ad0c2e316d6a3ebd" }, "ext": { "cache_hash": "4ebd62e0ce484732dbf3cd9932f60b67762e156b" From bbb5158e24d7b923bb6c3478a3b85e71d3f2d051 Mon Sep 17 00:00:00 2001 From: Lars Bilke Date: Wed, 8 Nov 2023 15:46:00 +0100 Subject: [PATCH 3/6] [docker] Pin netlify-cli. --- scripts/docker/Dockerfile.web | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/scripts/docker/Dockerfile.web b/scripts/docker/Dockerfile.web index df4ced3d635..c25766b4bfc 100644 --- a/scripts/docker/Dockerfile.web +++ b/scripts/docker/Dockerfile.web @@ -13,7 +13,7 @@ RUN curl -sS https://dl.yarnpkg.com/debian/pubkey.gpg | apt-key add - \ && apt-get update && DEBIAN_FRONTEND=noninteractive apt-get install -y yarn \ && rm -rf /var/lib/apt/lists/* RUN yarn global add node-gyp -RUN yarn global add netlify-cli +RUN yarn global add netlify-cli@16.9.3 ENV HUGO_VERSION=0.117.0 RUN curl -fSL -O "https://github.com/gohugoio/hugo/releases/download/v${HUGO_VERSION}/hugo_extended_${HUGO_VERSION}_linux-amd64.deb" \ && DEBIAN_FRONTEND=noninteractive apt-get install -y /hugo_extended_${HUGO_VERSION}_linux-amd64.deb \ From 2baa2996d445fb818468bd0f199e66366a3ca45c Mon Sep 17 00:00:00 2001 From: Lars Bilke Date: Wed, 8 Nov 2023 15:55:04 +0100 Subject: [PATCH 4/6] [docker] Update nodejs installation. See https://github.com/nodesource/distributions#installation-instructions. --- scripts/docker/Dockerfile.web | 7 +++++-- 1 file changed, 5 insertions(+), 2 deletions(-) diff --git a/scripts/docker/Dockerfile.web b/scripts/docker/Dockerfile.web index c25766b4bfc..93078b75ead 100644 --- a/scripts/docker/Dockerfile.web +++ b/scripts/docker/Dockerfile.web @@ -4,8 +4,11 @@ CMD [ "/bin/bash" ] RUN apt-get update && DEBIAN_FRONTEND=noninteractive apt-get install -y \ --no-install-recommends curl git gnupg2 && \ rm -rf /var/lib/apt/lists/* -RUN apt -y install curl dirmngr apt-transport-https ca-certificates \ - && curl -sL https://deb.nodesource.com/setup_16.x | bash - \ +RUN apt -y install curl dirmngr apt-transport-https ca-certificates gnupg \ + && mkdir -p /etc/apt/keyrings \ + && curl -fsSL https://deb.nodesource.com/gpgkey/nodesource-repo.gpg.key | gpg --dearmor -o /etc/apt/keyrings/nodesource.gpg \ + && echo "deb [signed-by=/etc/apt/keyrings/nodesource.gpg] https://deb.nodesource.com/node_20.x nodistro main" | tee /etc/apt/sources.list.d/nodesource.list \ + && apt-get update \ && apt-get -y install nodejs npm \ && rm -rf /var/lib/apt/lists/* RUN curl -sS https://dl.yarnpkg.com/debian/pubkey.gpg | apt-key add - \ From a9b5c9935994de6256188a038254b9c1fb5d03a4 Mon Sep 17 00:00:00 2001 From: Lars Bilke Date: Wed, 8 Nov 2023 15:55:25 +0100 Subject: [PATCH 5/6] Revert "[docker] Pin netlify-cli." This reverts commit bbb5158e24d7b923bb6c3478a3b85e71d3f2d051. --- scripts/docker/Dockerfile.web | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/scripts/docker/Dockerfile.web b/scripts/docker/Dockerfile.web index 93078b75ead..f315a8ecd03 100644 --- a/scripts/docker/Dockerfile.web +++ b/scripts/docker/Dockerfile.web @@ -16,7 +16,7 @@ RUN curl -sS https://dl.yarnpkg.com/debian/pubkey.gpg | apt-key add - \ && apt-get update && DEBIAN_FRONTEND=noninteractive apt-get install -y yarn \ && rm -rf /var/lib/apt/lists/* RUN yarn global add node-gyp -RUN yarn global add netlify-cli@16.9.3 +RUN yarn global add netlify-cli ENV HUGO_VERSION=0.117.0 RUN curl -fSL -O "https://github.com/gohugoio/hugo/releases/download/v${HUGO_VERSION}/hugo_extended_${HUGO_VERSION}_linux-amd64.deb" \ && DEBIAN_FRONTEND=noninteractive apt-get install -y /hugo_extended_${HUGO_VERSION}_linux-amd64.deb \ From 418d585b350d98325a99718de28050c7cf68adc0 Mon Sep 17 00:00:00 2001 From: Lars Bilke Date: Wed, 8 Nov 2023 16:03:30 +0100 Subject: [PATCH 6/6] [docker] Fix netlify-cli installation. --- scripts/docker/Dockerfile.web | 5 ++--- 1 file changed, 2 insertions(+), 3 deletions(-) diff --git a/scripts/docker/Dockerfile.web b/scripts/docker/Dockerfile.web index f315a8ecd03..ca52bad30f9 100644 --- a/scripts/docker/Dockerfile.web +++ b/scripts/docker/Dockerfile.web @@ -9,14 +9,13 @@ RUN apt -y install curl dirmngr apt-transport-https ca-certificates gnupg \ && curl -fsSL https://deb.nodesource.com/gpgkey/nodesource-repo.gpg.key | gpg --dearmor -o /etc/apt/keyrings/nodesource.gpg \ && echo "deb [signed-by=/etc/apt/keyrings/nodesource.gpg] https://deb.nodesource.com/node_20.x nodistro main" | tee /etc/apt/sources.list.d/nodesource.list \ && apt-get update \ - && apt-get -y install nodejs npm \ + && apt-get -y install nodejs \ && rm -rf /var/lib/apt/lists/* RUN curl -sS https://dl.yarnpkg.com/debian/pubkey.gpg | apt-key add - \ && echo "deb https://dl.yarnpkg.com/debian/ stable main" | tee /etc/apt/sources.list.d/yarn.list \ && apt-get update && DEBIAN_FRONTEND=noninteractive apt-get install -y yarn \ && rm -rf /var/lib/apt/lists/* -RUN yarn global add node-gyp -RUN yarn global add netlify-cli +RUN npm install netlify-cli -g ENV HUGO_VERSION=0.117.0 RUN curl -fSL -O "https://github.com/gohugoio/hugo/releases/download/v${HUGO_VERSION}/hugo_extended_${HUGO_VERSION}_linux-amd64.deb" \ && DEBIAN_FRONTEND=noninteractive apt-get install -y /hugo_extended_${HUGO_VERSION}_linux-amd64.deb \