Skip to content
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

Merged
merged 1 commit into from
Apr 21, 2020
Merged

Fix Windows CI #5648

merged 1 commit into from
Apr 21, 2020

Conversation

cocreature
Copy link
Contributor

changelog_begin
changelog_end

Pull Request Checklist

  • Read and understand the contribution guidelines
  • Include appropriate tests
  • Set a descriptive title and thorough description
  • Add a reference to the issue this PR will solve, if appropriate
  • Include changelog additions in one or more commit message bodies between the CHANGELOG_BEGIN and CHANGELOG_END tags
  • Normal production system change, include purpose of change in description

NOTE: CI is not automatically run on non-members pull-requests for security
reasons. The reviewer will have to comment with /AzurePipelines run to
trigger the build.

@cocreature cocreature force-pushed the windows-garbage branch 7 times, most recently from e6f803d to eebd0ba Compare April 21, 2020 12:25
@cocreature cocreature changed the title try to resurrect windows Fix Windows CI Apr 21, 2020
@@ -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
Copy link
Contributor Author

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"
Copy link
Contributor Author

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'
Copy link
Contributor Author

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 @@
{
Copy link
Contributor Author

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

taken from upstream

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
@@ -1,7 +1,10 @@
Set-StrictMode -Version latest
$ErrorActionPreference = 'Stop'

# See https://github.com/lukesampson/scoop/issues/3859
Copy link
Contributor Author

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
Copy link
Contributor Author

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.

@cocreature cocreature requested a review from aherrmann-da April 21, 2020 12:36
@cocreature cocreature marked this pull request as ready for review April 21, 2020 12:36
Copy link
Contributor

@aherrmann-da aherrmann-da left a 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!

@mergify mergify bot merged commit 5908336 into master Apr 21, 2020
@mergify mergify bot deleted the windows-garbage branch April 21, 2020 13:31
garyverhaegen-da added a commit that referenced this pull request Apr 22, 2020
Backports #5648 and #5661.

CHANGELOG_BEGIN
CHANGELOG_END
garyverhaegen-da added a commit that referenced this pull request Apr 22, 2020
Backports #5648 and #5661.

CHANGELOG_BEGIN
CHANGELOG_END
Sign up for free to join this conversation on GitHub. Already have an account? Sign in to comment
Labels
None yet
Projects
None yet
Development

Successfully merging this pull request may close these issues.

2 participants