Skip to content

Enable pre-releases for beta and daily channel - #14994

Merged
MorrisJobke merged 1 commit into
masterfrom
feature/noid/pre-releases-for-beta-and-daily
Apr 10, 2019
Merged

Enable pre-releases for beta and daily channel#14994
MorrisJobke merged 1 commit into
masterfrom
feature/noid/pre-releases-for-beta-and-daily

Conversation

@nickvergessen

@nickvergessennickvergessen commented Apr 8, 2019

Copy link
Copy Markdown
Member

For easier testing apply:

diff --git a/lib/private/App/AppStore/Fetcher/Fetcher.php b/lib/private/App/AppStore/Fetcher/Fetcher.php
index db8c38ac68..e665ae8e47 100644
--- a/lib/private/App/AppStore/Fetcher/Fetcher.php+++ b/lib/private/App/AppStore/Fetcher/Fetcher.php@@ -98,11 +98,11 @@ abstract class Fetcher {
'timeout' => 10,
];
- if ($ETag !== '') {- $options['headers'] = [- 'If-None-Match' => $ETag,- ];- }+// if ($ETag !== '') {+// $options['headers'] = [+// 'If-None-Match' => $ETag,+// ];+// }
$client = $this->clientService->newClient();
$response = $client->get($this->endpointUrl, $options);
@@ -151,15 +151,15 @@ abstract class Fetcher {
// No caching when the version has been updated
if (isset($jsonBlob['ncversion']) && $jsonBlob['ncversion'] === $this->getVersion()) {
- // If the timestamp is older than 300 seconds request the files new- if ((int)$jsonBlob['timestamp'] > ($this->timeFactory->getTime() - self::INVALIDATE_AFTER_SECONDS)) {- return $jsonBlob['data'];- }-- if (isset($jsonBlob['ETag'])) {- $ETag = $jsonBlob['ETag'];- $content = json_encode($jsonBlob['data']);- }+// // If the timestamp is older than 300 seconds request the files new+// if ((int)$jsonBlob['timestamp'] > ($this->timeFactory->getTime() - self::INVALIDATE_AFTER_SECONDS)) {+// return $jsonBlob['data'];+// }+//+// if (isset($jsonBlob['ETag'])) {+// $ETag = $jsonBlob['ETag'];+// $content = json_encode($jsonBlob['data']);+// }
}
}
} catch (NotFoundException $e) {
diff --git a/lib/private/Installer.php b/lib/private/Installer.php
index a410c6a011..69f81ef668 100644
--- a/lib/private/Installer.php+++ b/lib/private/Installer.php@@ -420,7 +420,7 @@ class Installer {
return false;
}
$basedir = $app['path'].'/'.$appId;
- return file_exists($basedir.'/.git/');+ return false;//file_exists($basedir.'/.git/');
}
/**

Signed-off-by: Joas Schilling <coding@schilljs.com>

@MorrisJobkeMorrisJobke left a comment

Copy link
Copy Markdown
Member

Choose a reason for hiding this comment

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

Makes sense 👍

@rullzerrullzer left a comment

Copy link
Copy Markdown
Member

Choose a reason for hiding this comment

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

sure

@rullzerrullzer mentioned this pull request Apr 10, 2019
13 tasks
@MorrisJobke
MorrisJobke merged commit 302c10b into masterApr 10, 2019
@MorrisJobke
MorrisJobke deleted the feature/noid/pre-releases-for-beta-and-daily branch April 10, 2019 21:02
Sign up for freeto join this conversation on GitHub. Already have an account? Sign in to comment

Projects

None yet

Development

Successfully merging this pull request may close these issues.

3 participants

@nickvergessen@rullzer@MorrisJobke