diff options
| author | Jarret Shook <jashoo@microsoft.com> | 2019-02-12 14:38:27 -0800 |
|---|---|---|
| committer | GitHub <noreply@github.com> | 2019-02-12 14:38:27 -0800 |
| commit | de2fe10e6f53dd4f05f04e9ddad0ccd7619829a0 (patch) | |
| tree | ab16363e2fd8908deb3b6dc0950a68c98f9fdda4 /eng | |
| parent | 8ad7d5e57e0eb0308453895693a996f5a93c8e08 (diff) | |
| download | coreclr-de2fe10e6f53dd4f05f04e9ddad0ccd7619829a0.tar.gz coreclr-de2fe10e6f53dd4f05f04e9ddad0ccd7619829a0.tar.bz2 coreclr-de2fe10e6f53dd4f05f04e9ddad0ccd7619829a0.zip | |
Enable arm64 linux musl builds (#22495)
* Enable arm64 linux musl builds
Note that -clang5.0 is required to be passed.
* Fix syntax error
* Pass clang arg to build-test.sh
Diffstat (limited to 'eng')
| -rw-r--r-- | eng/build-job.yml | 3 | ||||
| -rw-r--r-- | eng/platform-matrix.yml | 21 | ||||
| -rw-r--r-- | eng/test-job.yml | 12 |
3 files changed, 35 insertions, 1 deletions
diff --git a/eng/build-job.yml b/eng/build-job.yml index 782f77c3ba..f5d7b2293b 100644 --- a/eng/build-job.yml +++ b/eng/build-job.yml @@ -56,6 +56,9 @@ jobs: - ${{ if eq(parameters.osGroup, 'FreeBSD') }}: - name: clangArg value: '-clang6.0' + - ${{ if and(eq(parameters.osIdentifier, 'Linux_musl'), eq(parameters.archType, 'arm64')) }}: + - name: clangArg + value: '-clang5.0' - ${{ if and(ne(variables['System.TeamProject'], 'public'), ne(variables['Build.Reason'], 'PullRequest')) }}: # Variables used to publish packages to blob feed - name: dotnetfeedUrl diff --git a/eng/platform-matrix.yml b/eng/platform-matrix.yml index dd41bba394..e0c3a14477 100644 --- a/eng/platform-matrix.yml +++ b/eng/platform-matrix.yml @@ -79,6 +79,27 @@ jobs: - Alpine.38.Amd64 ${{ insert }}: ${{ parameters.jobParameters }} +# Linux musl arm64 + +- template: ${{ parameters.jobTemplate }} + parameters: + buildConfig: ${{ parameters.buildConfig }} + archType: arm64 + osGroup: Linux + osIdentifier: Linux_musl + containerName: musl_arm64_build_image + helixQueues: + ${{ if eq(variables['System.TeamProject'], 'public') }}: + # TODO: there are no Alpine arm64 queues https://github.com/dotnet/core-eng/issues/5206 + asString: '' + asArray: [] + ${{ if eq(variables['System.TeamProject'], 'internal') }}: + # TODO: there are no Alpine arm64 queues https://github.com/dotnet/core-eng/issues/5206 + asString: '' + asArray: [] + crossrootfsDir: '/crossrootfs/arm64' + ${{ insert }}: ${{ parameters.jobParameters }} + # RHEL 6 - template: ${{ parameters.jobTemplate }} diff --git a/eng/test-job.yml b/eng/test-job.yml index 2026fd0a64..4c8d9978b7 100644 --- a/eng/test-job.yml +++ b/eng/test-job.yml @@ -61,6 +61,16 @@ jobs: - name: crossgenArg value: '' + - name: clangArg + value: '' + # Our FreeBSD doesn't yet detect available clang versions, so pass it explicitly. + - ${{ if eq(parameters.osGroup, 'FreeBSD') }}: + - name: clangArg + value: '-clang6.0' + - ${{ if and(eq(parameters.osIdentifier, 'Linux_musl'), eq(parameters.archType, 'arm64')) }}: + - name: clangArg + value: '-clang5.0' + # TODO: Enable crossgen in build-test.sh. It currently doesn't # accept a crossgen arg, so disable the macos/linux crossgen test # build jobs. @@ -106,7 +116,7 @@ jobs: # Build tests # TODO: enable crossgen in build-test.sh - ${{ if ne(parameters.osGroup, 'Windows_NT') }}: - - script: ./build-test.sh $(buildConfig) $(archType) $(crossArg) $(priorityArg) $(crossgenArg) + - script: ./build-test.sh $(buildConfig) $(archType) $(crossArg) $(priorityArg) $(crossgenArg) $(clangArg) displayName: Build tests - ${{ if eq(parameters.osGroup, 'Windows_NT') }}: - script: build-test.cmd $(buildConfig) $(archType) $(priorityArg) $(crossgenArg) |