From b952a144ce23d87dc146c19ba9529e5d7f190529 Mon Sep 17 00:00:00 2001 From: Adam Thiede Date: Fri, 23 Aug 2024 08:04:53 -0500 Subject: [PATCH] yarn to npm --- Dockerfile | 1 - ci-build.sh | 11 +++++------ 2 files changed, 5 insertions(+), 7 deletions(-) diff --git a/Dockerfile b/Dockerfile index 65cc738..c7783f2 100644 --- a/Dockerfile +++ b/Dockerfile @@ -43,4 +43,3 @@ RUN cd /opt/; tar xf node-${NODE_VERSION}-linux-arm64.tar.gz RUN mv /opt/node-${NODE_VERSION}-linux-arm64/* /opt/node/ #ENV PATH=/opt/node/bin:$PATH ENV PATH=/Signal-Desktop/node_modules/.bin:/root/.cargo/bin:/opt/node/bin:/usr/local/sbin:/usr/local/bin:/usr/sbin:/usr/bin:/sbin:/bin:$PATH -RUN npm install --global yarn diff --git a/ci-build.sh b/ci-build.sh index 677c67e..ab1b2ab 100755 --- a/ci-build.sh +++ b/ci-build.sh @@ -7,13 +7,12 @@ podman create --name=signal-desktop-$VERSION -it localhost/signal-desktop-image- podman start signal-desktop-$VERSION ##podman exec -it --env-file=env -w /Signal-Desktop signal-desktop-$VERSION bash -c "echo $PATH" podman exec -it --env-file=env signal-desktop-$VERSION bash -i -c /signal-buildscript.sh -podman exec -it --env-file=env -w /Signal-Desktop signal-desktop-$VERSION yarn install --non-interactive -podman exec -it --env-file=env -w /Signal-Desktop signal-desktop-$VERSION yarn install --frozen-lockfile --non-interactive +podman exec -it --env-file=env -w /Signal-Desktop signal-desktop-$VERSION npm install --non-interactive +podman exec -it --env-file=env -w /Signal-Desktop signal-desktop-$VERSION npm install --frozen-lockfile --non-interactive podman exec -it --env-file=env -w /Signal-Desktop signal-desktop-$VERSION rm -rf ts/test-mock -podman exec -it --env-file=env -w /Signal-Desktop signal-desktop-$VERSION yarn generate -podman exec -it --env-file=env -w /Signal-Desktop signal-desktop-$VERSION yarn build:webpack -podman exec -it --env-file=env -w /Signal-Desktop signal-desktop-$VERSION yarn build:release --arm64 --linux --dir -podman exec -it --env-file=env -w /Signal-Desktop signal-desktop-$VERSION yarn build:release --arm64 --linux deb +podman exec -it --env-file=env -w /Signal-Desktop signal-desktop-$VERSION npm run generate +podman exec -it --env-file=env -w /Signal-Desktop signal-desktop-$VERSION npm run build:release --arm64 --linux --dir +podman exec -it --env-file=env -w /Signal-Desktop signal-desktop-$VERSION npm run build:release --arm64 --linux deb podman exec -it --env-file=env -w /Signal-Desktop/release signal-desktop-$VERSION mv linux-arm64-unpacked signal podman exec -it --env-file=env -w /Signal-Desktop/release signal-desktop-$VERSION tar cJvf signal-desktop_${VERSION}.tar.xz signal