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

(OpenSSL.Light) Migrated to AU #701

Merged
merged 5 commits into from
Apr 27, 2017
Merged

(OpenSSL.Light) Migrated to AU #701

merged 5 commits into from
Apr 27, 2017

Conversation

AdmiringWorm
Copy link
Member

No description provided.

@majkinetor
Copy link
Contributor

What is the point of lastversion ?

BTW, it occurred to me that we can use similar mechanism to support multiple streams of tools (majkinetor/au#74). I.E forcing the update if specific stream is updated. The side effect would be that last version in nuspec would change but that would not damage the procedure.

@AdmiringWorm
Copy link
Member Author

the point of lastversion is to store the actual version from the previous update.
Since the version uses a letter to differentiate between bug fix releases we can't rely the version we use when pushing to chocolatey.

@majkinetor
Copy link
Contributor

Yes you can. You convert letter to number and then you don't need all that mumbo jumbo:

[byte][char]<letter> - 97

@AdmiringWorm
Copy link
Member Author

@majkinetor I initially went that route, before I noticed the version history of OpenSSL.Light.
We can't just convert the character to a number like that, well not until version 1.1.1 or later hits, otherwise it wouldn't be seen as the latest version.

Of course, we could pad the revision number. But that would mean we had to pad it by 9 characters which I find a little too large.

@AdmiringWorm
Copy link
Member Author

@gep13 @pascalberger @ferventcoder
Any thoughts on my previous comment?

Copy link
Member

@pascalberger pascalberger left a comment

Choose a reason for hiding this comment

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

@AdmiringWorm How is it guaranteed that license.txt is persisted between build runs?

Also added some other small comments

if (Test-Path "$PSScriptRoot\LastVersion.txt") {
$lastVersion = Get-Content "$PSScriptRoot\LastVersion.txt"
if ($lastVersion -ne $version32) { $global:au_Force = $true }
}
Copy link
Member

Choose a reason for hiding this comment

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

No indentation. Code is quite hard to read this way

<projectUrl>https://slproweb.com/products/Win32OpenSSL.html</projectUrl>
<iconUrl>https://cdn.rawgit.com/chocolatey/chocolatey-coreteampackages/ff58a020fa163df8a14004b9802a3cb455a76eac/icons/openssl.png</iconUrl>
<copyright>Ⓒ 2000-2003 Shining Light Productions</copyright>
<licenseUrl>https://www.openssl.org/source/license.html</licenseUrl>
Copy link
Member

Choose a reason for hiding this comment

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

Is this the correct license for the Win32 distro?

Copy link
Member Author

Choose a reason for hiding this comment

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

Honestly, I don't now. I just reused the license already specified.

<copyright>Ⓒ 2000-2003 Shining Light Productions</copyright>
<licenseUrl>https://www.openssl.org/source/license.html</licenseUrl>
<requireLicenseAcceptance>false</requireLicenseAcceptance>
<tags>openssl-light openssl ssl tls pfx pem key rsa admin</tags>
Copy link
Member

Choose a reason for hiding this comment

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

Add obligatory tags as per § 1.2.2

@AdmiringWorm
Copy link
Member Author

@pascalberger said...
How is it guaranteed that license.txt is persisted between build runs?

license.txt? Or are you talking about the lastversion.txt file perhaps?
It's persisted when the package gets updated (unless an error occurs during choco push, in which case we need to check it in manually).

@pascalberger
Copy link
Member

@AdmiringWorm Yeah, sorry. I meant lastversion.txt of course. So it gets persisted in the AppVeyor cache?

@AdmiringWorm
Copy link
Member Author

@pascalberger no when the package gets update, AU calls git on the changed files in the package directory and pushes the changes when all updates is complete.

However, I'm changing this to pad the revision with '8' characters instead of using the date hack.

@AdmiringWorm
Copy link
Member Author

@majkinetor I updated the update.ps1 script to rather pad the revision number, instead of the date hack used.

@AdmiringWorm
Copy link
Member Author

@pascalberger any chance of an updated review?

@pascalberger
Copy link
Member

@AdmiringWorm LGTM

@AdmiringWorm AdmiringWorm merged commit 0e3533d into master Apr 27, 2017
@AdmiringWorm AdmiringWorm deleted the OpenSSL.Light branch April 27, 2017 19:01
Sign up for free to join this conversation on GitHub. Already have an account? Sign in to comment
Labels
Projects
None yet
Development

Successfully merging this pull request may close these issues.

3 participants