Skip to content

Commit 8278714

Browse files
kaspar030aabadie
authored andcommitted
refactor env handling
1 parent caa85e6 commit 8278714

File tree

1 file changed

+7
-7
lines changed

1 file changed

+7
-7
lines changed

build.sh

+7-7
Original file line numberDiff line numberDiff line change
@@ -131,15 +131,16 @@ set_status() {
131131
main() {
132132
set_status "fetching code"
133133

134-
export APPS BOARDS
134+
export APPS BOARDS NIGHTLY STATIC_TESTS RUN_TESTS
135+
136+
export DWQ_ENV="-E APPS -E BOARDS -E NIGHTLY -E STATIC_TESTS -E RUN_TESTS \
137+
-E CI_MURDOCK_PROJECT -E ENABLE_TEST_CACHE -E CI_FAST_FAIL \
138+
-E FULL_BUILD"
135139

136140
local repo_dir="RIOT"
137141
if [ -n "${CI_BUILD_COMMIT}" ]; then
138-
export NIGHTLY STATIC_TESTS
139142
export DWQ_REPO="${CI_GIT_URL_WORKER}/${CI_BUILD_REPO_WORKER}"
140143
export DWQ_COMMIT="${CI_BUILD_COMMIT}"
141-
export DWQ_ENV="-E APPS -E BOARDS -E NIGHTLY -E STATIC_TESTS -E RUN_TESTS \
142-
-E CI_MURDOCK_PROJECT -E ENABLE_TEST_CACHE"
143144

144145
checkout_commit ${repo_dir} ${GITHUB_REPO_URL} ${CI_BUILD_COMMIT}
145146

@@ -189,10 +190,9 @@ main() {
189190

190191
echo "-- Building PR #${CI_PULL_NR} ${CI_PULL_URL} head: ${CI_PULL_COMMIT}..."
191192

192-
export DWQ_ENV="-E CI_BASE_REPO -E CI_BASE_BRANCH -E CI_PULL_REPO -E CI_PULL_COMMIT \
193+
export DWQ_ENV="${DWQ_ENV} -E CI_BASE_REPO -E CI_BASE_BRANCH -E CI_PULL_REPO -E CI_PULL_COMMIT \
193194
-E CI_PULL_NR -E CI_PULL_URL -E CI_PULL_LABELS -E CI_MERGE_COMMIT \
194-
-E CI_BASE_COMMIT -E APPS -E BOARDS -E NIGHTLY -E STATIC_TESTS -E RUN_TESTS \
195-
-E CI_MURDOCK_PROJECT -E ENABLE_TEST_CACHE"
195+
-E CI_BASE_COMMIT"
196196
else # Invalid configuration, aborting
197197
echo "Invalid job configuration, return with error"
198198
exit 2

0 commit comments

Comments
 (0)