Skip to content

Commit e8b70a1

Browse files
committed
pnpm moving to 11 caused build failures
1 parent f1311d2 commit e8b70a1

3 files changed

Lines changed: 38 additions & 25 deletions

File tree

adks/e2e-sdk/Dockerfile

Lines changed: 18 additions & 12 deletions
Original file line numberDiff line numberDiff line change
@@ -10,21 +10,27 @@ RUN apt-get update && apt-get install -y git wget && \
1010
RUN mkdir -p /pnpm
1111
ENV PNPM_HOME=/pnpm
1212

13-
ARG branch=main
14-
RUN (git clone --depth 1 -b $branch https://github.com/featurehub-io/featurehub-javascript-sdk.git || git clone --depth 1 https://github.com/featurehub-io/featurehub-javascript-sdk.git) && \
15-
cd featurehub-javascript-sdk && \
16-
(git checkout $branch || true) && \
17-
export PATH=$PATH:/pnpm && \
18-
cd packages/core && pnpm install && pnpm build && pnpm link && \
19-
cd ../node && pnpm install && pnpm build && pnpm link
20-
2113
WORKDIR /app
2214

15+
#ARG branch=main
16+
#RUN (git clone --depth 1 -b $branch https://github.com/featurehub-io/featurehub-javascript-sdk.git || git clone --depth 1 https://github.com/featurehub-io/featurehub-javascript-sdk.git) && \
17+
# cd featurehub-javascript-sdk && \
18+
# (git checkout $branch || true)
19+
#
20+
#RUN export PATH=$PATH:/pnpm/bin:/pnpm && \
21+
# cd featurehub-javascript-sdk/packages/core && pnpm install --ignore-scripts && pnpm build && pnpm link
22+
#
23+
#RUN export PATH=$PATH:/pnpm/bin:/pnpm && \
24+
# cd featurehub-javascript-sdk/packages/node && pnpm install --ignore-scripts && pnpm build && pnpm link
25+
26+
2327
ADD app /app/app/
2428
ADD features /app/features/
2529
# don't include workspace as it will bring in the lock
26-
COPY package.json pnpm-lock.yaml tsconfig.json run.sh /app/
30+
COPY package.json pnpm-lock.yaml pnpm-workspace.yaml tsconfig.json run.sh /app/
2731
# need to fix the setup before doing the install otherwise dev based overrides can pollute this
28-
RUN ( (pnpm remove featurehub-javascript-node-sdk featurehub-javascript-core-sdk && yq -i 'del(.overrides)' pnpm-lock.yaml) || true) && \
29-
pnpm add featurehub-javascript-node-sdk && \
30-
pnpm run setup && pnpm install --frozen-lockfile && pnpm run build
32+
#RUN ( (pnpm remove featurehub-javascript-node-sdk featurehub-javascript-core-sdk && yq -i 'del(.overrides)' pnpm-lock.yaml) || true)
33+
#RUN export PATH=$PATH:/pnpm/bin:/pnpm && \
34+
# pnpm add featurehub-javascript-sdk/packages/node && \
35+
# pnpm run setup && pnpm install --ignore-scripts --frozen-lockfile && pnpm run build
36+
RUN pnpm install --ignore-scripts --frozen-lockfile && pnpm run build

adks/e2e-sdk/make-image.sh

Lines changed: 2 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -1,3 +1,4 @@
11
#!/bin/sh
22
BRANCH=$(git rev-parse --abbrev-ref HEAD)
3-
docker build --no-cache --build-arg branch=${BRANCH} -t featurehub/e2e-adk:1.0 .
3+
#docker build --no-cache --build-arg branch=${BRANCH} -t featurehub/e2e-adk:1.0 .
4+
docker build --progress=plain --build-arg branch=${BRANCH} -t featurehub/e2e-adk:1.0 .

adks/e2e-sdk/pnpm-lock.yaml

Lines changed: 18 additions & 12 deletions
Some generated files are not rendered by default. Learn more about customizing how changed files appear on GitHub.

0 commit comments

Comments
 (0)