From b63ed319bf7ccb34741270ae3d64c6f9d3e8b034 Mon Sep 17 00:00:00 2001 From: Marie Piontek Date: Wed, 9 Aug 2023 21:15:39 +0000 Subject: [PATCH 1/4] fix: building re2 in Dockerfile --- Dockerfile | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/Dockerfile b/Dockerfile index ec07bb2106..6bce93a70e 100644 --- a/Dockerfile +++ b/Dockerfile @@ -3,7 +3,7 @@ FROM alpine:3.18 as build WORKDIR /firefish # Install compilation dependencies -RUN apk add --no-cache --no-progress git alpine-sdk python3 nodejs-current npm rust cargo vips +RUN apk add --no-cache --no-progress git alpine-sdk python3 nodejs-current npm rust cargo vips linux-headers # Copy only the cargo dependency-related files first, to cache efficiently COPY packages/backend/native-utils/Cargo.toml packages/backend/native-utils/Cargo.toml From 240a05719a628ac4b651d86a5bf0bcc03619112a Mon Sep 17 00:00:00 2001 From: Kainoa Kanter Date: Wed, 9 Aug 2023 21:36:03 +0000 Subject: [PATCH 2/4] =?UTF-8?q?ci:=20=F0=9F=92=9A=20linux-headers=20in=20C?= =?UTF-8?q?I=20testCommit?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .gitlab-ci.yml | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/.gitlab-ci.yml b/.gitlab-ci.yml index f11cf53940..dca179bd6e 100644 --- a/.gitlab-ci.yml +++ b/.gitlab-ci.yml @@ -30,7 +30,7 @@ testCommit: # POSTGRES_PASSWORD: $POSTGRES_PASSWORD # POSTGRES_HOST_AUTH_METHOD: trust script: - - apk add --no-cache cargo python3 make g++ + - apk add --no-cache cargo python3 make g++ linux-headers - cp .config/ci.yml .config/default.yml - corepack enable - corepack prepare pnpm@latest --activate @@ -88,4 +88,4 @@ dockerBuild: only: - main - beta - - tags \ No newline at end of file + - tags From 10d18aa1c2ffb3963662389320171b6e1cb2de7d Mon Sep 17 00:00:00 2001 From: Kainoa Kanter Date: Thu, 10 Aug 2023 00:19:05 +0000 Subject: [PATCH 3/4] =?UTF-8?q?ci:=20=F0=9F=92=9A=20use=20Debian=20Bookwor?= =?UTF-8?q?m?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .gitlab-ci.yml | 5 +++-- 1 file changed, 3 insertions(+), 2 deletions(-) diff --git a/.gitlab-ci.yml b/.gitlab-ci.yml index dca179bd6e..e5eb0af37b 100644 --- a/.gitlab-ci.yml +++ b/.gitlab-ci.yml @@ -16,7 +16,7 @@ stages: testCommit: stage: build - image: node:alpine + image: node:latest # Pick zero or more services to be used on all builds. # Only needed when using a docker container to run your tests in. # Check out: https://docs.gitlab.com/ee/ci/services/index.html @@ -30,7 +30,8 @@ testCommit: # POSTGRES_PASSWORD: $POSTGRES_PASSWORD # POSTGRES_HOST_AUTH_METHOD: trust script: - - apk add --no-cache cargo python3 make g++ linux-headers + - apt-get update && apt-get install -y git wget curl build-essential python3 + - curl https://sh.rustup.rs -sSf | sh -s -- -y - cp .config/ci.yml .config/default.yml - corepack enable - corepack prepare pnpm@latest --activate From 8cb09818d6353ec546adcfd02f3b138adadf3ded Mon Sep 17 00:00:00 2001 From: Kainoa Kanter Date: Thu, 10 Aug 2023 00:22:24 +0000 Subject: [PATCH 4/4] =?UTF-8?q?ci:=20=F0=9F=92=9A=20source=20cargo=20env?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .gitlab-ci.yml | 1 + 1 file changed, 1 insertion(+) diff --git a/.gitlab-ci.yml b/.gitlab-ci.yml index e5eb0af37b..cf107b3dcc 100644 --- a/.gitlab-ci.yml +++ b/.gitlab-ci.yml @@ -32,6 +32,7 @@ testCommit: script: - apt-get update && apt-get install -y git wget curl build-essential python3 - curl https://sh.rustup.rs -sSf | sh -s -- -y + - source "$HOME/.cargo/env" - cp .config/ci.yml .config/default.yml - corepack enable - corepack prepare pnpm@latest --activate