diff options
author | bors[bot] <26634292+bors[bot]@users.noreply.github.com> | 2021-01-17 14:50:08 +0000 |
---|---|---|
committer | GitHub <[email protected]> | 2021-01-17 14:50:08 +0000 |
commit | b01157aee33acc751f368397dc77702ae8d0a6c3 (patch) | |
tree | daba8cc1d0519f99671d17f49f48cae6457715e1 | |
parent | 6967a432faffb683460c614f9575390e5f33716d (diff) | |
parent | a19728604f87ceae625e9d05d464ff3a8eba3f92 (diff) |
Merge #7311
7311: Build dist-aarch64-unknown-linux-gnu releases r=lnicola a=lnicola
Closes #4746
Co-authored-by: Laurențiu Nicola <[email protected]>
-rw-r--r-- | .github/workflows/release.yaml | 37 | ||||
-rw-r--r-- | editors/code/src/main.ts | 1 |
2 files changed, 37 insertions, 1 deletions
diff --git a/.github/workflows/release.yaml b/.github/workflows/release.yaml index ece1fd364..a97ed24ba 100644 --- a/.github/workflows/release.yaml +++ b/.github/workflows/release.yaml | |||
@@ -118,6 +118,37 @@ jobs: | |||
118 | name: dist-x86_64-unknown-linux-gnu | 118 | name: dist-x86_64-unknown-linux-gnu |
119 | path: ./dist | 119 | path: ./dist |
120 | 120 | ||
121 | dist-aarch64-unknown-linux-gnu: | ||
122 | name: dist (aarch64-unknown-linux-gnu) | ||
123 | runs-on: ubuntu-16.04 | ||
124 | env: | ||
125 | RA_TARGET: aarch64-unknown-linux-gnu | ||
126 | CARGO_TARGET_AARCH64_UNKNOWN_LINUX_GNU_LINKER: aarch64-linux-gnu-gcc | ||
127 | |||
128 | steps: | ||
129 | - name: Checkout repository | ||
130 | uses: actions/checkout@v2 | ||
131 | |||
132 | - name: Install Rust toolchain | ||
133 | uses: actions-rs/toolchain@v1 | ||
134 | with: | ||
135 | toolchain: stable | ||
136 | target: aarch64-unknown-linux-gnu | ||
137 | profile: minimal | ||
138 | override: true | ||
139 | |||
140 | - name: Install target toolchain | ||
141 | run: sudo apt-get install gcc-aarch64-linux-gnu | ||
142 | |||
143 | - name: Dist | ||
144 | run: cargo xtask dist | ||
145 | |||
146 | - name: Upload artifacts | ||
147 | uses: actions/upload-artifact@v1 | ||
148 | with: | ||
149 | name: dist-aarch64-unknown-linux-gnu | ||
150 | path: ./dist | ||
151 | |||
121 | dist-x86_64-apple-darwin: | 152 | dist-x86_64-apple-darwin: |
122 | name: dist (x86_64-apple-darwin) | 153 | name: dist (x86_64-apple-darwin) |
123 | runs-on: macos-latest | 154 | runs-on: macos-latest |
@@ -174,7 +205,7 @@ jobs: | |||
174 | publish: | 205 | publish: |
175 | name: publish | 206 | name: publish |
176 | runs-on: ubuntu-16.04 | 207 | runs-on: ubuntu-16.04 |
177 | needs: ['dist-x86_64-pc-windows-msvc', 'dist-aarch64-pc-windows-msvc', 'dist-x86_64-unknown-linux-gnu', 'dist-x86_64-apple-darwin', 'dist-aarch64-apple-darwin'] | 208 | needs: ['dist-x86_64-pc-windows-msvc', 'dist-aarch64-pc-windows-msvc', 'dist-x86_64-unknown-linux-gnu', 'dist-aarch64-unknown-linux-gnu', 'dist-x86_64-apple-darwin', 'dist-aarch64-apple-darwin'] |
178 | steps: | 209 | steps: |
179 | - name: Install Nodejs | 210 | - name: Install Nodejs |
180 | uses: actions/setup-node@v1 | 211 | uses: actions/setup-node@v1 |
@@ -207,6 +238,10 @@ jobs: | |||
207 | path: dist | 238 | path: dist |
208 | - uses: actions/download-artifact@v1 | 239 | - uses: actions/download-artifact@v1 |
209 | with: | 240 | with: |
241 | name: dist-aarch64-unknown-linux-gnu | ||
242 | path: dist | ||
243 | - uses: actions/download-artifact@v1 | ||
244 | with: | ||
210 | name: dist-x86_64-pc-windows-msvc | 245 | name: dist-x86_64-pc-windows-msvc |
211 | path: dist | 246 | path: dist |
212 | - uses: actions/download-artifact@v1 | 247 | - uses: actions/download-artifact@v1 |
diff --git a/editors/code/src/main.ts b/editors/code/src/main.ts index e598c2c84..1edb7713d 100644 --- a/editors/code/src/main.ts +++ b/editors/code/src/main.ts | |||
@@ -294,6 +294,7 @@ async function getServer(config: Config, state: PersistentState): Promise<string | |||
294 | "x64 linux": "x86_64-unknown-linux-gnu", | 294 | "x64 linux": "x86_64-unknown-linux-gnu", |
295 | "x64 darwin": "x86_64-apple-darwin", | 295 | "x64 darwin": "x86_64-apple-darwin", |
296 | "arm64 win32": "aarch64-pc-windows-msvc", | 296 | "arm64 win32": "aarch64-pc-windows-msvc", |
297 | "arm64 linux": "aarch64-unknown-linux-gnu", | ||
297 | "arm64 darwin": "aarch64-apple-darwin", | 298 | "arm64 darwin": "aarch64-apple-darwin", |
298 | }; | 299 | }; |
299 | const platform = platforms[`${process.arch} ${process.platform}`]; | 300 | const platform = platforms[`${process.arch} ${process.platform}`]; |