Skip to content

Commit

Permalink
Revert "Work around actions/runner-images#9937"
Browse files Browse the repository at this point in the history
This reverts commit bcfac4118b1177f5bfae530a3eb118fe823b6932.
  • Loading branch information
jmarrec committed Jun 10, 2024
1 parent c5f18b6 commit 6143cfd
Showing 1 changed file with 0 additions and 18 deletions.
18 changes: 0 additions & 18 deletions builders/ubuntu-python-builder.psm1
Original file line number Diff line number Diff line change
Expand Up @@ -64,19 +64,6 @@ class UbuntuPythonBuilder : NixPythonBuilder {
Execute-Command -Command "sudo apt-get update"
Execute-Command -Command $tkinterInstallString

$orig_needrestart_ui = $env:NEEDRESTART_UI
$env:NEEDRESTART_UI = "NeedRestart::UI::Debconf"

$orig_needrestart_mode = $env:NEEDRESTART_MODE
$env:NEEDRESTART_MODE = "l" # l(ist)-only

$orig_needrestart_suspend = $env:NEEDRESTART_SUSPEND
$env:NEEDRESTART_SUSPEND = "y"

$orig_debian_frontend = $env:DEBIAN_FRONTEND
$env:DEBIAN_FRONTEND="noninteractive"

Execute-Command -Command "sudo apt remove needrestart"
### Install dependent packages
@(
"make",
Expand All @@ -93,11 +80,6 @@ class UbuntuPythonBuilder : NixPythonBuilder {
Execute-Command -Command "sudo apt install -y $_"
}

$env:NEEDRESTART_UI = $orig_needrestart_ui
$env:NEEDRESTART_MODE = $orig_needrestart_mode
$env:NEEDRESTART_SUSPEND = $orig_needrestart_suspend
$env:DEBIAN_FRONTEND = $orig_debian_frontend

### On Ubuntu-1804, libgdbm-compat-dev has older modules that are no longer in libgdbm-dev
Execute-Command -Command "sudo apt install -y libgdbm-compat-dev"
}
Expand Down

0 comments on commit 6143cfd

Please sign in to comment.