Skip to content

Commit

Permalink
feat: build with docker
Browse files Browse the repository at this point in the history
  • Loading branch information
msojocs committed Aug 10, 2024
1 parent 3d941db commit 897445f
Show file tree
Hide file tree
Showing 6 changed files with 11 additions and 51 deletions.
6 changes: 2 additions & 4 deletions .github/workflows/release.yml
Original file line number Diff line number Diff line change
Expand Up @@ -9,7 +9,7 @@ on:
push:
tags:
- v*
branches: [ master, dev, 45-snap-version]
branches: [ master, dev, ci]
pull_request:
branches: [ master ]
# # Allows you to run this workflow manually from the Actions tab
Expand Down Expand Up @@ -53,11 +53,9 @@ jobs:
- name: Build
run: |
export ACTION_MODE=true
export DOCKER_UID=$UID
export DOCKER_GID=$GID
ls -l
export WINE=false
docker compose up
tools/build-with-docker.sh
- name: Compress Resources
run: |
Expand Down
19 changes: 0 additions & 19 deletions docker-compose.yml

This file was deleted.

26 changes: 0 additions & 26 deletions docker/docker-entrypoint

This file was deleted.

4 changes: 3 additions & 1 deletion docker/entrypoint
Original file line number Diff line number Diff line change
Expand Up @@ -23,7 +23,9 @@ echo "start $UID"
python --version
echo "docker node version: $( node --version )"

cd /workspace
cd /
cp -r workspace ~/work
cd ~/work
#
# exec ./tools/rebuild-node-modules 0.53.1
./tools/setup-wechat-devtools-bash
Expand Down
6 changes: 6 additions & 0 deletions tools/build-with-docker.sh
Original file line number Diff line number Diff line change
@@ -0,0 +1,6 @@
#!/bin/bash

root_dir=$(cd `dirname $0`/.. && pwd -P)
echo "$(id -u):$(id -g)"
docker run -u "$(id -u):$(id -g)" --rm -i -e "ACTION_MODE=${ACTION_MODE:-false}" -w /workspace -v "$root_dir:/workspace" jiyecafe/wechat-devtools-build:v3 \
bash ./docker/entrypoint
1 change: 0 additions & 1 deletion tools/setup-wechat-devtools-bash
Original file line number Diff line number Diff line change
Expand Up @@ -72,7 +72,6 @@ if [ $CURRENT_STEP == $INSTALL_NODE_SUCCESS ];then
npm config set phantomjs_cdnurl http://npmmirror.com/mirrors/phantomjs # phantomjs 二进制包镜像
npm config set selenium_cdnurl http://npmmirror.com/mirrors/selenium # selenium 二进制包镜像
npm config set node_inspector_cdnurl http://npmmirror.com/mirrors/node-inspector # node-inspector 二进制包镜像
# npm cache clean --force # 清空缓存
fi
step_switch $INSTALL_NPM_CONFIG_SUCCESS
fi
Expand Down

0 comments on commit 897445f

Please sign in to comment.