Compare commits
3 Commits
multiple-f
...
v23
Author | SHA1 | Date | |
---|---|---|---|
db4ee38117 | |||
b0723e0fae | |||
af9a980c7d |
@ -185,7 +185,7 @@ git push origin update_flake_lock_action --force
|
||||
### With a Personal Authentication Token
|
||||
|
||||
By providing a Personal Authentication Token, the PR will be submitted in a way that bypasses this limitation (GitHub will essentially think it is the owner of the PAT submitting the PR, and not an Action).
|
||||
You can create a token by visiting https://github.com/settings/tokens and select at least the `repo` scope. Then, store this token in your repository secrets (i.e. `https://github.com/<USER>/<REPO>/settings/secrets/actions`) as `GH_TOKEN_FOR_UPDATES` and set up your workflow file like the following:
|
||||
You can create a token by visiting https://github.com/settings/tokens and select at least the `repo` scope. For the new fine-grained tokens, you need to enable read and write access for "Contents" and "Pull Requests" permissions. Then, store this token in your repository secrets (i.e. `https://github.com/<USER>/<REPO>/settings/secrets/actions`) as `GH_TOKEN_FOR_UPDATES` and set up your workflow file like the following:
|
||||
|
||||
```yaml
|
||||
name: update-flake-lock
|
||||
|
@ -115,7 +115,7 @@ runs:
|
||||
- name: Import bot's GPG key for signing commits
|
||||
if: ${{ inputs.sign-commits == 'true' }}
|
||||
id: import-gpg
|
||||
uses: crazy-max/ghaction-import-gpg@v6
|
||||
uses: crazy-max/ghaction-import-gpg@01dd5d3ca463c7f10f7f4f7b4f177225ac661ee4 # v6.1.0
|
||||
with:
|
||||
gpg_private_key: ${{ inputs.gpg-private-key }}
|
||||
fingerprint: ${{ inputs.gpg-fingerprint }}
|
||||
@ -190,7 +190,7 @@ runs:
|
||||
echo "$DELIMITER" >> $GITHUB_ENV
|
||||
echo "GIT_COMMIT_MESSAGE is: ${COMMIT_MESSAGE}"
|
||||
- name: Interpolate PR Body
|
||||
uses: pedrolamas/handlebars-action@v2.4.0
|
||||
uses: pedrolamas/handlebars-action@2995d7eadacbc8f2f6ab8431a01d84a5fa3b8bb4 # v2.4.0
|
||||
with:
|
||||
files: "pr_body.template"
|
||||
output-filename: "pr_body.txt"
|
||||
@ -207,7 +207,7 @@ runs:
|
||||
run: rm -f pr_body.txt pr_body.template
|
||||
- name: Create PR
|
||||
id: create-pr
|
||||
uses: peter-evans/create-pull-request@v6
|
||||
uses: peter-evans/create-pull-request@6d6857d36972b65feb161a90e484f2984215f83e # v6.0.5
|
||||
with:
|
||||
base: ${{ inputs.base }}
|
||||
branch: ${{ inputs.branch }}
|
||||
|
7
dist/index.js
vendored
7
dist/index.js
vendored
@ -95086,8 +95086,13 @@ function makeNixCommandArgs(nixOptions, flakeInputs, commitMessage) {
|
||||
"--update-input",
|
||||
input
|
||||
]);
|
||||
const lockfileSummaryFlags = [
|
||||
"--option",
|
||||
"commit-lockfile-summary",
|
||||
commitMessage
|
||||
];
|
||||
const updateLockMechanism = flakeInputFlags.length === 0 ? "update" : "lock";
|
||||
return nixOptions.concat(["flake", updateLockMechanism]).concat(flakeInputFlags).concat(["--commit-lock-file", "--commit-lockfile-summary", commitMessage]);
|
||||
return nixOptions.concat(["flake", updateLockMechanism]).concat(flakeInputFlags).concat(["--commit-lock-file"]).concat(lockfileSummaryFlags);
|
||||
}
|
||||
|
||||
// src/index.ts
|
||||
|
2
dist/index.js.map
vendored
2
dist/index.js.map
vendored
File diff suppressed because one or more lines are too long
@ -24,7 +24,8 @@ test("Nix command arguments", () => {
|
||||
"flake",
|
||||
"update",
|
||||
"--commit-lock-file",
|
||||
"--commit-lockfile-summary",
|
||||
"--option",
|
||||
"commit-lockfile-summary",
|
||||
"just testing",
|
||||
],
|
||||
},
|
||||
@ -42,7 +43,8 @@ test("Nix command arguments", () => {
|
||||
"--update-input",
|
||||
"rust-overlay",
|
||||
"--commit-lock-file",
|
||||
"--commit-lockfile-summary",
|
||||
"--option",
|
||||
"commit-lockfile-summary",
|
||||
"just testing",
|
||||
],
|
||||
},
|
||||
@ -57,7 +59,8 @@ test("Nix command arguments", () => {
|
||||
"flake",
|
||||
"update",
|
||||
"--commit-lock-file",
|
||||
"--commit-lockfile-summary",
|
||||
"--option",
|
||||
"commit-lockfile-summary",
|
||||
"just testing",
|
||||
],
|
||||
},
|
||||
|
15
src/nix.ts
15
src/nix.ts
@ -9,10 +9,23 @@ export function makeNixCommandArgs(
|
||||
input,
|
||||
]);
|
||||
|
||||
// NOTE(cole-h): In Nix versions 2.23.0 and later, `commit-lockfile-summary` became an alias to
|
||||
// the setting `commit-lock-file-summary` (https://github.com/NixOS/nix/pull/10691), and Nix does
|
||||
// not treat aliases the same as their "real" setting by requiring setting aliases to be
|
||||
// configured via `--option <alias name> <option value>`
|
||||
// (https://github.com/NixOS/nix/issues/10989).
|
||||
// So, we go the long way so that we can support versions both before and after Nix 2.23.0.
|
||||
const lockfileSummaryFlags = [
|
||||
"--option",
|
||||
"commit-lockfile-summary",
|
||||
commitMessage,
|
||||
];
|
||||
|
||||
const updateLockMechanism = flakeInputFlags.length === 0 ? "update" : "lock";
|
||||
|
||||
return nixOptions
|
||||
.concat(["flake", updateLockMechanism])
|
||||
.concat(flakeInputFlags)
|
||||
.concat(["--commit-lock-file", "--commit-lockfile-summary", commitMessage]);
|
||||
.concat(["--commit-lock-file"])
|
||||
.concat(lockfileSummaryFlags);
|
||||
}
|
||||
|
Reference in New Issue
Block a user