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

Add daemon CI job for Windows ARM64 #7258

Merged
merged 1 commit into from
Dec 2, 2024
Merged

Add daemon CI job for Windows ARM64 #7258

merged 1 commit into from
Dec 2, 2024

Conversation

dlon
Copy link
Member

@dlon dlon commented Nov 28, 2024

This PR doesn't include clippy, since those are (probably) not architecture-dependent, or the test workspace for now. It also does not include GUI or full E2E tests.

Close DES-1120


This change is Reviewable

Copy link

linear bot commented Nov 28, 2024

@dlon dlon requested a review from hulthe November 28, 2024 14:12
Copy link
Contributor

@hulthe hulthe 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 r1, all commit messages.
Reviewable status: all files reviewed, 4 unresolved discussions (waiting on @dlon)


.github/workflows/daemon.yml line 137 at r1 (raw file):

      - name: Install Protoc
        if: ${{ matrix.config.arch == 'x64' }}

do we not need protoc on arm?


.github/workflows/daemon.yml line 144 at r1 (raw file):

      - name: Calculate Windows libraries cache hash
        if: ${{ matrix.config.arch == 'x64' }}
        id: windows-modules-hash

do we not need/want this on arm?


.github/workflows/daemon.yml line 154 at r1 (raw file):

      - name: Cache Windows libraries
        if: ${{ matrix.config.arch == 'x64' }}

do we not need/want this on arm?


.github/workflows/daemon.yml line 183 at r1 (raw file):

      - name: Install msbuild
        if: ${{ matrix.config.arch == 'x64' }}

do we not need msbuild on arm?

@hulthe hulthe added the Daemon Issues related to mullvad-daemon label Nov 28, 2024
Copy link
Member Author

@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.

Reviewable status: all files reviewed, 4 unresolved discussions (waiting on @hulthe)


.github/workflows/daemon.yml line 137 at r1 (raw file):

Previously, hulthe (Joakim Hulthe) wrote…

do we not need protoc on arm?

It's installed on the runner, so I figured it was wasteful to keep it. Let's enable it and see if anything breaks.


.github/workflows/daemon.yml line 144 at r1 (raw file):

Previously, hulthe (Joakim Hulthe) wrote…

do we not need/want this on arm?

Let's enable it and see if it just works.


.github/workflows/daemon.yml line 154 at r1 (raw file):

Previously, hulthe (Joakim Hulthe) wrote…

do we not need/want this on arm?

Let's enable it and see if it just works.


.github/workflows/daemon.yml line 183 at r1 (raw file):

Previously, hulthe (Joakim Hulthe) wrote…

do we not need msbuild on arm?

It's installed on the runner, so I figured it was wasteful to keep it. Let's enable it and see if anything breaks.

@dlon dlon changed the base branch from main to win-fix-linker-err December 2, 2024 08:29
@dlon dlon requested a review from hulthe December 2, 2024 12:32
hulthe
hulthe previously approved these changes Dec 2, 2024
Copy link
Contributor

@hulthe hulthe 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 r3, all commit messages.
Reviewable status: :shipit: complete! all files reviewed, all discussions resolved


.github/workflows/daemon.yml line 137 at r1 (raw file):

Previously, dlon (David Lönnhager) wrote…

It's installed on the runner, so I figured it was wasteful to keep it. Let's enable it and see if anything breaks.

Makes sense. If it cuts down on run time, I'm all for it. Any if arch guards here should imo be documented though


.github/workflows/daemon.yml line 183 at r1 (raw file):

Previously, dlon (David Lönnhager) wrote…

It's installed on the runner, so I figured it was wasteful to keep it. Let's enable it and see if anything breaks.

👍 See my other comment

@dlon dlon force-pushed the win-fix-linker-err branch 2 times, most recently from ddcc05a to 7f037fa Compare December 2, 2024 13:09
Base automatically changed from win-fix-linker-err to main December 2, 2024 13:12
@dlon dlon dismissed hulthe’s stale review December 2, 2024 13:12

The base branch was changed.

Copy link
Member Author

@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.

Reviewable status: :shipit: complete! all files reviewed, all discussions resolved


.github/workflows/daemon.yml line 137 at r1 (raw file):

Previously, hulthe (Joakim Hulthe) wrote…

Makes sense. If it cuts down on run time, I'm all for it. Any if arch guards here should imo be documented though

Done.


.github/workflows/daemon.yml line 183 at r1 (raw file):

Previously, hulthe (Joakim Hulthe) wrote…

👍 See my other comment

I left it in in this case. This action detects that it is already installed, so it saves no time.

Copy link
Contributor

@hulthe hulthe 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 r4, all commit messages.
Reviewable status: :shipit: complete! all files reviewed, all discussions resolved

@dlon dlon merged commit fb88bcf into main Dec 2, 2024
20 checks passed
@dlon dlon deleted the ci-win-arm64-sh branch December 2, 2024 13:37
Sign up for free to join this conversation on GitHub. Already have an account? Sign in to comment
Labels
Daemon Issues related to mullvad-daemon
Projects
None yet
Development

Successfully merging this pull request may close these issues.

2 participants