Skip to content

Commit c676c98

Browse files
gpongelliLee-W
authored andcommitted
pinentry already present, check key creation
1 parent cfa78be commit c676c98

File tree

2 files changed

+4
-8
lines changed

2 files changed

+4
-8
lines changed

‎.github/workflows/pythonpackage.yml

-4
Original file line numberDiff line numberDiff line change
@@ -22,10 +22,6 @@ jobs:
2222
python -m pip install -U pip poetry
2323
poetry --version
2424
poetry install
25-
- name: Install pinentry on macos
26-
if: runner.os == 'macOs'
27-
run: |
28-
brew install pinentry
2925
- name: Run tests and linters
3026
run: |
3127
git config --global user.email "action@github.com"

‎tests/conftest.py

+4-4
Original file line numberDiff line numberDiff line change
@@ -37,18 +37,18 @@ def tmp_commitizen_project_with_gpg(tmp_commitizen_project):
3737
f.write(f"Name-Email: {_signer_mail}" + os.linesep)
3838
f.write("Expire-Date: 1" + os.linesep)
3939

40-
cmd.run(
40+
_key = cmd.run(
4141
f"gpg --batch --passphrase '' --pinentry-mode loopback --generate-key {_gpg_file}"
4242
)
43+
# debug for mac github actions
44+
if platform.system().lower() == "darwin":
45+
print(f"MAC OS: new key created?\n{_key.out}\n{_key.err}")
4346

4447
_new_key = cmd.run(f"gpg --list-secret-keys {_signer_mail}")
4548
_m = re.search(
4649
rf"[a-zA-Z0-9 \[\]-_]*{os.linesep}[ ]*([0-9A-Za-z]*){os.linesep}[{os.linesep}a-zA-Z0-9 \[\]-_<>@]*",
4750
_new_key.out,
4851
)
49-
# debug for mac github actions
50-
if platform.system().lower() == "darwin":
51-
print(f"MAC OS: new key created?\n{_new_key.out}\n{_new_key.err}")
5252

5353
if _m:
5454
_key_id = _m.group(1)

0 commit comments

Comments
 (0)