Skip to content
This repository was archived by the owner on Aug 15, 2023. It is now read-only.

Commit 5734da0

Browse files
committed
chore(guardoni): dist-all shell script (#324)
1 parent 750c4c1 commit 5734da0

File tree

7 files changed

+20
-25
lines changed

7 files changed

+20
-25
lines changed

docker/electron-builder/Dockerfile

-6
Original file line numberDiff line numberDiff line change
@@ -2,8 +2,6 @@
22
FROM electronuserland/builder:base
33

44
ARG NODE_VERSION 16.10.0
5-
ARG USER_ID
6-
ARG GROUP_ID
75

86
# this package is used for snapcraft and we should not clear apt list - to avoid apt-get update during snap build
97
RUN curl -L https://nodejs.org/dist/v$NODE_VERSION/node-v$NODE_VERSION-linux-x64.tar.gz | tar xz -C /usr/local --strip-components=1 && \
@@ -22,9 +20,5 @@ RUN dpkg --add-architecture i386 && \
2220

2321
RUN curl -L https://github.com/electron-userland/electron-builder-binaries/releases/download/wine-2.0.3-mac-10.13/wine-home.zip > /tmp/wine-home.zip && unzip /tmp/wine-home.zip -d /root/.wine && unlink /tmp/wine-home.zip
2422

25-
RUN addgroup --gid $GROUP_ID user
26-
RUN adduser --disabled-password --gecos '' --uid $USER_ID --gid $GROUP_ID user
27-
USER user
28-
2923
ENV WINEDEBUG -all,err+all
3024
ENV WINEDLLOVERRIDES winemenubuilder.exe=d

guardoni/electron-builder.yml

+1
Original file line numberDiff line numberDiff line change
@@ -23,6 +23,7 @@ icon: ./static/yttrex-128.png
2323

2424
linux:
2525
target: ["deb"]
26+
category: Network
2627

2728
win:
2829
target: ["portable"]

guardoni/package.json

+1-1
Original file line numberDiff line numberDiff line change
@@ -15,7 +15,7 @@
1515
"pack": "electron-builder build --dir",
1616
"dist:linux": "electron-builder build -l",
1717
"dist:windows": "electron-builder build -w",
18-
"dist:all": "scripts/electron-builder.sh",
18+
"dist:all": "scripts/dist-all.sh",
1919
"postinstall": "electron-builder install-app-deps",
2020
"prepack": "yarn build"
2121
},

guardoni/scripts/dist-all.sh

+15
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,15 @@
1+
#!/usr/bin/env bash
2+
3+
set -e -x
4+
5+
yarn dist:linux
6+
# CONTAINER_NAME=electron-builder-node-16
7+
8+
# docker exec --privileged $CONTAINER_NAME bash -c "yarn"
9+
# docker exec --privileged $CONTAINER_NAME bash -c "chown -R ${USER}:${GROUP} /project"
10+
# docker exec --privileged $CONTAINER_NAME bash -c "chown -R ${USER}:${GROUP} /root/.cache/"
11+
# docker exec $CONTAINER_NAME bash -c "yarn guardoni dist:linux"
12+
# docker exec $CONTAINER_NAME bash -c "yarn guardoni dist:windows"
13+
14+
# docker stop $CONTAINER_NAME
15+
# docker rm $CONTAINER_NAME

guardoni/scripts/electron-builder.sh

-12
This file was deleted.

scripts/docker-run.sh

+1-1
Original file line numberDiff line numberDiff line change
@@ -11,7 +11,7 @@ docker run -d --name $CONTAINER_NAME -i \
1111
--env ELECTRON_CACHE="/root/.cache/electron" \
1212
--env ELECTRON_BUILDER_CACHE="/root/.cache/electron-builder" \
1313
-v ${CWD}:/project \
14-
-v ${PROJECT_NAME}-node-modules:/project/node_modules:ro \
14+
-v ${PROJECT_NAME}-node-modules:/project/node_modules \
1515
-v ~/.cache/electron:/root/.cache/electron \
1616
-v ~/.cache/electron-builder:/root/.cache/electron-builder \
1717
electronuserland/builder:16-wine

scripts/release-it-after-bump.sh

+2-5
Original file line numberDiff line numberDiff line change
@@ -5,16 +5,13 @@ set -e -x
55
export DEBUG=@trex:*
66
export NODE_ENV=production
77

8-
# build needed docker images
9-
yarn docker-build
10-
yarn docker-run
11-
128
yarn shared build
139
yarn taboule build
1410
yarn extension dist
1511
yarn extension dist:guardoni
1612
yarn guardoni build
1713
yarn guardoni pkg
18-
# yarn guardoni dist:all
14+
yarn guardoni dist:all
15+
1916
# yarn tk:ext build
2017
yarn ycai build:ext

0 commit comments

Comments
 (0)