Skip to content
New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Speedup static build by utilizing CI cache on /nix folder #189

Merged
merged 1 commit into from
Aug 24, 2020

Conversation

@hswong3i hswong3i force-pushed the master-linux-amd64 branch 6 times, most recently from c29a1b2 to 2126a7d Compare July 24, 2020 05:45
.cirrus.yml Outdated Show resolved Hide resolved
@hswong3i hswong3i force-pushed the master-linux-amd64 branch 3 times, most recently from 9d1fc5e to 3296695 Compare July 30, 2020 00:07
@hswong3i
Copy link
Contributor Author

Since cirruslabs/cirrus-ci-docs#681 already get fixed, the static binary build phase should now speeding up, with a shared logic with containers/buildah#2428 and containers/podman#7076.

BTW, seems most CI test cases for conmon are now failing at the beginning, CI related to this PR couldn't be triggered...

Copy link
Member

@saschagrunert saschagrunert left a comment

Choose a reason for hiding this comment

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

LGTM

bors bot added a commit to containers/buildah that referenced this pull request Jul 30, 2020
2428: Build static binary with `buildGoModule` r=rhatdan a=hswong3i

<!--
Thanks for sending a pull request!

Please make sure you've read and understood our contributing guidelines
(https://github.com/containers/buildah/blob/master/CONTRIBUTING.md) as well as ensuring
that all your commits are signed with `git commit -s`.
-->

#### What type of PR is this?

<!--
Please label this pull request according to what type of issue you are
addressing, especially if this is a release targeted pull request.

Uncomment only one `/kind <>` line, hit enter to put that in a new line, and
remove leading whitespace from that line:
-->

> /kind cleanup

#### What this PR does / why we need it:

[nix] Build Static Binary with `buildGoModule`

Switch from nix `channel:nixpkgs-unstable` to `channel:nixos-20.03` for better stability.

Also see:
- containers/crun#428
- containers/conmon#189
- containers/skopeo#973
- #2428
- containers/podman#7076
- cri-o/cri-o#4012

#### How to verify it

#### Which issue(s) this PR fixes:

<!--
Automatically closes linked issue when PR is merged.
Uncomment the following comment block and include the issue
number or None on one line.
Usage: `Fixes #<issue number>`, or `Fixes (paste link of issue)`, or `None`.
-->

<!--
Fixes #
or
None
-->

#### Special notes for your reviewer:

#### Does this PR introduce a user-facing change?

<!--
If no, just write `None` in the release-note block below. If yes, a release note
is required: Enter your extended release note in the block below. If the PR
requires additional action from users switching to the new release, include the
string "action required".

For more information on release notes please follow the kubernetes model:
https://git.k8s.io/community/contributors/guide/release-notes.md
-->

```release-note
Build static binary with `buildGoModule`
```



Co-authored-by: Wong Hoi Sing Edison <[email protected]>
bors bot added a commit to containers/buildah that referenced this pull request Jul 30, 2020
2428: Build static binary with `buildGoModule` r=rhatdan a=hswong3i

<!--
Thanks for sending a pull request!

Please make sure you've read and understood our contributing guidelines
(https://github.com/containers/buildah/blob/master/CONTRIBUTING.md) as well as ensuring
that all your commits are signed with `git commit -s`.
-->

#### What type of PR is this?

<!--
Please label this pull request according to what type of issue you are
addressing, especially if this is a release targeted pull request.

Uncomment only one `/kind <>` line, hit enter to put that in a new line, and
remove leading whitespace from that line:
-->

> /kind cleanup

#### What this PR does / why we need it:

[nix] Build Static Binary with `buildGoModule`

Switch from nix `channel:nixpkgs-unstable` to `channel:nixos-20.03` for better stability.

Also see:
- containers/crun#428
- containers/conmon#189
- containers/skopeo#973
- #2428
- containers/podman#7076
- cri-o/cri-o#4012

#### How to verify it

#### Which issue(s) this PR fixes:

<!--
Automatically closes linked issue when PR is merged.
Uncomment the following comment block and include the issue
number or None on one line.
Usage: `Fixes #<issue number>`, or `Fixes (paste link of issue)`, or `None`.
-->

<!--
Fixes #
or
None
-->

#### Special notes for your reviewer:

#### Does this PR introduce a user-facing change?

<!--
If no, just write `None` in the release-note block below. If yes, a release note
is required: Enter your extended release note in the block below. If the PR
requires additional action from users switching to the new release, include the
string "action required".

For more information on release notes please follow the kubernetes model:
https://git.k8s.io/community/contributors/guide/release-notes.md
-->

```release-note
Build static binary with `buildGoModule`
```



Co-authored-by: Wong Hoi Sing Edison <[email protected]>
@hswong3i hswong3i force-pushed the master-linux-amd64 branch 2 times, most recently from 7b59ce4 to 9fe2abb Compare August 7, 2020 00:17
@hswong3i hswong3i force-pushed the master-linux-amd64 branch 2 times, most recently from e8d5abb to 903e127 Compare August 11, 2020 05:53
@hswong3i hswong3i force-pushed the master-linux-amd64 branch from 903e127 to 6d8ebcd Compare August 11, 2020 06:10
bors bot added a commit to containers/buildah that referenced this pull request Aug 11, 2020
2533: Update nix pin with `make nixpkgs` r=rhatdan a=hswong3i


<!--
Thanks for sending a pull request!

Please make sure you've read and understood our contributing guidelines
(https://github.com/containers/buildah/blob/master/CONTRIBUTING.md) as well as ensuring
that all your commits are signed with `git commit -s`.
-->

#### What type of PR is this?

<!--
Please label this pull request according to what type of issue you are
addressing, especially if this is a release targeted pull request.

Uncomment only one `/kind <>` line, hit enter to put that in a new line, and
remove leading whitespace from that line:
-->



> /kind cleanup
> /kind feature


#### What this PR does / why we need it:

Update nix pin with `make nixpkgs`

Also sync nix `packageOverrides` across skopeo/buildah/podman/cri-o for utilizing local build cache, see
- containers/crun#450
- containers/conmon#189
- containers/skopeo#973
- #2533
- containers/podman#7286
- cri-o/cri-o#4065

#### How to verify it

#### Which issue(s) this PR fixes:

<!--
Automatically closes linked issue when PR is merged.
Uncomment the following comment block and include the issue
number or None on one line.
Usage: `Fixes #<issue number>`, or `Fixes (paste link of issue)`, or `None`.
-->

<!--
Fixes #
or
None
-->

#### Special notes for your reviewer:

#### Does this PR introduce a user-facing change?

<!--
If no, just write `None` in the release-note block below. If yes, a release note
is required: Enter your extended release note in the block below. If the PR
requires additional action from users switching to the new release, include the
string "action required".

For more information on release notes please follow the kubernetes model:
https://git.k8s.io/community/contributors/guide/release-notes.md
-->

```release-note
Update nix pin with `make `nixpkgs`
```



Co-authored-by: Wong Hoi Sing Edison <[email protected]>
@hswong3i
Copy link
Contributor Author

@saschagrunert could we give a merge for this?

@hswong3i
Copy link
Contributor Author

/retest

@saschagrunert
Copy link
Member

I think we should somehow revive the CI first :D

@haircommander
Copy link
Collaborator

😅 I will try to work with @cevich this week

@haircommander
Copy link
Collaborator

ci is (mostly) fixed, please rebase!

@hswong3i hswong3i force-pushed the master-linux-amd64 branch from 6d8ebcd to 360b541 Compare August 22, 2020 01:42
@hswong3i hswong3i force-pushed the master-linux-amd64 branch from 360b541 to e3a7258 Compare August 22, 2020 11:06
Copy link
Member

@saschagrunert saschagrunert left a comment

Choose a reason for hiding this comment

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

LGTM

@haircommander haircommander merged commit 76548e1 into containers:master Aug 24, 2020
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.

3 participants