Preliminary build support for macOS on aarch64 (M1) #4119
Merged
Conversation
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
trustin
force-pushed
the
apple_silicon
branch
2 times, most recently
from
743cbd2 to
82ef016
Compare
Codecov Report
@@ Coverage Diff @@
## master #4119 +/- ##
============================================
- Coverage 73.22% 73.21% -0.02%
+ Complexity 16134 16131 -3
============================================
Files 1405 1405
Lines 61669 61673 +4
Branches 7765 7766 +1
============================================
- Hits 45155 45151 -4
- Misses 12583 12590 +7
- Partials 3931 3932 +1
Continue to review full report at Codecov.
|
ikhoon
approved these changes
Feb 28, 2022
build.gradle
Outdated
| // Suppress the 'Class X is compiled by a pre-release version of Kotlin and | ||
| // cannot be loaded by this version of the compiler' error. | ||
| tasks.withType(KotlinCompile) { task -> | ||
| task.kotlinOptions.freeCompilerArgs += '-Xskip-prerelease-check' |
There was a problem hiding this comment.
Should we move the option to?
There was a problem hiding this comment.
We can. Let me send out a PR there and merge it.
trustin
force-pushed
the
apple_silicon
branch
2 times, most recently
from
28ccddb to
a52c7dd
Compare
Motivation:
Our current and future contributors can't build Armeria with their M1 MacBooks.
Modifications:
- Fixed the test cases that make false assumption that Brotli codec will
be always available.
- Fixed `FileService` so that it works as expected even when Brotli
codec is not available.
- Updated NPM to 8.5.2 for `docs-client`
- Updated `docs-client/package-lock.json`
- Fixed eslint and TypeScript compilation errors
- Disabled soon-to-be-deprecated eslint rule.
- Fixed a Kotlin compiler warning in `DataClassDocServiceTest`
- Added `-Xskip-prerelease-check` option to Kotlin compiler to work
around its complaints about the code compiled with a pre-release compiler.
- Misc:
- Increased the amount of time to wait for a future in
`AbstractTHttp2Client` for less flakiness
Result:
- A contributor can build Armeria on macOS with Apple Silicon (M1).
- Known issues:
- `:site` cannot be built yet. Need to upgrade a lot of
dependencies to make it happen.
- Parallel build sometimes results in a build failure related with
duplicate classes in a JAR.
- (defect) `FileService` doesn't choose a `.br` file for generating
decompressed content anymore when Brotli is not available.
Increase the timeout for `ManagementServiceTest`
ASDF
trustin
force-pushed
the
apple_silicon
branch
from
a52c7dd to
9fd52f0
Compare
minwoox
approved these changes
Feb 28, 2022
| @@ -84,7 +85,9 @@ void threadDumpWithJson() throws Exception { | |||
|
|
|||
| @Test | |||
| void heapDump() throws InterruptedException { | |||
| final WebClient client = WebClient.of(server.httpUri()); | |||
| final WebClient client = WebClient.builder(server.httpUri()) | |||
| .responseTimeout(Duration.ofSeconds(45)) // Heap dump can take time. | |||
There was a problem hiding this comment.
It seems like the request timeout of the server is not increased?
trustin
force-pushed
the
apple_silicon
branch
from
a144437 to
ffb7de6
Compare
wooseongshin
added a commit
to wooseongshin/armeria
that referenced
this pull request
Mar 2, 2022
This reverts commit 84cbaf1.
Sign up for free
to join this conversation on GitHub.
Already have an account?
Sign in to comment
Add this suggestion to a batch that can be applied as a single commit.
This suggestion is invalid because no changes were made to the code.
Suggestions cannot be applied while the pull request is closed.
Suggestions cannot be applied while viewing a subset of changes.
Only one suggestion per line can be applied in a batch.
Add this suggestion to a batch that can be applied as a single commit.
Applying suggestions on deleted lines is not supported.
You must change the existing code in this line in order to create a valid suggestion.
Outdated suggestions cannot be applied.
This suggestion has been applied or marked resolved.
Suggestions cannot be applied from pending reviews.
Suggestions cannot be applied on multi-line comments.
Suggestions cannot be applied while the pull request is queued to merge.
Suggestion cannot be applied right now. Please check back later.
Motivation:
Our current and future contributors can't build Armeria with their M1 MacBooks.
Modifications:
be always available.
FileServiceso that it works as expected even when Brotlicodec is not available.
docs-clientdocs-client/package-lock.jsonDataClassDocServiceTest-Xskip-prerelease-checkoption to Kotlin compiler to workaround its complaints about the code compiled with a pre-release compiler.
less flakiness.
Result:
:sitecannot be built yet. Need to upgrade a lot ofdependencies to make it happen.
duplicate classes in a JAR.
FileServicedoesn't choose a.brfile for generatingdecompressed content anymore when Brotli is not available.