1
0
Fork 0
mirror of https://github.com/Mic92/sops-nix.git synced 2025-03-31 04:14:37 +00:00

Merge pull request #8 from Mic92/permission-fixes

Permission fixes
This commit is contained in:
github-actions[bot] 2020-07-14 12:52:01 +00:00 committed by GitHub
commit 2337d8f94e
No known key found for this signature in database
GPG key ID: 4AEE18F83AFDEB23
2 changed files with 30 additions and 1 deletions

29
.github/workflows/automerge.yml vendored Normal file
View file

@ -0,0 +1,29 @@
name: automerge
on:
pull_request:
types:
- labeled
- unlabeled
- synchronize
- opened
- edited
- ready_for_review
- reopened
- unlocked
pull_request_review:
types:
- submitted
check_suite:
types:
- completed
status: {}
jobs:
automerge:
runs-on: ubuntu-latest
steps:
- name: automerge
uses: "pascalgn/automerge-action@f35cd36cce72079e996106999462608448c99120"
env:
GITHUB_TOKEN: "${{ secrets.GITHUB_TOKEN }}"
MERGE_FORKS: false
MERGE_LABELS: ""

View file

@ -326,7 +326,7 @@ func importSSHKeys(keyPaths []string, gpgHome string) error {
return fmt.Errorf("Cannot write secring: %s", err)
}
fmt.Printf("Imported %s with fingerprint %s", path, hex.EncodeToString(gpgKey.PrimaryKey.Fingerprint[:]))
fmt.Printf("%s: Imported %s with fingerprint %s\n", os.Args[0], path, hex.EncodeToString(gpgKey.PrimaryKey.Fingerprint[:]))
}
return nil