about summary refs log tree commit diff
path: root/.github/workflows/periodic-merge-6h.yml
AgeCommit message (Collapse)AuthorFilesLines
2024-05-13build(deps): bump actions/checkout from 4.1.4 to 4.1.5dependabot[bot]1-1/+1
Bumps [actions/checkout](https://github.com/actions/checkout) from 4.1.4 to 4.1.5. - [Release notes](https://github.com/actions/checkout/releases) - [Changelog](https://github.com/actions/checkout/blob/main/CHANGELOG.md) - [Commits](https://github.com/actions/checkout/compare/0ad4b8fadaa221de15dcec353f45205ec38ea70b...44c2b7a8a4ea60a981eaca3cf939b5f4305c123b) --- updated-dependencies: - dependency-name: actions/checkout dependency-type: direct:production update-type: version-update:semver-patch ... Signed-off-by: dependabot[bot] <support@github.com>
2024-04-29build(deps): bump actions/checkout from 4.1.3 to 4.1.4dependabot[bot]1-1/+1
Bumps [actions/checkout](https://github.com/actions/checkout) from 4.1.3 to 4.1.4. - [Release notes](https://github.com/actions/checkout/releases) - [Changelog](https://github.com/actions/checkout/blob/main/CHANGELOG.md) - [Commits](https://github.com/actions/checkout/compare/1d96c772d19495a3b5c517cd2bc0cb401ea0529f...0ad4b8fadaa221de15dcec353f45205ec38ea70b) --- updated-dependencies: - dependency-name: actions/checkout dependency-type: direct:production update-type: version-update:semver-patch ... Signed-off-by: dependabot[bot] <support@github.com>
2024-04-22build(deps): bump actions/checkout from 4.1.1 to 4.1.3dependabot[bot]1-1/+1
Bumps [actions/checkout](https://github.com/actions/checkout) from 4.1.1 to 4.1.3. - [Release notes](https://github.com/actions/checkout/releases) - [Changelog](https://github.com/actions/checkout/blob/main/CHANGELOG.md) - [Commits](https://github.com/actions/checkout/compare/v4.1.1...1d96c772d19495a3b5c517cd2bc0cb401ea0529f) --- updated-dependencies: - dependency-name: actions/checkout dependency-type: direct:production update-type: version-update:semver-patch ... Signed-off-by: dependabot[bot] <support@github.com>
2024-03-18build(deps): bump actions/checkout from 4.1.1 to 4.1.2dependabot[bot]1-1/+1
Bumps [actions/checkout](https://github.com/actions/checkout) from 4.1.1 to 4.1.2. - [Release notes](https://github.com/actions/checkout/releases) - [Changelog](https://github.com/actions/checkout/blob/main/CHANGELOG.md) - [Commits](https://github.com/actions/checkout/compare/b4ffde65f46336ab88eb53be808477a3936bae11...9bb56186c3b09b4f86b1c65136769dd318469633) --- updated-dependencies: - dependency-name: actions/checkout dependency-type: direct:production update-type: version-update:semver-patch ... Signed-off-by: dependabot[bot] <support@github.com>
2024-01-29build(deps): bump peter-evans/create-or-update-commentdependabot[bot]1-1/+1
Bumps [peter-evans/create-or-update-comment](https://github.com/peter-evans/create-or-update-comment) from 3.1.0 to 4.0.0. - [Release notes](https://github.com/peter-evans/create-or-update-comment/releases) - [Commits](https://github.com/peter-evans/create-or-update-comment/compare/23ff15729ef2fc348714a3bb66d2f655ca9066f2...71345be0265236311c031f5c7866368bd1eff043) --- updated-dependencies: - dependency-name: peter-evans/create-or-update-comment dependency-type: direct:production update-type: version-update:semver-major ... Signed-off-by: dependabot[bot] <support@github.com>
2023-12-02workflows/periodic-merge: allow manual dispatchMartin Weinelt1-0/+1
Currently there is an eval fix on master and waiting five hours for it to propagate into staging-next and staging is annoyingly long.
2023-11-29ci: pin third party actionsVictor Engmark1-3/+3
For reproducibility. Command: ```shell for file in .github/workflows/*.y*ml; do npx pin-github-action --comment=' {ref}' "$file" done ``` Then had to manually replace all the versions with accurate specifiers (for example, "v4" → "v4.1.1" in case of `actions/checkout`).
2023-09-11build(deps): bump actions/checkout from 3 to 4dependabot[bot]1-1/+1
Bumps [actions/checkout](https://github.com/actions/checkout) from 3 to 4. - [Release notes](https://github.com/actions/checkout/releases) - [Changelog](https://github.com/actions/checkout/blob/main/CHANGELOG.md) - [Commits](https://github.com/actions/checkout/compare/v3...v4) --- updated-dependencies: - dependency-name: actions/checkout dependency-type: direct:production update-type: version-update:semver-major ... Signed-off-by: dependabot[bot] <support@github.com>
2023-04-11build(deps): bump peter-evans/create-or-update-comment from 2 to 3dependabot[bot]1-1/+1
Bumps [peter-evans/create-or-update-comment](https://github.com/peter-evans/create-or-update-comment) from 2 to 3. - [Release notes](https://github.com/peter-evans/create-or-update-comment/releases) - [Commits](https://github.com/peter-evans/create-or-update-comment/compare/v2...v3) --- updated-dependencies: - dependency-name: peter-evans/create-or-update-comment dependency-type: direct:production update-type: version-update:semver-major ... Signed-off-by: dependabot[bot] <support@github.com>
2022-09-12.github/workflows: fix permissionszowoq1-1/+1
the merge actions comment on pull requests, seems this was broken by 2c71278a2395d6d8c4e06d1ebe4de1ffdae727c7 also: - fix permissions on new manual rendering action - drop unnecessary issues permission from the terraform action
2022-07-08ci: Add GitHub token permissions for workflowsVarun Sharma1-0/+6
Signed-off-by: Varun Sharma <varunsh@stepsecurity.io>
2022-03-23build(deps): bump peter-evans/create-or-update-comment from 1 to 2dependabot[bot]1-1/+1
Bumps [peter-evans/create-or-update-comment](https://github.com/peter-evans/create-or-update-comment) from 1 to 2. - [Release notes](https://github.com/peter-evans/create-or-update-comment/releases) - [Commits](https://github.com/peter-evans/create-or-update-comment/compare/v1...v2) --- updated-dependencies: - dependency-name: peter-evans/create-or-update-comment dependency-type: direct:production update-type: version-update:semver-major ... Signed-off-by: dependabot[bot] <support@github.com>
2022-03-02build(deps): bump actions/checkout from 2 to 3dependabot[bot]1-1/+1
Bumps [actions/checkout](https://github.com/actions/checkout) from 2 to 3. - [Release notes](https://github.com/actions/checkout/releases) - [Changelog](https://github.com/actions/checkout/blob/main/CHANGELOG.md) - [Commits](https://github.com/actions/checkout/compare/v2...v3)
2021-10-05.github/workflows/periodic-merge: move stable merges to 24h cycleMartin Weinelt1-4/+0
2021-09-02build(deps): bump devmasx/merge-branch from 1.3.1 to 1.4.0dependabot[bot]1-1/+1
Bumps [devmasx/merge-branch](https://github.com/devmasx/merge-branch) from 1.3.1 to 1.4.0. - [Release notes](https://github.com/devmasx/merge-branch/releases) - [Changelog](https://github.com/devmasx/merge-branch/blob/master/CHANGELOG.md) - [Commits](https://github.com/devmasx/merge-branch/compare/v1.3.1...1.4.0) --- updated-dependencies: - dependency-name: devmasx/merge-branch dependency-type: direct:production update-type: version-update:semver-minor ... Signed-off-by: dependabot[bot] <support@github.com>
2021-07-01.github/workflows/periodic-merge-*: Tiny improvementsMalte Brandy1-1/+1
2021-06-30.github/workflows/periodic-merge: generalize from merge-stagingMartin Weinelt1-0/+55
By generalizing the previous merge-staging action we can support a large number of branch pairs that need to be merged periodically. Provide two intervals, daily and every six hours, to accomodate different needs. Co-Authored-By: Malte Brandy <malte.brandy@maralorn.de>