Commit
This commit does not belong to any branch on this repository, and may belong to a fork outside of the repository.
typedb: Merge branch 'NixOS:master' into master
- Loading branch information
Showing
3,645 changed files
with
108,887 additions
and
55,580 deletions.
The diff you're trying to view is too large. We only load the first 3000 changed files.
There are no files selected for viewing
Validating CODEOWNERS rules …
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
This file was deleted.
Oops, something went wrong.
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
Original file line number | Diff line number | Diff line change |
---|---|---|
@@ -0,0 +1,49 @@ | ||
# This action periodically merges base branches into staging branches. | ||
# This is done to | ||
# * prevent conflicts or rather resolve them early | ||
# * make all potential breakage happen on the staging branch | ||
# * and make sure that all major rebuilds happen before the staging | ||
# branch get’s merged back into its base branch. | ||
|
||
name: "Periodic Merges (24h)" | ||
|
||
|
||
on: | ||
schedule: | ||
# * is a special character in YAML so you have to quote this string | ||
# Merge every 24 hours | ||
- cron: '0 0 * * *' | ||
|
||
jobs: | ||
periodic-merge: | ||
if: github.repository_owner == 'NixOS' | ||
runs-on: ubuntu-latest | ||
strategy: | ||
# don't fail fast, so that all pairs are tried | ||
fail-fast: false | ||
# certain branches need to be merged in order, like master->staging-next->staging | ||
# and disabling parallelism ensures the order of the pairs below. | ||
max-parallel: 1 | ||
matrix: | ||
pairs: | ||
- from: master | ||
into: haskell-updates | ||
name: ${{ matrix.pairs.from }} → ${{ matrix.pairs.into }} | ||
steps: | ||
- uses: actions/checkout@v2 | ||
|
||
- name: ${{ matrix.pairs.from }} → ${{ matrix.pairs.into }} | ||
uses: devmasx/merge-branch@v1.3.1 | ||
with: | ||
type: now | ||
from_branch: ${{ matrix.pairs.from }} | ||
target_branch: ${{ matrix.pairs.into }} | ||
github_token: ${{ secrets.GITHUB_TOKEN }} | ||
|
||
- name: Comment on failure | ||
uses: peter-evans/create-or-update-comment@v1 | ||
if: ${{ failure() }} | ||
with: | ||
issue-number: 105153 | ||
body: | | ||
Periodic merge from `${{ matrix.pairs.from }}` into `${{ matrix.pairs.into }}` has [failed](https://github.com/NixOS/nixpkgs/actions/runs/${{ github.run_id }}). |
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
Original file line number | Diff line number | Diff line change |
---|---|---|
@@ -0,0 +1,55 @@ | ||
# This action periodically merges base branches into staging branches. | ||
# This is done to | ||
# * prevent conflicts or rather resolve them early | ||
# * make all potential breakage happen on the staging branch | ||
# * and make sure that all major rebuilds happen before the staging | ||
# branch get’s merged back into its base branch. | ||
|
||
name: "Periodic Merges (6h)" | ||
|
||
|
||
on: | ||
schedule: | ||
# * is a special character in YAML so you have to quote this string | ||
# Merge every 6 hours | ||
- cron: '0 */6 * * *' | ||
|
||
jobs: | ||
periodic-merge: | ||
if: github.repository_owner == 'NixOS' | ||
runs-on: ubuntu-latest | ||
strategy: | ||
# don't fail fast, so that all pairs are tried | ||
fail-fast: false | ||
# certain branches need to be merged in order, like master->staging-next->staging | ||
# and disabling parallelism ensures the order of the pairs below. | ||
max-parallel: 1 | ||
matrix: | ||
pairs: | ||
- from: master | ||
into: staging-next | ||
- from: staging-next | ||
into: staging | ||
- from: release-21.05 | ||
into: staging-next-21.05 | ||
- from: staging-next-21.05 | ||
into: staging-21.05 | ||
name: ${{ matrix.pairs.from }} → ${{ matrix.pairs.into }} | ||
steps: | ||
- uses: actions/checkout@v2 | ||
|
||
- name: ${{ matrix.pairs.from }} → ${{ matrix.pairs.into }} | ||
uses: devmasx/merge-branch@v1.3.1 | ||
with: | ||
type: now | ||
from_branch: ${{ matrix.pairs.from }} | ||
target_branch: ${{ matrix.pairs.into }} | ||
github_token: ${{ secrets.GITHUB_TOKEN }} | ||
|
||
- name: Comment on failure | ||
uses: peter-evans/create-or-update-comment@v1 | ||
if: ${{ failure() }} | ||
with: | ||
issue-number: 105153 | ||
body: | | ||
Periodic merge from `${{ matrix.pairs.from }}` into `${{ matrix.pairs.into }}` has [failed](https://github.com/NixOS/nixpkgs/actions/runs/${{ github.run_id }}). |
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
Oops, something went wrong.