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 go to version 1.21.3 and wireguard go to 20230223181233 #5559

Merged
merged 6 commits into from
Jan 4, 2024

Conversation

Pururun
Copy link
Contributor

@Pururun Pururun commented Dec 6, 2023


This change is Reviewable

Copy link

linear bot commented Dec 6, 2023

@faern
Copy link
Member

faern commented Dec 6, 2023

Make sure to either sync fully with the iOS team and/or make sure you don't touch what version of this they use.

@Pururun Pururun force-pushed the bump-wireguard-go-for-android-and-macos-droid-560 branch 4 times, most recently from 3bb1a5b to 86c2b92 Compare December 6, 2023 22:09
@Pururun Pururun added the Android Issues related to Android label Dec 6, 2023
@Pururun
Copy link
Contributor Author

Pururun commented Dec 7, 2023

Make sure to either sync fully with the iOS team and/or make sure you don't touch what version of this they use.

@pinkisemils says that it should be fine.

@Pururun Pururun force-pushed the bump-wireguard-go-for-android-and-macos-droid-560 branch 3 times, most recently from 24e73ca to def90ab Compare December 8, 2023 10:23
@Pururun Pururun marked this pull request as ready for review December 11, 2023 10:04
Copy link
Member

@dlon dlon left a comment

Choose a reason for hiding this comment

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

:lgtm: except for the outdated Linux container.

Reviewed 9 of 9 files at r1, all commit messages.
Reviewable status: all files reviewed, 1 unresolved discussion (waiting on @Pururun)


wireguard/libwg/go.sum line 6 at r1 (raw file):

golang.org/x/net v0.0.0-20220809184613-07c6da5e1ced/go.mod h1:YDH+HFinaLZZlnHAfSS6ZXJJ9M9t4Dl22yv3iI2vPwk=
golang.org/x/sys v0.0.0-20220808155132-1c4a2a72c664 h1:v1W7bwXHsnLLloWYTVEdvGvA7BHMeBYsPcF0GLDxIRs=
golang.org/x/sys v0.0.0-20220808155132-1c4a2a72c664/go.mod h1:oPkhp1MJrh7nUepCBck5+mAzfO9JrbApNNgaTdGDITg=

Can these old entries be pruned?

@Pururun Pururun force-pushed the bump-wireguard-go-for-android-and-macos-droid-560 branch from def90ab to 2d94f51 Compare December 12, 2023 09:34
Copy link
Collaborator

@albin-mullvad albin-mullvad left a comment

Choose a reason for hiding this comment

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

Reviewed 8 of 9 files at r1, all commit messages.
Reviewable status: all files reviewed, 2 unresolved discussions (waiting on @Pururun)


android/docker/goruntime-boottime-over-monotonic.diff line 1 at r1 (raw file):

From 61f3ae8298d1c503cbc31539e0f3a73446c7db9d Mon Sep 17 00:00:00 2001

Can you either make sure we only have a single copy of the patch file or create a new issue for that? 🙏

Copy link
Contributor Author

@Pururun Pururun left a comment

Choose a reason for hiding this comment

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

Reviewable status: 8 of 9 files reviewed, 1 unresolved discussion (waiting on @albin-mullvad and @dlon)


android/docker/goruntime-boottime-over-monotonic.diff line 1 at r1 (raw file):

Previously, albin-mullvad wrote…

Can you either make sure we only have a single copy of the patch file or create a new issue for that? 🙏

I could probably look into that.


wireguard/libwg/go.sum line 6 at r1 (raw file):

Previously, dlon (David Lönnhager) wrote…

Can these old entries be pruned?

Done

@dlon dlon requested a review from albin-mullvad December 12, 2023 15:37
Copy link
Member

@dlon dlon left a comment

Choose a reason for hiding this comment

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

Reviewed 1 of 1 files at r2, all commit messages.
Reviewable status: all files reviewed, 1 unresolved discussion (waiting on @albin-mullvad)

Copy link
Collaborator

@pinkisemils pinkisemils left a comment

Choose a reason for hiding this comment

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

Reviewed 8 of 9 files at r1, 1 of 1 files at r2, all commit messages.
Reviewable status: all files reviewed, 1 unresolved discussion (waiting on @albin-mullvad)

Copy link
Collaborator

@pinkisemils pinkisemils left a comment

Choose a reason for hiding this comment

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

Reviewable status: all files reviewed, 1 unresolved discussion (waiting on @albin-mullvad)

Copy link
Collaborator

@albin-mullvad albin-mullvad left a comment

Choose a reason for hiding this comment

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

Reviewed 1 of 1 files at r2, all commit messages.
Reviewable status: all files reviewed, 1 unresolved discussion

Copy link
Contributor

@Rawa Rawa left a comment

Choose a reason for hiding this comment

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

