Skip to content

Commit d8708b6

Browse files
author
metworkbot
committed
build: sync common files from github_organization_management repository
1 parent cb81dff commit d8708b6

File tree

2 files changed

+7
-2
lines changed

2 files changed

+7
-2
lines changed

.github/workflows/build.sh

Lines changed: 4 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -34,6 +34,10 @@ mkdir -p "/opt/metwork-mfext-${TARGET_DIR}"
3434
mkdir -p buildlogs
3535
export BUILDLOGS=buildlogs
3636

37+
set +x
38+
export TOKEN=${TOKEN}
39+
set -x
40+
3741
make >${BUILDLOGS}/make.log 2>&1 || ( tail -200 ${BUILDLOGS}/make.log ; exit 1 )
3842

3943
OUTPUT=$(git status --short | grep -v buildlogs | grep -v buildcache)

.github/workflows/ci.yml

Lines changed: 3 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -19,7 +19,7 @@ on:
1919
env:
2020

2121

22-
DOCKER_RUN_OPTIONS: "-v ${{ github.workspace }}:/src -v /buildcache:/buildcache -v /local_sources:/local_sources -e GITHUB_REF -e GITHUB_RUN_NUMBER -e GITHUB_SHA -e GITHUB_REPOSITORY"
22+
DOCKER_RUN_OPTIONS: "-v ${{ github.workspace }}:/src -v /buildcache:/buildcache -e GITHUB_REF -e GITHUB_RUN_NUMBER -e GITHUB_SHA -e GITHUB_REPOSITORY"
2323

2424

2525

@@ -77,8 +77,9 @@ jobs:
7777
TAG=${{ steps.SetVariables.outputs.tag }}
7878
DEP_BRANCH=${{ steps.SetVariables.outputs.dep_branch }}
7979
BUILDIMAGE=${{ steps.SetVariables.outputs.buildimage }}
80+
TOKEN=${{ secrets.METWORK_ACCESS_TOKEN }}
8081
docker pull ${BUILDIMAGE}
81-
docker run ${DOCKER_RUN_OPTIONS} -e TARGET_DIR=${TARGET_DIR} -e BRANCH=${BRANCH} -e DEP_BRANCH=${DEP_BRANCH} -e TAG=${TAG} -e OS_VERSION=${OS_VERSION} --rm ${BUILDIMAGE} /bin/bash -c "${DOCKER_WORKFLOW_SCRIPTS_DIR}/build.sh"
82+
docker run ${DOCKER_RUN_OPTIONS} -e TOKEN=${TOKEN} -e TARGET_DIR=${TARGET_DIR} -e BRANCH=${BRANCH} -e DEP_BRANCH=${DEP_BRANCH} -e TAG=${TAG} -e OS_VERSION=${OS_VERSION} --rm ${BUILDIMAGE} /bin/bash -c "${DOCKER_WORKFLOW_SCRIPTS_DIR}/build.sh"
8283
cat ${{ github.workspace }}/github_output >> ${GITHUB_OUTPUT}
8384
8485
- name: publish buildlogs

0 commit comments

Comments
 (0)