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.

Sign up for GitHub

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

Jump to bottom

Multiple fix template and license #307

Merged
merged 15 commits into from
May 17, 2021
Merged

Multiple fix template and license #307

merged 15 commits into from
May 17, 2021

Conversation

douph1
Copy link
Contributor

@douph1 douph1 commented Apr 15, 2021 •
edited
Loading

Cummulated goal of this PR:

@douph1
fix concurent build and merge template
07eb752
@douph1
Do not require users to explicitly accept the terms of the GPLv2+CE a…
b10dba0 
…doptium#162
@douph1
fix template management
d60db30 
 * Add Workdir/ folder for temp file produce from *.template
 * Rename wix temp file to allow multiple concurent build as before
 * Filter template by JVM to run just the minimum powershell replacement
@karianna @tellison
Update wix/Includes/OpenJDK.Variables.wxi.template
1c76705 
Co-authored-by: Tim Ellison <tellison@users.noreply.github.com>
@karianna karianna added the bug label Apr 16, 2021
@karianna karianna added this to the April 2021 milestone Apr 16, 2021
@karianna
Copy link
Contributor

I assume this can wait until post release?

@tellison
Copy link
Contributor

It is still a Draft anyway, so I take it that Philippe is still working away.

@douph1
Copy link
Contributor Author

douph1 commented Apr 16, 2021 •
edited
Loading

I assume this can wait until post release?

yes, need some more checking/testing

@douph1 douph1 force-pushed the multiple_fix branch 2 times, most recently from f8d8f77 to 4646ecc Compare April 17, 2021 21:17
@douph1 douph1 force-pushed the multiple_fix branch 2 times, most recently from 1cb3de5 to baeb80b Compare April 18, 2021 21:05
@douph1 douph1 force-pushed the multiple_fix branch 2 times, most recently from 35dcb5a to 628d559 Compare April 18, 2021 22:21
@douph1 douph1 marked this pull request as ready for review April 26, 2021 21:08
@douph1 douph1 requested review from aahlenst and gdams April 29, 2021 19:45
@douph1 douph1 merged commit e178aef into adoptium:master May 17, 2021
@karianna karianna modified the milestones: April 2021, May 2021 May 18, 2021
This was referenced Jul 28, 2021
Closed
Closed
@AdamBrousseau AdamBrousseau mentioned this pull request Aug 5, 2021
Open
Sign up for free to join this conversation on GitHub. Already have an account? Sign in to comment
Reviewers

@tellison tellison tellison left review comments

@gdams gdams gdams approved these changes

@aahlenst aahlenst Awaiting requested review from aahlenst

Assignees
No one assigned
Labels
bug
Projects
None yet
Milestone
May 2021
Development

Successfully merging this pull request may close these issues.
4 participants
@douph1 @karianna @tellison @gdams