Skip to content

Handle renaming the README (backport of #50404) #50407

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

Merged
merged 1 commit into from
Dec 19, 2019
Merged

Handle renaming the README (backport of #50404) #50407

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
1 commit
Select commit
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
2 changes: 1 addition & 1 deletion distribution/archives/build.gradle
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -84,7 +84,7 @@ CopySpec archiveFiles(CopySpec modulesFiles, String distributionType, String pla
}
}
from(rootProject.projectDir) {
include 'README.textile'
include 'README.asciidoc'
}
from(rootProject.file('licenses')) {
include oss ? 'APACHE-LICENSE-2.0.txt' : 'ELASTIC-LICENSE.txt'
Expand Down
2 changes: 1 addition & 1 deletion qa/os/bats/utils/packages.bash
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -136,7 +136,7 @@ verify_package_installation() {
assert_file "$ESPLUGINS" d root root 755
assert_file "$ESMODULES" d root root 755
assert_file "$ESHOME/NOTICE.txt" f root root 644
assert_file "$ESHOME/README.textile" f root root 644
assert_file "$ESHOME/README.asciidoc" f root root 644

if is_dpkg; then
# Env file
Expand Down
2 changes: 1 addition & 1 deletion qa/os/bats/utils/tar.bash
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -105,6 +105,6 @@ verify_archive_installation() {
assert_file "$ESHOME/logs" d elasticsearch elasticsearch 755
assert_file "$ESHOME/NOTICE.txt" f elasticsearch elasticsearch 644
assert_file "$ESHOME/LICENSE.txt" f elasticsearch elasticsearch 644
assert_file "$ESHOME/README.textile" f elasticsearch elasticsearch 644
assert_file "$ESHOME/README.asciidoc" f elasticsearch elasticsearch 644
assert_file_not_exist "$ESCONFIG/elasticsearch.keystore"
}
2 changes: 1 addition & 1 deletion qa/os/src/test/java/org/elasticsearch/packaging/util/Archives.java
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -202,7 +202,7 @@ private static void verifyOssInstallation(Installation es, Distribution distribu
Stream.of(
"NOTICE.txt",
"LICENSE.txt",
"README.textile"
"README.asciidoc"
).forEach(doc -> assertThat(es.home.resolve(doc), file(File, owner, owner, p644)));
}

Expand Down
2 changes: 1 addition & 1 deletion qa/os/src/test/java/org/elasticsearch/packaging/util/Packages.java
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -207,7 +207,7 @@ private static void verifyOssInstallation(Installation es, Distribution distribu

Stream.of(
"NOTICE.txt",
"README.textile"
"README.asciidoc"
).forEach(doc -> assertThat(es.home.resolve(doc), file(File, "root", "root", p644)));

assertThat(es.envFile, file(File, "root", "elasticsearch", p660));
Expand Down