Bläddra i källkod

trim versions and hashes

tags/v1.1.4
Jonathan Cobb 4 år sedan
förälder
incheckning
36f7c7fcde
2 ändrade filer med 2 tillägg och 2 borttagningar
  1. +1
    -1
      bubble-server/src/main/java/bubble/service/packer/PackerJob.java
  2. +1
    -1
      bubble-server/src/main/java/bubble/service/packer/PackerService.java

+ 1
- 1
bubble-server/src/main/java/bubble/service/packer/PackerJob.java Visa fil

@@ -313,7 +313,7 @@ public class PackerJob implements Callable<List<PackerImage>> {
final String version = packerService.getSoftwareVersion(roleName);
vars.put(roleName, version);

final String hash = url2string(releaseUrlBase+"/"+version+"/"+roleName+".zip.sha256");
final String hash = url2string(releaseUrlBase+"/"+version+"/"+roleName+".zip.sha256").trim();
String varsData = roleName+"_sha256 : '"+hash+"'\n"
+ roleName+"_version : '" + version + "'\n";



+ 1
- 1
bubble-server/src/main/java/bubble/service/packer/PackerService.java Visa fil

@@ -122,7 +122,7 @@ public class PackerService {
final String releaseUrlBase = configuration.getReleaseUrlBase();
return softwareVersions.computeIfAbsent(roleName, r -> {
try {
return url2string(releaseUrlBase+"/"+r+"/latest.txt");
return url2string(releaseUrlBase+"/"+r+"/latest.txt").trim();
} catch (IOException e) {
return die("getSoftwareVersion("+r+"): "+shortError(e), e);
}


Laddar…
Avbryt
Spara