mirror of
https://github.com/actions/runner-images.git
synced 2025-12-11 11:37:00 +00:00
[Ubuntu] fix dotnet installation & scripts sorcing on 24.04 (#9950)
This commit is contained in:
@@ -4,6 +4,8 @@
|
|||||||
## Desc: Configure apt, install jq and apt-fast packages.
|
## Desc: Configure apt, install jq and apt-fast packages.
|
||||||
################################################################################
|
################################################################################
|
||||||
|
|
||||||
|
source $HELPER_SCRIPTS/os.sh
|
||||||
|
|
||||||
# Stop and disable apt-daily upgrade services;
|
# Stop and disable apt-daily upgrade services;
|
||||||
systemctl stop apt-daily.timer
|
systemctl stop apt-daily.timer
|
||||||
systemctl disable apt-daily.timer
|
systemctl disable apt-daily.timer
|
||||||
|
|||||||
@@ -183,13 +183,18 @@ build {
|
|||||||
inline = ["mkdir ${var.image_folder}", "chmod 777 ${var.image_folder}"]
|
inline = ["mkdir ${var.image_folder}", "chmod 777 ${var.image_folder}"]
|
||||||
}
|
}
|
||||||
|
|
||||||
|
provisioner "file" {
|
||||||
|
destination = "${var.helper_script_folder}"
|
||||||
|
source = "${path.root}/../scripts/helpers"
|
||||||
|
}
|
||||||
|
|
||||||
provisioner "shell" {
|
provisioner "shell" {
|
||||||
execute_command = "sudo sh -c '{{ .Vars }} {{ .Path }}'"
|
execute_command = "sudo sh -c '{{ .Vars }} {{ .Path }}'"
|
||||||
script = "${path.root}/../scripts/build/configure-apt-mock.sh"
|
script = "${path.root}/../scripts/build/configure-apt-mock.sh"
|
||||||
}
|
}
|
||||||
|
|
||||||
provisioner "shell" {
|
provisioner "shell" {
|
||||||
environment_vars = ["DEBIAN_FRONTEND=noninteractive"]
|
environment_vars = ["HELPER_SCRIPTS=${var.helper_script_folder}","DEBIAN_FRONTEND=noninteractive"]
|
||||||
execute_command = "sudo sh -c '{{ .Vars }} {{ .Path }}'"
|
execute_command = "sudo sh -c '{{ .Vars }} {{ .Path }}'"
|
||||||
scripts = [
|
scripts = [
|
||||||
"${path.root}/../scripts/build/install-ms-repos.sh",
|
"${path.root}/../scripts/build/install-ms-repos.sh",
|
||||||
@@ -203,11 +208,6 @@ build {
|
|||||||
script = "${path.root}/../scripts/build/configure-limits.sh"
|
script = "${path.root}/../scripts/build/configure-limits.sh"
|
||||||
}
|
}
|
||||||
|
|
||||||
provisioner "file" {
|
|
||||||
destination = "${var.helper_script_folder}"
|
|
||||||
source = "${path.root}/../scripts/helpers"
|
|
||||||
}
|
|
||||||
|
|
||||||
provisioner "file" {
|
provisioner "file" {
|
||||||
destination = "${var.installer_script_folder}"
|
destination = "${var.installer_script_folder}"
|
||||||
source = "${path.root}/../scripts/build"
|
source = "${path.root}/../scripts/build"
|
||||||
|
|||||||
@@ -219,13 +219,9 @@
|
|||||||
],
|
],
|
||||||
"dotnet": {
|
"dotnet": {
|
||||||
"aptPackages": [
|
"aptPackages": [
|
||||||
"dotnet-sdk-6.0",
|
|
||||||
"dotnet-sdk-7.0",
|
|
||||||
"dotnet-sdk-8.0"
|
"dotnet-sdk-8.0"
|
||||||
],
|
],
|
||||||
"versions": [
|
"versions": [
|
||||||
"6.0",
|
|
||||||
"7.0",
|
|
||||||
"8.0"
|
"8.0"
|
||||||
],
|
],
|
||||||
"tools": [
|
"tools": [
|
||||||
|
|||||||
Reference in New Issue
Block a user