Reviewed all commit messages.
Reviewable status: all files reviewed, 1 unresolved discussion (waiting on @albin-mullvad)

@albin-mullvad albin-mullvad added the On hold Means the PR is paused for some reason. No need to review it for now label Dec 18, 2023
Copy link
Contributor Author

@Pururun Pururun left a comment

Choose a reason for hiding this comment

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

Reviewable status: all files reviewed, 1 unresolved discussion (waiting on @albin-mullvad)


android/docker/goruntime-boottime-over-monotonic.diff line 1 at r1 (raw file):

Previously, Pururun (Jonatan Rhodin) wrote…

I could probably look into that.

Added issue here:
https://linear.app/mullvad/issue/DROID-611/use-only-one-goruntime-boottime-over-monotonicdiff-file

@Pururun Pururun force-pushed the bump-wireguard-go-for-android-and-macos-droid-560 branch from 2d94f51 to b9fb34f Compare January 2, 2024 14:18
@Pururun Pururun removed the On hold Means the PR is paused for some reason. No need to review it for now label Jan 2, 2024
Copy link
Member

@dlon dlon left a comment

Choose a reason for hiding this comment

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

Reviewed 3 of 3 files at r3, all commit messages.
Reviewable status: all files reviewed, 1 unresolved discussion (waiting on @albin-mullvad)

@Pururun Pururun force-pushed the bump-wireguard-go-for-android-and-macos-droid-560 branch 2 times, most recently from 0f0049c to a322128 Compare January 3, 2024 15:57
Copy link
Collaborator

@albin-mullvad albin-mullvad left a comment

Choose a reason for hiding this comment

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

Reviewed 3 of 3 files at r3, 3 of 3 files at r4, 2 of 2 files at r5, all commit messages.
Reviewable status: all files reviewed, 2 unresolved discussions (waiting on @Pururun)


-- commits line 2 at r5:
Can this commit be a bit clarified and/or split since we have many commits related to bumping these version?

Code quote:

Update go to version 1.21.3 and wireguard go to 20230223181233

building/android-container-image.txt line 1 at r5 (raw file):

ghcr.io/mullvad/mullvadvpn-app-build-android:169361256

Can this be moved to a separate commit with a subject similar to the linux container bump?

Code quote:

169361256

Copy link
Collaborator

@albin-mullvad albin-mullvad left a comment

Choose a reason for hiding this comment

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

Except for cleaning up the commits a bit this looks good! :lgtm:

Reviewable status: all files reviewed, 2 unresolved discussions (waiting on @Pururun)

Copy link
Member

@faern faern left a comment

Choose a reason for hiding this comment

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

Reviewed 2 of 2 files at r5.
Reviewable status: all files reviewed, 2 unresolved discussions (waiting on @Pururun)

@Pururun Pururun force-pushed the bump-wireguard-go-for-android-and-macos-droid-560 branch from a322128 to bdebd0c Compare January 3, 2024 22:26
Copy link
Contributor Author

@Pururun Pururun left a comment

Choose a reason for hiding this comment

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

Reviewable status: 4 of 12 files reviewed, 2 unresolved discussions (waiting on @albin-mullvad, @dlon, and @pinkisemils)


-- commits line 2 at r5:

Previously, albin-mullvad wrote…

Can this commit be a bit clarified and/or split since we have many commits related to bumping these version?

Split into 4 different commits


building/android-container-image.txt line 1 at r5 (raw file):

Previously, albin-mullvad wrote…

Can this be moved to a separate commit with a subject similar to the linux container bump?

Done

Copy link
Collaborator

@albin-mullvad albin-mullvad left a comment

Choose a reason for hiding this comment

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

:lgtm:

Reviewed 8 of 8 files at r7, all commit messages.
Reviewable status: :shipit: complete! all files reviewed, all discussions resolved


-- commits line 2 at r5:

Previously, Pururun (Jonatan Rhodin) wrote…

Split into 4 different commits

Nice! 👍

Copy link
Member

@dlon dlon left a comment

Choose a reason for hiding this comment

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

:lgtm:

Reviewed all commit messages.
Reviewable status: :shipit: complete! all files reviewed, all discussions resolved

@Pururun Pururun force-pushed the bump-wireguard-go-for-android-and-macos-droid-560 branch from bdebd0c to bcd26bc Compare January 4, 2024 09:24
@Pururun Pururun merged commit 14674ce into main Jan 4, 2024
26 checks passed
@Pururun Pururun deleted the bump-wireguard-go-for-android-and-macos-droid-560 branch January 4, 2024 09:25
Sign up for free to join this conversation on GitHub. Already have an account? Sign in to comment
Labels
Android Issues related to Android
Projects
None yet
Development

Successfully merging this pull request may close these issues.

6 participants