Fix Docker build: run docker directly instead of TeamCity wrapper
This commit is contained in:
50
.teamcity/settings.kts
vendored
50
.teamcity/settings.kts
vendored
@@ -52,36 +52,38 @@ object Build : BuildType({
|
|||||||
echo "Branch: %teamcity.build.branch%"
|
echo "Branch: %teamcity.build.branch%"
|
||||||
echo ""
|
echo ""
|
||||||
|
|
||||||
# Set Zephyr environment
|
# Run build inside Docker container
|
||||||
export ZEPHYR_BASE=/workdir/zephyr
|
docker run --rm \
|
||||||
export ZEPHYR_TOOLCHAIN_VARIANT=zephyr
|
-v "${'$'}(pwd):/project" \
|
||||||
|
-w /project \
|
||||||
|
ghcr.io/zephyrproject-rtos/ci:v0.26.13 \
|
||||||
|
bash -c '
|
||||||
|
set -e
|
||||||
|
|
||||||
# Show west version
|
echo "West version:"
|
||||||
echo "West version:"
|
west --version
|
||||||
west --version
|
echo ""
|
||||||
echo ""
|
|
||||||
|
|
||||||
# Update west modules if west.yml exists
|
# Update west modules if west.yml exists
|
||||||
if [ -f "west.yml" ]; then
|
if [ -f "west.yml" ]; then
|
||||||
echo "Updating west modules..."
|
echo "Updating west modules..."
|
||||||
west update
|
west update
|
||||||
fi
|
fi
|
||||||
|
|
||||||
# Build for target board
|
# Build for target board
|
||||||
echo "Starting build..."
|
echo "Starting build..."
|
||||||
west build -b nrf52840dk_nrf52840 . --pristine
|
west build -b nrf52840dk_nrf52840 . --pristine
|
||||||
|
|
||||||
echo ""
|
echo ""
|
||||||
echo "=== Build successful ==="
|
echo "=== Build successful ==="
|
||||||
|
|
||||||
# Show build artifacts
|
# Show build artifacts
|
||||||
echo ""
|
echo ""
|
||||||
echo "Build artifacts:"
|
echo "Build artifacts:"
|
||||||
ls -lh build/zephyr/*.bin 2>/dev/null || true
|
ls -lh build/zephyr/*.bin 2>/dev/null || true
|
||||||
ls -lh build/zephyr/*.hex 2>/dev/null || true
|
ls -lh build/zephyr/*.hex 2>/dev/null || true
|
||||||
|
'
|
||||||
""".trimIndent()
|
""".trimIndent()
|
||||||
dockerImage = "ghcr.io/zephyrproject-rtos/ci:v0.26.13"
|
|
||||||
dockerPull = true
|
|
||||||
}
|
}
|
||||||
}
|
}
|
||||||
|
|
||||||
|
|||||||
Reference in New Issue
Block a user