Skip to content

Commit

Permalink
cleanup several build shell
Browse files Browse the repository at this point in the history
  • Loading branch information
goshiz committed Jul 26, 2023
1 parent 6cf20da commit 96a9119
Show file tree
Hide file tree
Showing 4 changed files with 7 additions and 33 deletions.
2 changes: 1 addition & 1 deletion .docker/Dockerfile
Original file line number Diff line number Diff line change
Expand Up @@ -65,7 +65,7 @@ WORKDIR /tmp
COPY . .


#RUN cd emsdk \
#RUN cd /emsdk \
# && . ./emsdk_env.sh \
# && cd .. \
# && ./bin/build_ci.sh
8 changes: 4 additions & 4 deletions bin/build_ci.sh
Original file line number Diff line number Diff line change
Expand Up @@ -16,18 +16,18 @@

# build haven offshore translations directory
cd ./external/haven-web-cpp/external/haven || exit 1
git checkout develop
git pull

sed -i '33s/auto/cn/' src/crypto/wallet/CMakeLists.txt

mkdir -p build/release
cd build/release
cmake ../..
make -j3
make obj_common -j3
# HOST_NCORES=$(nproc 2>/dev/null || shell nproc 2>/dev/null || sysctl -n hw.ncpu 2>/dev/null || echo 1)
#./build-haven.sh -j3 # don't exit because this will build translations directory even if build fails

cd ../../../../../.. || exit 1


# build boost
./bin/build_boost_emscripten.sh || exit 1

Expand Down
6 changes: 2 additions & 4 deletions bin/build_web_worker.sh
Original file line number Diff line number Diff line change
@@ -1,6 +1,6 @@
#!/bin/sh
#!/bin/bash

#EMCC_DEBUG=1
#EMCC_DEBUG=1

# get current package version
NPM_VERSION=$(node -p -e "require('./package.json').version")
Expand All @@ -12,5 +12,3 @@ else
fi
# build web app dependencies -> adds current package version on its own
npm run build_worker


24 changes: 0 additions & 24 deletions bin/update_submodules.sh
Original file line number Diff line number Diff line change
Expand Up @@ -2,27 +2,3 @@

# initialize submodules recursively
git submodule update --init --recursive

# update haven-web-cpp
cd ./external/haven-web-cpp
#git checkout feature/xassets #tags/v0.3.3
git pull ##--ff-only origin tags/v0.3.3

# update haven-offshore

branchname=$(git --git-dir ../../.git branch --show-current)
tagname=$(git --git-dir ../../.git tag --points-at HEAD)

cd ./external/haven

if [ -z "$branchname" ]
then
git checkout tags/$tagname
else
git checkout $branchname
fi



git pull #--ff-only origin tags/v0.16.0.1
cd ../../../../

0 comments on commit 96a9119

Please sign in to comment.