Skip to content
New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

fix: build by commit #146

Merged
merged 3 commits into from
Jul 1, 2024
Merged

fix: build by commit #146

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
3 commits
Select commit Hold shift + click to select a range
a795468
refactor: remove unused variables
nugaon Jul 1, 2024
6fcaac3
ci: build images conditions
nugaon Jul 1, 2024
c90ae6a
ci: condition check fix
nugaon Jul 1, 2024
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
10 changes: 5 additions & 5 deletions .github/workflows/publish-docker.yaml
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -81,13 +81,13 @@ jobs:
run: |
cd ./orchestrator
BUILD_PARAMS=""
if [ $BUILD_IMAGE == 'true' ] ; then
if [ "$BUILD_IMAGE" = 'true' ]; then
BUILD_PARAMS+=" --build-base-bee --base-bee-commit-hash=$BEE_VERSION"
fi
if [ $STATE_COMMIT == 'true' ] ; then
if [ "$STATE_COMMIT" = 'true' ]; then
BUILD_PARAMS+=" --gen-traffic"
fi
if [ $BUILD_PARAMS != "" ] ; then
if [ -n "$BUILD_PARAMS" ]; then
BUILD_PARAMS="-- $BUILD_PARAMS"
fi
npm run build:env $BUILD_PARAMS
Expand All @@ -97,10 +97,10 @@ jobs:
run: |
cd ./orchestrator
PUBLISH_PARAMS=""
if [ $LATEST == 'true' ] ; then
if [ "$LATEST" = 'true' ]; then
PUBLISH_PARAMS+=" --latest"
fi
if [ $PUBLISH_PARAMS != "" ] ; then
if [ -n "$PUBLISH_PARAMS" ]; then
PUBLISH_PARAMS="-- $PUBLISH_PARAMS"
fi
npm run publish:env $PUBLISH_PARAMS
4 changes: 0 additions & 4 deletions orchestrator/builder/build-environment.sh
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -43,12 +43,8 @@ MY_PATH=$(dirname "$0")
MY_PATH=$( cd "$MY_PATH" && pwd )
COMMIT_HASH=HEAD
BUILD_BASE_BEE=false
CHEQUES_COUNT=1
# Bee version here means the base bee version on which the images will be built
BEE_VERSION=$("$MY_PATH/utils/env-variable-value.sh" BEE_VERSION)
BLOCKCHAIN_VERSION=$("$MY_PATH/utils/env-variable-value.sh" BLOCKCHAIN_VERSION)

SUPPORTED_WORKER_N=4

# handle passed options
while [ $# -gt 0 ]
Expand Down
Loading