Auto-install .NET SDK in CI scripts when runner lacks it
Gitea runner build failed with "dotnet: command not found". Added ensure_dotnet() to lib.sh, using the vendored dotnet-install.sh to bootstrap the SDK into .dotnet/ when not already on PATH, called from build.sh/test.sh/prepush.sh. Also trigger CI on build-runner-fix to verify the fix.
This commit is contained in:
2
.github/workflows/ci.yml
vendored
2
.github/workflows/ci.yml
vendored
@@ -6,7 +6,7 @@ name: CI
|
|||||||
|
|
||||||
on:
|
on:
|
||||||
push:
|
push:
|
||||||
branches: [main]
|
branches: [main, build-runner-fix]
|
||||||
|
|
||||||
jobs:
|
jobs:
|
||||||
build-and-push:
|
build-and-push:
|
||||||
|
|||||||
3
.gitignore
vendored
3
.gitignore
vendored
@@ -468,3 +468,6 @@ lerna-debug.log*
|
|||||||
# Windows thumbnail cache
|
# Windows thumbnail cache
|
||||||
Thumbs.db
|
Thumbs.db
|
||||||
ehthumbs.db
|
ehthumbs.db
|
||||||
|
|
||||||
|
# Self-installed .NET SDK (scripts/ci/lib.sh ensure_dotnet, used when a CI runner lacks the SDK)
|
||||||
|
/.dotnet/
|
||||||
|
|||||||
@@ -6,6 +6,8 @@ set -euo pipefail
|
|||||||
cd "$(dirname "${BASH_SOURCE[0]}")" && source ./lib.sh
|
cd "$(dirname "${BASH_SOURCE[0]}")" && source ./lib.sh
|
||||||
cd "$CI_ROOT"
|
cd "$CI_ROOT"
|
||||||
|
|
||||||
|
ensure_dotnet
|
||||||
|
|
||||||
log "Restoring and publishing MicCheck.Api (Release)"
|
log "Restoring and publishing MicCheck.Api (Release)"
|
||||||
dotnet publish src/api/MicCheck.Api/MicCheck.Api.csproj -c Release
|
dotnet publish src/api/MicCheck.Api/MicCheck.Api.csproj -c Release
|
||||||
|
|
||||||
|
|||||||
@@ -37,6 +37,23 @@ image_names() {
|
|||||||
ADMIN_IMAGE="$REGISTRY/$REGISTRY_OWNER/miccheck-admin"
|
ADMIN_IMAGE="$REGISTRY/$REGISTRY_OWNER/miccheck-admin"
|
||||||
}
|
}
|
||||||
|
|
||||||
|
# Installs .NET into $CI_ROOT/.dotnet via the vendored dotnet-install.sh if
|
||||||
|
# `dotnet` isn't already on PATH, then prepends it to PATH for this process.
|
||||||
|
# Keeps bare runners (no SDK preinstalled) working the same as a dev machine.
|
||||||
|
ensure_dotnet() {
|
||||||
|
if command -v dotnet > /dev/null 2>&1; then
|
||||||
|
return 0
|
||||||
|
fi
|
||||||
|
|
||||||
|
local install_dir="$CI_ROOT/.dotnet"
|
||||||
|
if [[ ! -x "$install_dir/dotnet" ]]; then
|
||||||
|
log "dotnet not found on PATH; installing .NET SDK via dotnet-install.sh"
|
||||||
|
bash "$CI_ROOT/dotnet-install.sh" --channel LTS --install-dir "$install_dir"
|
||||||
|
fi
|
||||||
|
export PATH="$install_dir:$PATH"
|
||||||
|
export DOTNET_ROOT="$install_dir"
|
||||||
|
}
|
||||||
|
|
||||||
registry_login() {
|
registry_login() {
|
||||||
require_registry_vars
|
require_registry_vars
|
||||||
[[ -n "$REGISTRY_USER" ]] || fail "REGISTRY_USER env var is required to push images"
|
[[ -n "$REGISTRY_USER" ]] || fail "REGISTRY_USER env var is required to push images"
|
||||||
|
|||||||
@@ -5,6 +5,8 @@ set -euo pipefail
|
|||||||
cd "$(dirname "${BASH_SOURCE[0]}")" && source ./lib.sh
|
cd "$(dirname "${BASH_SOURCE[0]}")" && source ./lib.sh
|
||||||
cd "$CI_ROOT"
|
cd "$CI_ROOT"
|
||||||
|
|
||||||
|
ensure_dotnet
|
||||||
|
|
||||||
log "Building full solution (Debug)"
|
log "Building full solution (Debug)"
|
||||||
dotnet build MicCheck.slnx -c Debug
|
dotnet build MicCheck.slnx -c Debug
|
||||||
|
|
||||||
|
|||||||
@@ -6,6 +6,8 @@ set -euo pipefail
|
|||||||
cd "$(dirname "${BASH_SOURCE[0]}")" && source ./lib.sh
|
cd "$(dirname "${BASH_SOURCE[0]}")" && source ./lib.sh
|
||||||
cd "$CI_ROOT"
|
cd "$CI_ROOT"
|
||||||
|
|
||||||
|
ensure_dotnet
|
||||||
|
|
||||||
log "Running MicCheck.Api.Tests.Unit"
|
log "Running MicCheck.Api.Tests.Unit"
|
||||||
dotnet test tests/api/MicCheck.Api.Tests.Unit/MicCheck.Api.Tests.Unit.csproj -c Release --logger trx
|
dotnet test tests/api/MicCheck.Api.Tests.Unit/MicCheck.Api.Tests.Unit.csproj -c Release --logger trx
|
||||||
|
|
||||||
|
|||||||
Reference in New Issue
Block a user