gerg-l/nixos
1
0
Fork 0
mirror of https://github.com/Gerg-L/nixos.git synced 2025-12-10 00:43:56 -05:00
Code Issues Projects Releases Packages Wiki Activity Actions

fixed merge conflicts

Browse source
This commit is contained in:
Gerg-L 2023-07-09 20:16:18 -04:00
commit 01125d91d8
2 changed files with 27 additions and 27 deletions
Download patch file Download diff file Expand all files Collapse all files

10
.github/dependabot.yml vendored
View file

@ -7,17 +7,17 @@
"schedule": { "schedule": {
"interval": "daily", "interval": "daily",
"time": "04:00" "time": "04:00"
}, },
"open-pull-requests-limit": 10, "open-pull-requests-limit": 10,
"reviewers": [ "reviewers": [
"Gerg-L" "Gerg-L"
], ],
"assignees": [ "assignees": [
"Gerg-L" "Gerg-L"
], ],
"labels": [ "labels": [
"CI" "CI"
] ]
} }
] ]
} }

44
.github/workflows/flake-update.yml vendored
View file

@ -5,8 +5,8 @@
"schedule": [ "schedule": [
{ {
"cron": "0 1 * * *" "cron": "0 1 * * *"
} }
] ]
}, },
"jobs": { "jobs": {
"lockfile": { "lockfile": {
@ -15,27 +15,27 @@
{ {
"name": "checkout", "name": "checkout",
"uses": "actions/checkout@v3.5.3" "uses": "actions/checkout@v3.5.3"
},
{
"name": "install",
"uses": "DeterminateSystems/nix-installer-action@v4"
}, },
{ {
"name": "install", "name": "update",
"uses": "DeterminateSystems/nix-installer-action@v4" "uses": "DeterminateSystems/update-flake-lock@v19",
}, "with": {
{ "pr-title": "Update flake.lock",
"name": "update", "pr-labels": "CI"
"uses": "DeterminateSystems/update-flake-lock@v19", }
"with": { },
"pr-title": "Update flake.lock", {
"pr-labels": "CI" "name": "merge",
} "run": "gh pr merge ${{ steps.update.outputs.pull-request-number }} --squash --delete-branch\n",
}, "env": {
{ "GITHUB_TOKEN": "${{ secrets.GITHUB_TOKEN }}"
"name": "merge", }
"run": "gh pr merge ${{ steps.update.outputs.pull-request-number }} --squash --delete-branch\n", }
"env": { ]
"GITHUB_TOKEN": "${{ secrets.GITHUB_TOKEN }}" }
}
}
]
}
} }
} }