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 ""
|
||||
|
||||
# Set Zephyr environment
|
||||
export ZEPHYR_BASE=/workdir/zephyr
|
||||
export ZEPHYR_TOOLCHAIN_VARIANT=zephyr
|
||||
# Run build inside Docker container
|
||||
docker run --rm \
|
||||
-v "${'$'}(pwd):/project" \
|
||||
-w /project \
|
||||
ghcr.io/zephyrproject-rtos/ci:v0.26.13 \
|
||||
bash -c '
|
||||
set -e
|
||||
|
||||
# Show west version
|
||||
echo "West version:"
|
||||
west --version
|
||||
echo ""
|
||||
echo "West version:"
|
||||
west --version
|
||||
echo ""
|
||||
|
||||
# Update west modules if west.yml exists
|
||||
if [ -f "west.yml" ]; then
|
||||
echo "Updating west modules..."
|
||||
west update
|
||||
fi
|
||||
# Update west modules if west.yml exists
|
||||
if [ -f "west.yml" ]; then
|
||||
echo "Updating west modules..."
|
||||
west update
|
||||
fi
|
||||
|
||||
# Build for target board
|
||||
echo "Starting build..."
|
||||
west build -b nrf52840dk_nrf52840 . --pristine
|
||||
# Build for target board
|
||||
echo "Starting build..."
|
||||
west build -b nrf52840dk_nrf52840 . --pristine
|
||||
|
||||
echo ""
|
||||
echo "=== Build successful ==="
|
||||
echo ""
|
||||
echo "=== Build successful ==="
|
||||
|
||||
# Show build artifacts
|
||||
echo ""
|
||||
echo "Build artifacts:"
|
||||
ls -lh build/zephyr/*.bin 2>/dev/null || true
|
||||
ls -lh build/zephyr/*.hex 2>/dev/null || true
|
||||
# Show build artifacts
|
||||
echo ""
|
||||
echo "Build artifacts:"
|
||||
ls -lh build/zephyr/*.bin 2>/dev/null || true
|
||||
ls -lh build/zephyr/*.hex 2>/dev/null || true
|
||||
'
|
||||
""".trimIndent()
|
||||
dockerImage = "ghcr.io/zephyrproject-rtos/ci:v0.26.13"
|
||||
dockerPull = true
|
||||
}
|
||||
}
|
||||
|
||||
|
||||
Reference in New Issue
Block a user