-
Notifications
You must be signed in to change notification settings - Fork 205
New issue
Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.
By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.
Already on GitHub? Sign in to your account
Fix Windows CI #5648
Fix Windows CI #5648
Conversation
e6f803d
to
eebd0ba
Compare
@@ -43,14 +43,15 @@ function da_auto_prevent_update { | |||
} | |||
|
|||
function da_clear_buckets { | |||
Remove-Item $scoopInstallDir\apps\scoop\current\bucket\* -r -force | |||
Remove-Item $scoopInstallDir\buckets\dadew -r -force -ErrorAction Ignore |
There was a problem hiding this comment.
Choose a reason for hiding this comment
The reason will be displayed to describe this comment to others. Learn more.
For some reason the directory does not always seem to exist here so I first kill it completely ignoring failures and then recreate it.
} | ||
|
||
function da_sync_buckets([String] $Directory) { | ||
da_clear_buckets | ||
$files = Get-ChildItem $Directory | Where-Object {$_.Name -like '*.json'} | ||
ForEach ($file in $files) { | ||
Get-Content "$Directory\$file" | Set-Content "$scoopInstallDir\apps\scoop\current\bucket\$file" | ||
Get-Content "$Directory\$file" | Set-Content "$scoopInstallDir\buckets\dadew\$file" |
There was a problem hiding this comment.
Choose a reason for hiding this comment
The reason will be displayed to describe this comment to others. Learn more.
I couldn’t actually find any docs for where you need to put the manifest files but the previous location no longer seems to work whereas this one does 🤷
@@ -1,8 +1,8 @@ | |||
$scoopUrl = 'https://github.com/lukesampson/scoop/archive/b819876ec373cfadc1fc490b56340dec73dc6eb5.zip' | |||
$scoopUrl = 'https://github.com/lukesampson/scoop/archive/a9fa775d59b14e7dce335313faa0eff855469764.zip' |
There was a problem hiding this comment.
Choose a reason for hiding this comment
The reason will be displayed to describe this comment to others. Learn more.
This is just the latest commit. scoop doesn’t like releases.
@@ -0,0 +1,104 @@ | |||
{ |
There was a problem hiding this comment.
Choose a reason for hiding this comment
The reason will be displayed to describe this comment to others. Learn more.
taken from upstream
eebd0ba
to
4b5143d
Compare
The python install step started failing because there is a new pip release so we get a warning. I tried to just upgrade python but the new python manifest depends on functions that need an upgrade of scoop so I upgraded that as well. Not quite sure which of those upgrades fixes the issue … changelog_begin changelog_end
4b5143d
to
571a202
Compare
@@ -1,7 +1,10 @@ | |||
Set-StrictMode -Version latest | |||
$ErrorActionPreference = 'Stop' | |||
|
|||
# See https://github.com/lukesampson/scoop/issues/3859 |
There was a problem hiding this comment.
Choose a reason for hiding this comment
The reason will be displayed to describe this comment to others. Learn more.
🤷
# $isScoopEnabled = da_is_scoop_installed | ||
# Temporary because we upgraded scoop so we need to force a reinstall. After all | ||
# machines have been refreshed we can remove this. | ||
$isScoopEnabled = $false |
There was a problem hiding this comment.
Choose a reason for hiding this comment
The reason will be displayed to describe this comment to others. Learn more.
This is stupid but we can kill it tomorrow and given that everyone is blocked on this, I don’t want to spend the time to figure out a nicer solution.
There was a problem hiding this comment.
Choose a reason for hiding this comment
The reason will be displayed to describe this comment to others. Learn more.
Thanks a lot for fixing this!
changelog_begin
changelog_end
Pull Request Checklist
CHANGELOG_BEGIN
andCHANGELOG_END
tagsNOTE: CI is not automatically run on non-members pull-requests for security
reasons. The reviewer will have to comment with
/AzurePipelines run
totrigger the build.