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

Work around error building deb on Windows #47011

Merged
merged 4 commits into from
Sep 27, 2019
Merged

Work around error building deb on Windows #47011

Changes from 1 commit
Commits
Show all changes
4 commits
Select commit Hold shift + click to select a range
286e097
Work around error building deb on Windows
alpar-t Sep 24, 2019
0f94e27
PR review
alpar-t Sep 25, 2019
ad3d627
Don't set release, ospacakge includes it in the name
alpar-t Sep 26, 2019
b0132db
Rever plugin upgrade
alpar-t Sep 26, 2019
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
6 changes: 5 additions & 1 deletion distribution/packages/build.gradle
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -58,7 +58,7 @@ buildscript {
}
}
dependencies {
classpath 'com.netflix.nebula:gradle-ospackage-plugin:4.7.1'
classpath 'com.netflix.nebula:gradle-ospackage-plugin:7.4.2'
}
}

Expand Down Expand Up @@ -407,6 +407,9 @@ subprojects {
'default' buildDist
}

if (! (dpkgExists() || rpmExists())) {
return;
}
// sanity checks if packages can be extracted
final File extractionDir = new File(buildDir, 'extracted')
File packageExtractionDir
Expand All @@ -423,6 +426,7 @@ subprojects {
extractionDir.mkdirs()
}
}

check.dependsOn checkExtraction
if (project.name.contains('deb')) {
checkExtraction {
Expand Down