Skip to content

Commit d83205f

Browse files
committed
testing actions
1 parent 3a211dc commit d83205f

File tree

2 files changed

+25
-24
lines changed

2 files changed

+25
-24
lines changed

.vscode/settings.json

Lines changed: 4 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -13,5 +13,8 @@
1313
},
1414
"typescript.referencesCodeLens.enabled": true,
1515
"editor.defaultFormatter": "esbenp.prettier-vscode",
16-
"cSpell.words": ["csrf", "definitelytyped", "dockerode", "promisified"]
16+
"cSpell.words": ["csrf", "definitelytyped", "dockerode", "promisified"],
17+
"[shellscript]": {
18+
"editor.defaultFormatter": "foxundermoon.shell-format"
19+
}
1720
}

dev-scripts/build_and_push_edge.sh

Lines changed: 21 additions & 23 deletions
Original file line numberDiff line numberDiff line change
@@ -4,7 +4,7 @@
44
set -e
55

66
# Print all commands
7-
set -x
7+
set -x
88

99
pwd
1010

@@ -16,46 +16,44 @@ else
1616
echo "Running on CI"
1717
fi
1818

19-
2019
CAPROVER_VERSION=0.0.1
2120
IMAGE_NAME=caprover/caprover-edge
2221

2322
if [ ! -f ./package-lock.json ]; then
2423
echo "package-lock.json not found!"
25-
exit 1;
24+
exit 1
2625
fi
2726

28-
2927
# BRANCH=$(git rev-parse --abbrev-ref HEAD)
3028
# On Github the line above does not work, instead:
3129
BRANCH=${GITHUB_REF##*/}
3230
echo "on branch $BRANCH"
3331
if [[ "$BRANCH" != "master" ]]; then
34-
echo 'Not on master branch! Aborting script!';
35-
exit 1;
32+
echo 'Not on master branch! Aborting script!'
33+
exit 1
3634
fi
3735

38-
39-
ORIG_DIR=`pwd`
36+
ORIG_DIR=$(pwd)
4037
FRONTEND_DIR=/home/runner/app-frontend
41-
curl -Iv https://registry.yarnpkg.com/ && \
42-
mkdir -p $FRONTEND_DIR && cd $FRONTEND_DIR && \
43-
git clone https://github.com/githubsaturn/caprover-frontend.git && \
44-
cd caprover-frontend && \
45-
git log --max-count=1 && \
46-
yarn install --no-cache --frozen-lockfile --network-timeout 600000 && echo "Installation finished" && \
47-
yarn run build && echo "Building finished" && \
48-
mv ./build ../../app/dist-frontend && \
49-
cd /
50-
51-
ls $$FRONTEND_DIR/caprover-frontend/build
38+
curl -Iv https://registry.yarnpkg.com/
39+
mkdir -p $FRONTEND_DIR && cd $FRONTEND_DIR
40+
git clone https://github.com/githubsaturn/caprover-frontend.git
41+
cd caprover-frontend
42+
git log --max-count=1
43+
yarn install --no-cache --frozen-lockfile --network-timeout 600000
44+
echo "Installation finished"
45+
yarn run build
46+
echo "Building finished"
47+
48+
cd /
49+
50+
ls $FRONTEND_DIR/caprover-frontend/build
5251

5352
cd $ORIG_DIR
5453

5554
pwd
5655

57-
exit 0;
58-
56+
exit 0
5957

6058
docker run --rm --privileged multiarch/qemu-user-static --reset -p yes
6159
export DOCKER_CLI_EXPERIMENTAL=enabled
@@ -64,8 +62,8 @@ docker buildx create --name mybuilder
6462
docker buildx use mybuilder
6563

6664
# docker buildx build --platform linux/arm -t $IMAGE_NAME:$CAPROVER_VERSION -t $IMAGE_NAME:latest -f dockerfile-captain.edge --push .
67-
docker buildx build --platform linux/amd64,linux/arm64,linux/arm -t $IMAGE_NAME:$CAPROVER_VERSION -t $IMAGE_NAME:latest -f dockerfile-captain.edge --push .
65+
docker buildx build --platform linux/amd64,linux/arm64,linux/arm -t $IMAGE_NAME:$CAPROVER_VERSION -t $IMAGE_NAME:latest -f dockerfile-captain.edge --push .
6866

6967
# docker build -t $IMAGE_NAME:$CAPROVER_VERSION -t $IMAGE_NAME:latest -f dockerfile-captain.edge .
7068
# docker push $IMAGE_NAME:latest
71-
# docker push $IMAGE_NAME:$CAPROVER_VERSION
69+
# docker push $IMAGE_NAME:$CAPROVER_VERSION

0 commit comments

Comments
 (0)