Skip to content

Fix Konflux build platform arch (release-v0.4 branch)#1697

Merged
simonbaird merged 1 commit intoconforma:release-v0.4from
simonbaird:fix-goos-gooarch-for-konflux-builds-rel04
Jun 13, 2024
Merged

Fix Konflux build platform arch (release-v0.4 branch)#1697
simonbaird merged 1 commit intoconforma:release-v0.4from
simonbaird:fix-goos-gooarch-for-konflux-builds-rel04

Conversation

@simonbaird
Copy link
Copy Markdown
Member

The GOOS and GOARCH env vars need to be set explicitly, otherwise we just build the linux x86 binary over and over. Looks like this regression was introduced in commit b8db99c.

I think restoring the export on those two vars would also have worked.

Ref: https://issues.redhat.com/browse/SECURESIGN-1054

(cherry picked to release-v0.4 branch from main branch commit d62ea87)

This is the release branch version of #1696.

The GOOS and GOARCH env vars need to be set explicitly, otherwise we
just build the linux x86 binary over and over. Looks like this
regression was introduced in commit b8db99c.

I think restoring the export on those two vars would also have
worked.

Ref: https://issues.redhat.com/browse/SECURESIGN-1054

(cherry picked to release-v0.4 branch from main branch commit
d62ea87)
@codecov
Copy link
Copy Markdown

codecov Bot commented Jun 13, 2024

Codecov Report

All modified and coverable lines are covered by tests ✅

Project coverage is 86.66%. Comparing base (e53a8aa) to head (ffd12cf).

Additional details and impacted files

Impacted file tree graph

@@               Coverage Diff                @@
##           release-v0.4    #1697      +/-   ##
================================================
+ Coverage         80.01%   86.66%   +6.64%     
================================================
  Files                65       76      +11     
  Lines              4818     5158     +340     
================================================
+ Hits               3855     4470     +615     
+ Misses              963      688     -275     
Flag Coverage Δ
acceptance 71.77% <ø> (?)
generative 80.01% <ø> (ø)
integration 80.01% <ø> (ø)
unit 80.01% <ø> (ø)

Flags with carried forward coverage won't be shown. Click here to find out more.

see 41 files with indirect coverage changes

@simonbaird simonbaird merged commit 9faa387 into conforma:release-v0.4 Jun 13, 2024
@simonbaird
Copy link
Copy Markdown
Member Author

The pre-merge build only creates one binary, so we'll need to wait for the post-merge build to double check it's doing the right thing.

But I did test it locally and it seems to be working as expected.

simonbaird added a commit to simonbaird/securesign-cosign that referenced this pull request Jun 13, 2024
The ec version is v0.4.79+redhat built on sha 9faa387. The image is
identical to registry.redhat.io/rhtas/ec-rhel9:0.4-1718293643 .

Should resolve SECURESIGN-1054. See also
conforma/cli#1697
Sign up for free to join this conversation on GitHub. Already have an account? Sign in to comment

Labels

None yet

Projects

None yet

Development

Successfully merging this pull request may close these issues.

1 participant