diff options
| author | Joas Schilling <213943+nickvergessen@users.noreply.github.com> | 2023-05-17 15:59:38 +0200 |
|---|---|---|
| committer | GitHub <noreply@github.com> | 2023-05-17 15:59:38 +0200 |
| commit | 3fc43bc91a04114ee072032ccde49d3c3eb17b7e (patch) | |
| tree | 52b3154ec4c8dee63f046dac7a77587c48e50457 /.github | |
| parent | 22e5741138778912478c90766a8ef277535b43e0 (diff) | |
| parent | 7e45fdf867d6deebf748ede45579f8da9c2ed9af (diff) | |
| download | nextcloud-server-3fc43bc91a04114ee072032ccde49d3c3eb17b7e.tar.gz nextcloud-server-3fc43bc91a04114ee072032ccde49d3c3eb17b7e.zip | |
Merge pull request #38336 from nextcloud/master-is-now-28
Master is now 28
Diffstat (limited to '.github')
| -rw-r--r-- | .github/dependabot.yml | 34 | ||||
| -rw-r--r-- | .github/workflows/update-cacert-bundle.yml | 2 | ||||
| -rw-r--r-- | .github/workflows/update-psalm-baseline.yml | 2 |
3 files changed, 31 insertions, 7 deletions
diff --git a/.github/dependabot.yml b/.github/dependabot.yml index 5008dd6c227..e70f3e1e0f6 100644 --- a/.github/dependabot.yml +++ b/.github/dependabot.yml @@ -64,7 +64,7 @@ updates: day: saturday time: "03:00" timezone: Europe/Paris - target-branch: stable24 + target-branch: stable25 labels: - "3. to review" - "feature: dependencies" @@ -74,6 +74,8 @@ updates: # ignore all GitHub linguist patch updates - dependency-name: "*" update-types: ["version-update:semver-major", "version-update:semver-minor", "version-update:semver-patch"] + # Disable automatic rebasing because without a build CI will likely fail anyway + rebase-strategy: "disabled" - package-ecosystem: npm directory: "/" @@ -82,7 +84,7 @@ updates: day: saturday time: "03:00" timezone: Europe/Paris - target-branch: stable25 + target-branch: stable26 labels: - "3. to review" - "feature: dependencies" @@ -92,6 +94,8 @@ updates: # ignore all GitHub linguist patch updates - dependency-name: "*" update-types: ["version-update:semver-major", "version-update:semver-minor", "version-update:semver-patch"] + # Disable automatic rebasing because without a build CI will likely fail anyway + rebase-strategy: "disabled" - package-ecosystem: npm directory: "/" @@ -100,7 +104,7 @@ updates: day: saturday time: "03:00" timezone: Europe/Paris - target-branch: stable26 + target-branch: stable27 labels: - "3. to review" - "feature: dependencies" @@ -110,6 +114,8 @@ updates: # ignore all GitHub linguist patch updates - dependency-name: "*" update-types: ["version-update:semver-major", "version-update:semver-minor", "version-update:semver-patch"] + # Disable automatic rebasing because without a build CI will likely fail anyway + rebase-strategy: "disabled" # Testing StableXX composer - package-ecosystem: composer @@ -119,7 +125,7 @@ updates: day: saturday time: "03:00" timezone: Europe/Paris - target-branch: stable24 + target-branch: stable25 labels: - "3. to review" - "feature: dependencies" @@ -137,7 +143,25 @@ updates: day: saturday time: "03:00" timezone: Europe/Paris - target-branch: stable25 + target-branch: stable26 + labels: + - "3. to review" + - "feature: dependencies" + reviewers: + - "nextcloud/server-dependabot" + ignore: + # ignore all GitHub linguist patch updates + - dependency-name: "*" + update-types: ["version-update:semver-major", "version-update:semver-minor", "version-update:semver-patch"] + +- package-ecosystem: composer + directory: "/build/integration" + schedule: + interval: weekly + day: saturday + time: "03:00" + timezone: Europe/Paris + target-branch: stable27 labels: - "3. to review" - "feature: dependencies" diff --git a/.github/workflows/update-cacert-bundle.yml b/.github/workflows/update-cacert-bundle.yml index f599ae62ef1..e2fefc195f4 100644 --- a/.github/workflows/update-cacert-bundle.yml +++ b/.github/workflows/update-cacert-bundle.yml @@ -12,7 +12,7 @@ jobs: strategy: fail-fast: false matrix: - branches: ["master", "stable26", "stable25", "stable24", "stable23", "stable22"] + branches: ["master", "stable27", "stable26", "stable25", "stable24", "stable23", "stable22"] name: update-ca-certificate-bundle-${{ matrix.branches }} diff --git a/.github/workflows/update-psalm-baseline.yml b/.github/workflows/update-psalm-baseline.yml index 6f70d2ff978..20056b45631 100644 --- a/.github/workflows/update-psalm-baseline.yml +++ b/.github/workflows/update-psalm-baseline.yml @@ -14,7 +14,7 @@ jobs: strategy: fail-fast: false matrix: - branches: ["master", "stable26", "stable25", "stable24", "stable23"] + branches: ["master", "stable27", "stable26", "stable25"] name: update-psalm-baseline-${{ matrix.branches }} |