Skip to content

bugfix: gpg2 is called 'gpg' on macOS#14594

Merged
tgamblin merged 1 commit intodevelopfrom
bugfix/no-gpg2-on-osx
Jan 23, 2020
Merged

bugfix: gpg2 is called 'gpg' on macOS#14594
tgamblin merged 1 commit intodevelopfrom
bugfix/no-gpg2-on-osx

Conversation

@tgamblin
Copy link
Copy Markdown
Member

@tgamblin tgamblin commented Jan 22, 2020

The gpg2 command isn't always around; it's sometimes called gpg. This is the case with the brew-installed version, and it's breaking our tests.

  • Look for both 'gpg2' and 'gpg' when finding the command

This fixes the currently breaking macOS tests.

@tgamblin tgamblin added macOS buildcache tests General test capability(ies) labels Jan 22, 2020
@tgamblin tgamblin requested a review from alalazo January 22, 2020 07:54
Copy link
Copy Markdown
Member

@alalazo alalazo left a comment

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

See comment below for the failure in Travis

@tgamblin tgamblin force-pushed the bugfix/no-gpg2-on-osx branch 3 times, most recently from 4f12919 to b754c26 Compare January 22, 2020 23:09
@tgamblin
Copy link
Copy Markdown
Member Author

tgamblin commented Jan 22, 2020

@alalazo: I had to tweak one more thing to get this working on macOS -- GPG can only handle GPGHOME directories up to 108 chars long, for... bad reasons. Anyway, I had to use mkdtemp instead of the tmpdir fixture to reliably get a shorter path on macOS.

The gpg2 command isn't always around; it's sometimes called gpg.  This is
the case with the brew-installed version, and it's breaking our tests.

- [x] Look for both 'gpg2' and 'gpg' when finding the command
- [x] If we find 'gpg', ensure the version is 2 or higher
- [x] Add tests for version detection.
Sign up for free to join this conversation on GitHub. Already have an account? Sign in to comment

Labels

buildcache macOS tests General test capability(ies)

Projects

None yet

Development

Successfully merging this pull request may close these issues.

2 participants