Bug 257422 - Cirrus-CI builds broken by pkgbase change
Summary: Cirrus-CI builds broken by pkgbase change
Status: Closed FIXED
Alias: None
Product: Base System
Classification: Unclassified
Component: misc (show other bugs)
Version: CURRENT
Hardware: Any Any
: --- Affects Only Me
Assignee: Ed Maste
URL:
Keywords:
Depends on:
Blocks:
 
Reported: 2021-07-26 00:48 UTC by Ed Maste
Modified: 2021-07-27 20:30 UTC (History)
4 users (show)

See Also:


Attachments

Note You need to log in before you can comment on or make changes to this bug.
Description Ed Maste freebsd_committer 2021-07-26 00:48:04 UTC
As of 6cafdee71d2b23e8ec95d1f128b0e11f103491bb Cirrus-CI builds continuously fail.

From https://cirrus-ci.com/build/6126172527394816
Cannot create repository catalogue
*** Error code 1

From .cirrus.yml pkg build is invoked as:
- su user -c "make CROSS_TOOLCHAIN=llvm12 WITHOUT_TOOLCHAIN=yes PKG_FORMAT=tar packages"

(CI builds use uncompressed packages for speed.)
Comment 1 commit-hook freebsd_committer 2021-07-26 15:38:58 UTC
A commit in branch main references this bug:

URL: https://cgit.FreeBSD.org/src/commit/?id=2bfba2a04b05524d72a6190164aa5aaa1d29e337

commit 2bfba2a04b05524d72a6190164aa5aaa1d29e337
Author:     Ed Maste <emaste@FreeBSD.org>
AuthorDate: 2021-07-26 14:33:09 +0000
Commit:     Ed Maste <emaste@FreeBSD.org>
CommitDate: 2021-07-26 14:36:39 +0000

    Cirrus-CI: Temporarily skip package build + test

    The PKG_FORMAT=tar used by Cirrus CI's pkgbase build is failing after
    6cafdee71d2b ("pkgbase: Track pkg 1.17").  Skip package build and test
    in Cirrus-CI until new pkg is available.

    PR:             257422
    Sponsored by:   The FreeBSD Foundation

 .cirrus.yml | 8 ++++----
 1 file changed, 4 insertions(+), 4 deletions(-)
Comment 2 commit-hook freebsd_committer 2021-07-26 18:18:23 UTC
A commit in branch main references this bug:

URL: https://cgit.FreeBSD.org/src/commit/?id=a077a4e3b41bb676be1237fb0af78d6814393fe7

commit a077a4e3b41bb676be1237fb0af78d6814393fe7
Author:     Ed Maste <emaste@FreeBSD.org>
AuthorDate: 2021-07-26 17:27:16 +0000
Commit:     Ed Maste <emaste@FreeBSD.org>
CommitDate: 2021-07-26 18:17:59 +0000

    Cirrus-CI: report pkg version

    PR:             257422

 .cirrus.yml | 1 +
 1 file changed, 1 insertion(+)
Comment 3 commit-hook freebsd_committer 2021-07-27 18:52:48 UTC
A commit in branch main references this bug:

URL: https://cgit.FreeBSD.org/src/commit/?id=4e224e4be7c37052567ec4cd2481f299487fc222

commit 4e224e4be7c37052567ec4cd2481f299487fc222
Author:     Ed Maste <emaste@FreeBSD.org>
AuthorDate: 2021-07-27 16:44:45 +0000
Commit:     Ed Maste <emaste@FreeBSD.org>
CommitDate: 2021-07-27 18:50:06 +0000

    pkgbase: accommodate pkg < 1.17

    6cafdee71d2b adapted the pkgbase build for 1.17, but broke Cirrus-CI's
    use of PKG_FORMAT=tar (the quarterly package set still has pkg 1.16).
    Because of this I disabled the pkgbase build and test in 2bfba2a04b05.

    Now, check `pkg --version` and use the old logic for < 1.17.

    To be reverted once we no longer encounter pkg 1.16 in Cirrus-CI (i.e.,
    via GCP cloud images) to avoid keeping this extra complexity around.

    PR:             257422
    Reviewed by:    manu
    Sponsored by:   The FreeBSD Foundation
    Differential Revision:  https://reviews.freebsd.org/D31324

 Makefile.inc1 | 15 ++++++++++++---
 1 file changed, 12 insertions(+), 3 deletions(-)
Comment 4 commit-hook freebsd_committer 2021-07-27 20:30:07 UTC
A commit in branch main references this bug:

URL: https://cgit.FreeBSD.org/src/commit/?id=e1e9e084a706d0b28603f4741393a8b84878da86

commit e1e9e084a706d0b28603f4741393a8b84878da86
Author:     Ed Maste <emaste@FreeBSD.org>
AuthorDate: 2021-07-26 15:49:15 +0000
Commit:     Ed Maste <emaste@FreeBSD.org>
CommitDate: 2021-07-27 20:28:47 +0000

    Revert "Cirrus-CI: Temporarily skip package build + test"

    This reverts commit 2bfba2a04b05524d72a6190164aa5aaa1d29e337.

    As of commit 4e224e4be7c3 Makefile.inc1 works with old and new pkg.

    PR:             257422
    Sponsored by:   The FreeBSD Foundation

 .cirrus.yml | 8 ++++----
 1 file changed, 4 insertions(+), 4 deletions(-)