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

Update gvisor.dev/gvisor to latest tagged release #249

Merged
merged 4 commits into from
Jul 27, 2023

Conversation

cfergeau
Copy link
Contributor

This will allow building with golang 1.20/1.21, but will break builds with
golang 1.19... If you need to build with 1.19, you will have to keep using
gvisor-tap-vsock 0.6.2

This fixes #232

@cfergeau
Copy link
Contributor Author

@AkihiroSuda this is #219 rebased with an additional update on top of it

@lsm5
Copy link
Member

lsm5 commented Jul 25, 2023

We'll need to disable f37 packit builds for main branch as well. Could you please add this patch to update packit tasks?

$ cat 0001-update-packit-targets.patch 
From b951fd5b52a4623eb31f9fcb4cf702c57f1d26f2 Mon Sep 17 00:00:00 2001
From: Lokesh Mandvekar <lsm5@fedoraproject.org>
Date: Tue, 25 Jul 2023 15:32:56 -0400
Subject: [PATCH] update packit targets

Signed-off-by: Lokesh Mandvekar <lsm5@fedoraproject.org>
---
 .packit.yaml | 22 ++++++++++++++++++++++
 1 file changed, 22 insertions(+)

diff --git a/.packit.yaml b/.packit.yaml
index 4322dda..8301f9e 100644
--- a/.packit.yaml
+++ b/.packit.yaml
@@ -18,9 +18,31 @@ jobs:
     enable_net: true
     srpm_build_deps:
       - make
+    targets:
+      - fedora-rawhide-aarch64
+      - fedora-rawhide-x86_64
+      - fedora-eln-aarch64
+      - fedora-eln-x86_64
+      - fedora-38-aarch64
+      - fedora-38-x86_64
+      - centos-stream-9-aarch64
+      - centos-stream-9-x86_64
+      - centos-stream-8-aarch64
+      - centos-stream-8-x86_64

   - <<: *copr
     # Run on commit to main branch
     trigger: commit
     branch: main
     project: podman-next
+    targets:
+      - fedora-rawhide-aarch64
+      - fedora-rawhide-x86_64
+      - fedora-eln-aarch64
+      - fedora-eln-x86_64
+      - fedora-38-aarch64
+      - fedora-38-x86_64
+      - centos-stream+epel-next-9-aarch64
+      - centos-stream+epel-next-9-ppc64le
+      - centos-stream+epel-next-9-s390x
+      - centos-stream+epel-next-9-x86_64
-- 
2.41.0

cfergeau and others added 4 commits July 26, 2023 15:24
fedora 37 only has go 1.19, build will fail after we update
gvisor.dev/gvisor as it can only be built with golang 1.20 or newer.

Based on a patch from Lokesh Mandvekar

Signed-off-by: Lokesh Mandvekar <lsm5@fedoraproject.org>
Signed-off-by: Christophe Fergeau <cfergeau@redhat.com>
It does not seem possible to keep compat with both golang 1.21 and 1.19.
golang 1.21 rc releases already landed in rawhide, and current
gvisor-tap-vsock git master is not buildable on these systems.
This minimum go version update is the first step towards fixing this.

containers#232
containers#219

Signed-off-by: Akihiro Suda <akihiro.suda.cz@hco.ntt.co.jp>
@cfergeau
Copy link
Contributor Author

We'll need to disable f37 packit builds for main branch as well. Could you please add this patch to update packit tasks?

The context for the diff you provided does not match what is in git main https://github.com/containers/gvisor-tap-vsock/blob/main/.packit.yaml
I've manually applied your changes and added them to this PR.

@lsm5
Copy link
Member

lsm5 commented Jul 26, 2023

We'll need to disable f37 packit builds for main branch as well. Could you please add this patch to update packit tasks?

The context for the diff you provided does not match what is in git main https://github.com/containers/gvisor-tap-vsock/blob/main/.packit.yaml I've manually applied your changes and added them to this PR.

My bad, I wrote it on another branch. Thanks a lot!

@lsm5
Copy link
Member

lsm5 commented Jul 27, 2023

@cfergeau @AkihiroSuda can we get this merged and cut a new release please?

@@ -17,7 +17,7 @@ jobs:
- name: Set up Go
uses: actions/setup-go@v3
with:
go-version: 1.18
go-version: 1.20.x
Copy link
Contributor

Choose a reason for hiding this comment

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

👍🏼

@praveenkumar
Copy link
Contributor

/lgtm
/approve

@openshift-ci
Copy link
Contributor

openshift-ci bot commented Jul 27, 2023

[APPROVALNOTIFIER] This PR is APPROVED

This pull-request has been approved by: cfergeau, praveenkumar

The full list of commands accepted by this bot can be found here.

The pull request process is described here

Needs approval from an approver in each of these files:

Approvers can indicate their approval by writing /approve in a comment
Approvers can cancel approval by writing /approve cancel in a comment

@praveenkumar
Copy link
Contributor

On crc side we need to keep using 0.6.2 until internal build system updated with golang-1.20.

@praveenkumar praveenkumar merged commit 277db24 into containers:main Jul 27, 2023
15 checks passed
@cfergeau cfergeau deleted the go121 branch July 28, 2023 08:47
Sign up for free to join this conversation on GitHub. Already have an account? Sign in to comment
Projects
None yet
Development

Successfully merging this pull request may close these issues.

gvisor update / go 1.20 switch
4 participants