Compare commits

..

15 commits

Author SHA1 Message Date
Simon L.
9c0334d3f0
Merge pull request #7538 from nextcloud/dependabot/github_actions/dot-github/workflows/actions/github-script-8.0.0
Some checks failed
Codespell / Check spelling (push) Has been cancelled
build(deps): bump actions/github-script from 6.4.1 to 8.0.0 in /.github/workflows
2026-02-02 14:54:09 +01:00
dependabot[bot]
e95f5cc590
build(deps): bump actions/github-script in /.github/workflows
Bumps [actions/github-script](https://github.com/actions/github-script) from 6.4.1 to 8.0.0.
- [Release notes](https://github.com/actions/github-script/releases)
- [Commits](d7906e4ad0...ed597411d8)

---
updated-dependencies:
- dependency-name: actions/github-script
  dependency-version: 8.0.0
  dependency-type: direct:production
  update-type: version-update:semver-major
...

Signed-off-by: dependabot[bot] <support@github.com>
2026-02-02 13:26:38 +00:00
Simon L.
b8f594b09a fix logic detail
Some checks failed
Codespell / Check spelling (push) Waiting to run
Validate community containers / Validate community containers (push) Has been cancelled
Docker Lint / docker-lint (push) Has been cancelled
Json Validator / Json Validator (push) Has been cancelled
Lint php / php-lint (push) Has been cancelled
PHP Deprecation Detector / PHP Deprecation Detector (push) Has been cancelled
Playwright Tests on push / test (push) Has been cancelled
Static analysis / static-psalm-analysis (push) Has been cancelled
Shellcheck / Check Shell (push) Has been cancelled
Twig Lint / twig-lint (push) Has been cancelled
Lint php / php-lint-summary (push) Has been cancelled
Signed-off-by: Simon L. <szaimen@e.mail.de>
2026-02-02 11:22:43 +01:00
Simon L.
9c0c55dc7e
Merge pull request #7536 from nextcloud/enh/noid/fix-daily-backup
fix daily-backup.sh edge case
2026-02-02 11:07:13 +01:00
Simon L.
c84416df5d fix daily-backup.sh edge case
Signed-off-by: Simon L. <szaimen@e.mail.de>
2026-02-02 11:06:08 +01:00
Simon L.
cfff44954b increase version to 12.6.1
Signed-off-by: Simon L. <szaimen@e.mail.de>
2026-02-02 10:28:57 +01:00
Simon L.
733330fd1d
Merge pull request #7531 from nextcloud/docjyJ-patch-1
fix Nextcloud integration URL for local AI
2026-02-02 10:28:07 +01:00
Simon L.
06090a2677
Merge pull request #7534 from nextcloud/enh/7533/fix-daily-backup-script
daily-backup.sh: continue with script if `wasStartButtonClicked=true` was found
2026-02-02 10:27:38 +01:00
Simon L.
4eb45ebfdb
Merge pull request #7532 from nextcloud/wrap-setconfig-into-config-transaction
Wrap ConfigurationController#SetConfig into a "transaction"
2026-02-02 10:27:17 +01:00
Pablo Zmdl
82cbbe1829 Wrap ConfigurationController#SetConfig into a "transaction"
This avoids a lot of subsequent writes and reads from the file system, because
now only commitTransaction() actually writes the config file.

Signed-off-by: Pablo Zmdl <pablo@nextcloud.com>
Signed-off-by: Simon L. <szaimen@e.mail.de>
2026-02-02 10:17:57 +01:00
Simon L.
cba66dec0b daily-backup.sh: continue with script if wasStartButtonClicked=true was found
Signed-off-by: Simon L. <szaimen@e.mail.de>
2026-02-02 10:11:00 +01:00
Jean-Yves
88b2121eaa
hotfix: Update Nextcloud integration URL for local AI
Signed-off-by: Jean-Yves <7360784+docjyJ@users.noreply.github.com>
2026-02-01 11:37:51 +01:00
Simon L.
4ecb870885
Merge pull request #7522 from nextcloud/enh/noid/block-merging
Some checks failed
Codespell / Check spelling (push) Has been cancelled
add a workflow that blocks merging if a pre-release was published
2026-01-30 15:08:46 +01:00
Simon L.
dae8102088 rename name of workflow
Signed-off-by: Simon L. <szaimen@e.mail.de>
2026-01-30 15:00:48 +01:00
Simon L.
b1cea36dfa add a workflow that blocks merging if a pre-release was published
Signed-off-by: Simon L. <szaimen@e.mail.de>
2026-01-30 14:41:06 +01:00
5 changed files with 56 additions and 3 deletions

View file

@ -0,0 +1,50 @@
name: Block if prerelease is present
on:
pull_request:
permissions:
contents: read
jobs:
check-latest-release:
runs-on: ubuntu-latest
steps:
- name: "Check latest published release isn't a prerelease"
uses: actions/github-script@ed597411d8f924073f98dfc5c65a23a2325f34cd # v6
with:
script: |
const tags = await github.rest.repos.listTags({
owner: context.repo.owner,
repo: context.repo.repo,
per_page: 1
});
if (!tags.data || tags.data.length === 0) {
core.info('No tags found for this repository; skipping prerelease check.');
return;
}
const latestTag = tags.data[0].name;
core.info(`Latest tag found: ${latestTag}`);
try {
const { data } = await github.rest.repos.getReleaseByTag({
owner: context.repo.owner,
repo: context.repo.repo,
tag: latestTag
});
if (data.prerelease) {
core.setFailed(`Release for tag ${latestTag} (${data.tag_name}) is a prerelease. Blocking merges to main as we need to wait for the prerelease to become stable.`);
} else {
core.info(`Release for tag ${latestTag} (${data.tag_name}) is not a prerelease.`);
}
} catch (err) {
if (err.status === 404) {
core.info(`No release found for tag ${latestTag}; skipping prerelease check.`);
} else {
throw err;
}
}

View file

@ -4,7 +4,7 @@ echo "Daily backup script has started"
# Check if initial configuration has been done, otherwise this script should do nothing. # Check if initial configuration has been done, otherwise this script should do nothing.
CONFIG_FILE=/mnt/docker-aio-config/data/configuration.json CONFIG_FILE=/mnt/docker-aio-config/data/configuration.json
if ! [ -f "$CONFIG_FILE" ] || ! grep -q "wasStartButtonClicked.*1" "$CONFIG_FILE"; then if ! [ -f "$CONFIG_FILE" ] || (! grep -q "wasStartButtonClicked.*1" "$CONFIG_FILE" && ! grep -q "wasStartButtonClicked.*true" "$CONFIG_FILE"); then
echo "Initial configuration via AIO interface not done yet. Exiting..." echo "Initial configuration via AIO interface not done yet. Exiting..."
exit 0 exit 0
fi fi

View file

@ -50,7 +50,7 @@
"nextcloud_exec_commands": [ "nextcloud_exec_commands": [
"php /var/www/html/occ app:install integration_openai", "php /var/www/html/occ app:install integration_openai",
"php /var/www/html/occ app:enable integration_openai", "php /var/www/html/occ app:enable integration_openai",
"php /var/www/html/occ config:app:set integration_openai url --value http://nextcloud-aio-local-ai:8080", "php /var/www/html/occ config:app:set integration_openai url --value http://nextcloud-aio-local-ai:10078",
"php /var/www/html/occ config:app:set integration_openai api_key --value %LOCALAI_API_KEY%", "php /var/www/html/occ config:app:set integration_openai api_key --value %LOCALAI_API_KEY%",
"php /var/www/html/occ app:install assistant", "php /var/www/html/occ app:install assistant",
"php /var/www/html/occ app:enable assistant" "php /var/www/html/occ app:enable assistant"

View file

@ -17,6 +17,7 @@ readonly class ConfigurationController {
public function SetConfig(Request $request, Response $response, array $args): Response { public function SetConfig(Request $request, Response $response, array $args): Response {
try { try {
$this->configurationManager->startTransaction();
if (isset($request->getParsedBody()['domain'])) { if (isset($request->getParsedBody()['domain'])) {
$domain = $request->getParsedBody()['domain'] ?? ''; $domain = $request->getParsedBody()['domain'] ?? '';
$skipDomainValidation = isset($request->getParsedBody()['skip_domain_validation']); $skipDomainValidation = isset($request->getParsedBody()['skip_domain_validation']);
@ -137,6 +138,8 @@ readonly class ConfigurationController {
} catch (InvalidSettingConfigurationException $ex) { } catch (InvalidSettingConfigurationException $ex) {
$response->getBody()->write($ex->getMessage()); $response->getBody()->write($ex->getMessage());
return $response->withStatus(422); return $response->withStatus(422);
} finally {
$this->configurationManager->commitTransaction();
} }
} }
} }

View file

@ -1 +1 @@
12.6.0 12.6.1