Skip to content

Commit f3aa303

Browse files
committed
Merge tag 'v1.11.0' into sc
* Remove Piwik support ([\#8835](matrix-org/matrix-react-sdk#8835)). * Support compilation on more Linux targets ([\element-hq#376](element-hq#376)). Contributed by @jcgruenhage. * Document how to configure a custom `home.html`. ([\#21066](element-hq/element-web#21066)). Contributed by @johannes-krude. * Move New Search Experience out of beta ([\#8859](matrix-org/matrix-react-sdk#8859)). Contributed by @justjanne. * Switch video rooms to spotlight layout when in PiP mode ([\#8912](matrix-org/matrix-react-sdk#8912)). Fixes element-hq/element-web#22574. * Live location sharing - render message deleted tile for redacted beacons ([\#8905](matrix-org/matrix-react-sdk#8905)). Contributed by @kerryarchibald. * Improve view source dialog style ([\#8883](matrix-org/matrix-react-sdk#8883)). Fixes element-hq/element-web#22636. Contributed by @luixxiul. * Improve integration manager dialog style ([\#8888](matrix-org/matrix-react-sdk#8888)). Fixes element-hq/element-web#22642. Contributed by @luixxiul. * Implement MSC3827: Filtering of `/publicRooms` by room type ([\#8866](matrix-org/matrix-react-sdk#8866)). Fixes element-hq/element-web#22578. * Show chat panel when opening a video room with unread messages ([\#8812](matrix-org/matrix-react-sdk#8812)). Fixes element-hq/element-web#22527. * Live location share - forward latest location ([\#8860](matrix-org/matrix-react-sdk#8860)). Contributed by @kerryarchibald. * Allow integration managers to validate user identity after opening ([\#8782](matrix-org/matrix-react-sdk#8782)). Contributed by @Half-Shot. * Create a common header on right panel cards on BaseCard ([\#8808](matrix-org/matrix-react-sdk#8808)). Contributed by @luixxiul. * Integrate searching public rooms and people into the new search experience ([\#8707](matrix-org/matrix-react-sdk#8707)). Fixes element-hq/element-web#21354 and element-hq/element-web#19349. Contributed by @justjanne. * Bring back waveform for voice messages and retain seeking ([\#8843](matrix-org/matrix-react-sdk#8843)). Fixes element-hq/element-web#21904. * Improve colors in settings ([\#7283](matrix-org/matrix-react-sdk#7283)). * Keep draft in composer when a slash command syntax errors ([\#8811](matrix-org/matrix-react-sdk#8811)). Fixes element-hq/element-web#22384. * Release video rooms as a beta feature ([\#8431](matrix-org/matrix-react-sdk#8431)). * Clarify logout key backup warning dialog. Contributed by @notramo. ([\#8741](matrix-org/matrix-react-sdk#8741)). Fixes element-hq/element-web#15565. Contributed by @MadLittleMods. * Slightly improve the look of the `Message edits` dialog ([\#8763](matrix-org/matrix-react-sdk#8763)). Fixes element-hq/element-web#22410. * Add support for MD / HTML in room topics ([\#8215](matrix-org/matrix-react-sdk#8215)). Fixes element-hq/element-web#5180. Contributed by @Johennes. * Live location share - link to timeline tile from share warning ([\#8752](matrix-org/matrix-react-sdk#8752)). Contributed by @kerryarchibald. * Improve composer visiblity ([\#8578](matrix-org/matrix-react-sdk#8578)). Fixes vector-im/element-web#22072 and element-hq/element-web#17362. * Makes the avatar of the user menu non-draggable ([\#8765](matrix-org/matrix-react-sdk#8765)). Contributed by @luixxiul. * Improve widget buttons behaviour and layout ([\#8734](matrix-org/matrix-react-sdk#8734)). * Use AccessibleButton for 'Reset All' link button on SetupEncryptionBody ([\#8730](matrix-org/matrix-react-sdk#8730)). Contributed by @luixxiul. * Adjust message timestamp position on TimelineCard in non-bubble layouts ([\#8745](matrix-org/matrix-react-sdk#8745)). Fixes element-hq/element-web#22426. Contributed by @luixxiul. * Use AccessibleButton for 'In reply to' link button on ReplyChain ([\#8726](matrix-org/matrix-react-sdk#8726)). Fixes element-hq/element-web#22407. Contributed by @luixxiul. * Live location share - enable reply and react to tiles ([\#8721](matrix-org/matrix-react-sdk#8721)). Contributed by @kerryarchibald. * Change dash to em dash issues fixed ([\#8455](matrix-org/matrix-react-sdk#8455)). Fixes element-hq/element-web#21895. Contributed by @goelesha. * Upgrade to Electron 19 ([\element-hq#372](element-hq#372)). Fixes element-hq/element-web#21147. * Reduce video rooms log spam ([\#22665](element-hq/element-web#22665)). * Connect to Jitsi unmuted by default ([\#22660](element-hq/element-web#22660)). Fixes element-hq/element-web#22637. * Work around a Jitsi bug with display name encoding ([\#22525](element-hq/element-web#22525)). Fixes element-hq/element-web#22521. * Make invite dialogue fixed height ([\#8945](matrix-org/matrix-react-sdk#8945)). * Correct issue with tab order in new search experience ([\#8919](matrix-org/matrix-react-sdk#8919)). Fixes element-hq/element-web#22670. Contributed by @justjanne. * Clicking location replies now redirects to the replied event instead of opening the map ([\#8918](matrix-org/matrix-react-sdk#8918)). Fixes element-hq/element-web#22667. * Keep clicks on pills within the app ([\#8917](matrix-org/matrix-react-sdk#8917)). Fixes element-hq/element-web#22653. * Don't overlap tile bubbles with timestamps in modern layout ([\#8908](matrix-org/matrix-react-sdk#8908)). Fixes element-hq/element-web#22425. * Connect to Jitsi unmuted by default ([\#8909](matrix-org/matrix-react-sdk#8909)). * Maximize width value of display name on TimelineCard with IRC/modern layout ([\#8904](matrix-org/matrix-react-sdk#8904)). Fixes element-hq/element-web#22651. Contributed by @luixxiul. * Align the avatar and the display name on TimelineCard ([\#8900](matrix-org/matrix-react-sdk#8900)). Contributed by @luixxiul. * Remove inline margin from reactions row on IRC layout ([\#8891](matrix-org/matrix-react-sdk#8891)). Fixes element-hq/element-web#22644. Contributed by @luixxiul. * Align "From a thread" on search result panel on IRC layout ([\#8892](matrix-org/matrix-react-sdk#8892)). Fixes element-hq/element-web#22645. Contributed by @luixxiul. * Display description of E2E advanced panel as subsection text ([\#8889](matrix-org/matrix-react-sdk#8889)). Contributed by @luixxiul. * Remove inline end margin from images on file panel ([\#8886](matrix-org/matrix-react-sdk#8886)). Fixes element-hq/element-web#22640. Contributed by @luixxiul. * Disable option to `Quote` when we don't have sufficient permissions ([\#8893](matrix-org/matrix-react-sdk#8893)). Fixes element-hq/element-web#22643. * Add padding to font scaling loader for message bubble layout ([\#8875](matrix-org/matrix-react-sdk#8875)). Fixes element-hq/element-web#22626. Contributed by @luixxiul. * Set 100% max-width to display name on reply tiles ([\#8867](matrix-org/matrix-react-sdk#8867)). Fixes element-hq/element-web#22615. Contributed by @luixxiul. * Fix alignment of pill letter ([\#8874](matrix-org/matrix-react-sdk#8874)). Fixes element-hq/element-web#22622. Contributed by @luixxiul. * Move the beta pill to the right side and display the pill on video room only ([\#8873](matrix-org/matrix-react-sdk#8873)). Fixes element-hq/element-web#22619 and element-hq/element-web#22620. Contributed by @luixxiul. * Stop using absolute property to place beta pill on RoomPreviewCard ([\#8872](matrix-org/matrix-react-sdk#8872)). Fixes element-hq/element-web#22617. Contributed by @luixxiul. * Make the pill text single line ([\#8744](matrix-org/matrix-react-sdk#8744)). Fixes element-hq/element-web#22427. Contributed by @luixxiul. * Hide overflow of public room description on spotlight dialog result ([\#8870](matrix-org/matrix-react-sdk#8870)). Contributed by @luixxiul. * Fix position of message action bar on the info tile on TimelineCard in message bubble layout ([\#8865](matrix-org/matrix-react-sdk#8865)). Fixes element-hq/element-web#22614. Contributed by @luixxiul. * Remove inline start margin from display name on reply tiles on TimelineCard ([\#8864](matrix-org/matrix-react-sdk#8864)). Fixes element-hq/element-web#22613. Contributed by @luixxiul. * Improve homeserver dropdown dialog styling ([\#8850](matrix-org/matrix-react-sdk#8850)). Fixes element-hq/element-web#22552. Contributed by @justjanne. * Fix crash when drawing blurHash for portrait videos PSB-139 ([\#8855](matrix-org/matrix-react-sdk#8855)). Fixes element-hq/element-web#22597. Contributed by @andybalaam. * Fix grid blowout on pinned event tiles ([\#8816](matrix-org/matrix-react-sdk#8816)). Fixes element-hq/element-web#22543. Contributed by @luixxiul. * Fix temporary sync errors if there's weird settings stored in account data ([\#8857](matrix-org/matrix-react-sdk#8857)). * Fix reactions row overflow and gap between reactions ([\#8813](matrix-org/matrix-react-sdk#8813)). Fixes element-hq/element-web#22093. Contributed by @luixxiul. * Fix issues with the Create new room button in Spotlight ([\#8851](matrix-org/matrix-react-sdk#8851)). Contributed by @justjanne. * Remove margin from E2E icon between avatar and hidden event ([\#8584](matrix-org/matrix-react-sdk#8584)). Fixes element-hq/element-web#22186. Contributed by @luixxiul. * Fix waveform on a message bubble ([\#8852](matrix-org/matrix-react-sdk#8852)). Contributed by @luixxiul. * Location sharing maps are now loaded after reconnection ([\#8848](matrix-org/matrix-react-sdk#8848)). Fixes element-hq/element-web#20993. * Update the avatar mask so it doesn’t cut off spaces’ avatars anymore ([\#8849](matrix-org/matrix-react-sdk#8849)). Contributed by @justjanne. * Add a bit of safety around timestamp handling for threads ([\#8845](matrix-org/matrix-react-sdk#8845)). * Remove top margin from event tile on a narrow viewport ([\#8814](matrix-org/matrix-react-sdk#8814)). Contributed by @luixxiul. * Fix keyboard shortcuts on settings tab being wrapped ([\#8825](matrix-org/matrix-react-sdk#8825)). Fixes element-hq/element-web#22547. Contributed by @luixxiul. * Add try-catch around blurhash loading ([\#8830](matrix-org/matrix-react-sdk#8830)). * Prevent new composer from overflowing from non-breakable text ([\#8829](matrix-org/matrix-react-sdk#8829)). Fixes element-hq/element-web#22507. Contributed by @justjanne. * Use common subheading on sidebar user settings tab ([\#8823](matrix-org/matrix-react-sdk#8823)). Contributed by @luixxiul. * Fix clickable area of advanced toggle on appearance user settings tab ([\#8820](matrix-org/matrix-react-sdk#8820)). Fixes element-hq/element-web#22546. Contributed by @luixxiul. * Disable redacting reactions if we don't have sufficient permissions ([\#8767](matrix-org/matrix-react-sdk#8767)). Fixes element-hq/element-web#22262. * Update the live timeline when the JS SDK resets it ([\#8806](matrix-org/matrix-react-sdk#8806)). Fixes element-hq/element-web#22421. * Fix flex blowout on image reply ([\#8809](matrix-org/matrix-react-sdk#8809)). Fixes element-hq/element-web#22509 and element-hq/element-web#22510. Contributed by @luixxiul. * Enable background color on hover for chat panel and thread panel ([\#8644](matrix-org/matrix-react-sdk#8644)). Fixes element-hq/element-web#22273. Contributed by @luixxiul. * Fix #20026: send read marker as soon as we change it ([\#8802](matrix-org/matrix-react-sdk#8802)). Fixes element-hq/element-web#20026. Contributed by @andybalaam. * Allow AppTiles to shrink as much as necessary ([\#8805](matrix-org/matrix-react-sdk#8805)). Fixes element-hq/element-web#22499. * Make widgets in video rooms immutable again ([\#8803](matrix-org/matrix-react-sdk#8803)). Fixes element-hq/element-web#22497. * Use MessageActionBar style declarations on pinned message card ([\#8757](matrix-org/matrix-react-sdk#8757)). Fixes element-hq/element-web#22444. Contributed by @luixxiul. * Expire video member events after 1 hour ([\#8776](matrix-org/matrix-react-sdk#8776)). * Name lists on invite dialog ([\#8046](matrix-org/matrix-react-sdk#8046)). Fixes element-hq/element-web#21400 and element-hq/element-web#19463. Contributed by @luixxiul. * Live location share - show loading UI for beacons with start timestamp in the future ([\#8775](matrix-org/matrix-react-sdk#8775)). Fixes element-hq/element-web#22437. Contributed by @kerryarchibald. * Fix scroll jump issue with the composer ([\#8788](matrix-org/matrix-react-sdk#8788)). Fixes element-hq/element-web#22464. * Fix the incorrect nesting of download button on MessageActionBar ([\#8785](matrix-org/matrix-react-sdk#8785)). Contributed by @luixxiul. * Revert link color change in composer ([\#8784](matrix-org/matrix-react-sdk#8784)). Fixes element-hq/element-web#22468. * Fix 'Logout' inline link on the splash screen ([\#8770](matrix-org/matrix-react-sdk#8770)). Fixes element-hq/element-web#22449. Contributed by @luixxiul. * Fix disappearing widget poput button when changing the widget layout ([\#8754](matrix-org/matrix-react-sdk#8754)). * Reduce gutter with the new read receipt UI ([\#8736](matrix-org/matrix-react-sdk#8736)). Fixes element-hq/element-web#21890. * Add ellipsis effect to hidden beacon status ([\#8755](matrix-org/matrix-react-sdk#8755)). Fixes element-hq/element-web#22441. Contributed by @luixxiul. * Make the pill on the basic message composer compatible with display name in RTL languages ([\#8758](matrix-org/matrix-react-sdk#8758)). Fixes element-hq/element-web#22445. Contributed by @luixxiul. * Prevent the banner text from being selected, replacing the spacing values with the variable ([\#8756](matrix-org/matrix-react-sdk#8756)). Fixes element-hq/element-web#22442. Contributed by @luixxiul. * Ensure the first device on a newly-registered account gets cross-signed properly ([\#8750](matrix-org/matrix-react-sdk#8750)). Fixes element-hq/element-web#21977. Contributed by @duxovni. * Hide live location option in threads composer ([\#8746](matrix-org/matrix-react-sdk#8746)). Fixes element-hq/element-web#22424. Contributed by @kerryarchibald. * Make sure MessageTimestamp is not hidden by EventTile_line on TimelineCard ([\#8748](matrix-org/matrix-react-sdk#8748)). Contributed by @luixxiul. * Make PiP motion smoother and react to window resizes correctly ([\#8747](matrix-org/matrix-react-sdk#8747)). Fixes element-hq/element-web#22292. * Prevent Invite and DevTools dialogs from being cut off ([\#8646](matrix-org/matrix-react-sdk#8646)). Fixes element-hq/element-web#20911 and undefined/matrix-react-sdk#8165. Contributed by @justjanne. * Squish event bubble tiles less ([\#8740](matrix-org/matrix-react-sdk#8740)). * Use random widget IDs for video rooms ([\#8739](matrix-org/matrix-react-sdk#8739)). Fixes element-hq/element-web#22417. * Fix read avatars overflow from the right chat panel with a maximized widget on bubble message layout ([\#8470](matrix-org/matrix-react-sdk#8470)). Contributed by @luixxiul. * Fix `CallView` crash ([\#8735](matrix-org/matrix-react-sdk#8735)). Fixes element-hq/element-web#22394.
2 parents a953103 + 762ad2d commit f3aa303

File tree

7 files changed

+322
-114
lines changed

7 files changed

+322
-114
lines changed

.github/workflows/build.yaml

Lines changed: 21 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -68,6 +68,13 @@ jobs:
6868
6969
- name: Build App
7070
run: "yarn build --publish never -w ${{ matrix.build-args }}"
71+
72+
- name: Upload Artifacts
73+
uses: actions/upload-artifact@v3
74+
with:
75+
name: win-${{ matrix.arch }}
76+
path: dist
77+
retention-days: 1
7178

7279
linux:
7380
strategy:
@@ -112,6 +119,13 @@ jobs:
112119

113120
- name: Build App
114121
run: "yarn build --publish never"
122+
123+
- name: Upload Artifacts
124+
uses: actions/upload-artifact@v3
125+
with:
126+
name: linux-sqlcipher-${{ matrix.sqlcipher }}
127+
path: dist
128+
retention-days: 1
115129

116130
macos:
117131
name: macOS (universal)
@@ -145,3 +159,10 @@ jobs:
145159

146160
- name: Build App
147161
run: "yarn build:universal --publish never"
162+
163+
- name: Upload Artifacts
164+
uses: actions/upload-artifact@v3
165+
with:
166+
name: macos
167+
path: dist
168+
retention-days: 1

.github/workflows/pull_request.yaml

Lines changed: 6 additions & 20 deletions
Original file line numberDiff line numberDiff line change
@@ -4,23 +4,9 @@ on:
44
types: [ opened, edited, labeled, unlabeled, synchronize ]
55
concurrency: ${{ github.workflow }}-${{ github.event.pull_request.head.ref }}
66
jobs:
7-
changelog:
8-
name: Preview Changelog
9-
if: github.event.action != 'synchronize'
10-
runs-on: ubuntu-latest
11-
steps:
12-
- uses: matrix-org/allchange@main
13-
with:
14-
ghToken: ${{ secrets.GITHUB_TOKEN }}
15-
16-
enforce-label:
17-
name: Enforce Labels
18-
runs-on: ubuntu-latest
19-
permissions:
20-
pull-requests: read
21-
steps:
22-
- uses: yogevbd/[email protected]
23-
with:
24-
REQUIRED_LABELS_ANY: "T-Defect,T-Enhancement,T-Task"
25-
BANNED_LABELS: "X-Blocked"
26-
BANNED_LABELS_DESCRIPTION: "Preventing merge whilst PR is marked blocked!"
7+
action:
8+
uses: matrix-org/matrix-js-sdk/.github/workflows/pull_request.yaml@develop
9+
with:
10+
labels: "T-Defect,T-Enhancement,T-Task"
11+
secrets:
12+
ELEMENT_BOT_TOKEN: ${{ secrets.ELEMENT_BOT_TOKEN }}

CHANGELOG.md

Lines changed: 111 additions & 0 deletions
Large diffs are not rendered by default.

element.io/nightly/config.json

Lines changed: 3 additions & 6 deletions
Original file line numberDiff line numberDiff line change
@@ -15,11 +15,6 @@
1515
"bug_report_endpoint_url": "https://element.io/bugreports/submit",
1616
"uisi_autorageshake_app": "element-auto-uisi",
1717
"showLabsSettings": true,
18-
"piwik": {
19-
"url": "https://piwik.riot.im/",
20-
"siteId": 1,
21-
"policyUrl": "https://element.io/cookie-policy"
22-
},
2318
"roomDirectory": {
2419
"servers": [
2520
"matrix.org",
@@ -49,8 +44,10 @@
4944
"projectApiKey": "phc_Jzsm6DTm6V2705zeU5dcNvQDlonOR68XvX2sh1sEOHO",
5045
"apiHost": "https://posthog.element.io"
5146
},
47+
"privacy_policy_url": "https://element.io/cookie-policy",
5248
"features": {
53-
"feature_spotlight": true
49+
"feature_spotlight": true,
50+
"feature_video_rooms": true
5451
},
5552
"map_style_url": "https://api.maptiler.com/maps/streets/style.json?key=fU3vlMsMn4Jb6dnEIFsx"
5653
}

element.io/release/config.json

Lines changed: 1 addition & 5 deletions
Original file line numberDiff line numberDiff line change
@@ -22,11 +22,6 @@
2222
]
2323
},
2424
"showLabsSettings": false,
25-
"piwik": {
26-
"url": "https://piwik.riot.im/",
27-
"siteId": 1,
28-
"policyUrl": "https://element.io/cookie-policy"
29-
},
3025
"enable_presence_by_hs_url": {
3126
"https://matrix.org": false,
3227
"https://matrix-client.matrix.org": false
@@ -45,5 +40,6 @@
4540
"projectApiKey": "phc_Jzsm6DTm6V2705zeU5dcNvQDlonOR68XvX2sh1sEOHO",
4641
"apiHost": "https://posthog.element.io"
4742
},
43+
"privacy_policy_url": "https://element.io/cookie-policy",
4844
"map_style_url": "https://api.maptiler.com/maps/streets/style.json?key=fU3vlMsMn4Jb6dnEIFsx"
4945
}

scripts/hak/target.ts

Lines changed: 82 additions & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -14,6 +14,8 @@ See the License for the specific language governing permissions and
1414
limitations under the License.
1515
*/
1616

17+
import { GLIBC, MUSL, family as processLibC } from "detect-libc";
18+
1719
// We borrow Rust's target naming scheme as a way of expressing all target
1820
// details in a single string.
1921
// See https://doc.rust-lang.org/rustc/platform-support.html.
@@ -23,18 +25,28 @@ export type TargetId =
2325
'universal-apple-darwin' |
2426
'i686-pc-windows-msvc' |
2527
'x86_64-pc-windows-msvc' |
26-
'x86_64-unknown-linux-gnu';
28+
'i686-unknown-linux-musl' |
29+
'i686-unknown-linux-gnu' |
30+
'x86_64-unknown-linux-musl' |
31+
'x86_64-unknown-linux-gnu' |
32+
'aarch64-unknown-linux-musl' |
33+
'aarch64-unknown-linux-gnu' |
34+
'powerpc64le-unknown-linux-musl' |
35+
'powerpc64le-unknown-linux-gnu';
2736

2837
// Values are expected to match those used in `process.platform`.
2938
export type Platform = 'darwin' | 'linux' | 'win32';
3039

3140
// Values are expected to match those used in `process.arch`.
32-
export type Arch = 'arm64' | 'ia32' | 'x64' | 'universal';
41+
export type Arch = 'arm64' | 'ia32' | 'x64' | 'ppc64' | 'universal';
3342

3443
// Values are expected to match those used by Visual Studio's `vcvarsall.bat`.
3544
// See https://docs.microsoft.com/cpp/build/building-on-the-command-line?view=msvc-160#vcvarsall-syntax
3645
export type VcVarsArch = 'amd64' | 'arm64' | 'x86';
3746

47+
// Values are expected to match those used in `detect-libc`.
48+
export type LibC = GLIBC | MUSL;
49+
3850
export type Target = {
3951
id: TargetId;
4052
platform: Platform;
@@ -46,6 +58,11 @@ export type WindowsTarget = Target & {
4658
vcVarsArch: VcVarsArch;
4759
};
4860

61+
export type LinuxTarget = Target & {
62+
platform: 'linux';
63+
libC: LibC;
64+
};
65+
4966
export type UniversalTarget = Target & {
5067
arch: 'universal';
5168
subtargets: Target[];
@@ -87,10 +104,60 @@ const x8664PcWindowsMsvc: WindowsTarget = {
87104
vcVarsArch: 'amd64',
88105
};
89106

90-
const x8664UnknownLinuxGnu: Target = {
107+
const x8664UnknownLinuxGnu: LinuxTarget = {
91108
id: 'x86_64-unknown-linux-gnu',
92109
platform: 'linux',
93110
arch: 'x64',
111+
libC: 'glibc',
112+
};
113+
114+
const x8664UnknownLinuxMusl: LinuxTarget = {
115+
id: 'x86_64-unknown-linux-musl',
116+
platform: 'linux',
117+
arch: 'x64',
118+
libC: 'musl',
119+
};
120+
121+
const i686UnknownLinuxGnu: LinuxTarget = {
122+
id: 'i686-unknown-linux-gnu',
123+
platform: 'linux',
124+
arch: 'ia32',
125+
libC: 'glibc',
126+
};
127+
128+
const i686UnknownLinuxMusl: LinuxTarget = {
129+
id: 'i686-unknown-linux-musl',
130+
platform: 'linux',
131+
arch: 'ia32',
132+
libC: 'musl',
133+
};
134+
135+
const aarch64UnknownLinuxGnu: LinuxTarget = {
136+
id: 'aarch64-unknown-linux-gnu',
137+
platform: 'linux',
138+
arch: 'arm64',
139+
libC: 'glibc',
140+
};
141+
142+
const aarch64UnknownLinuxMusl: LinuxTarget = {
143+
id: 'aarch64-unknown-linux-musl',
144+
platform: 'linux',
145+
arch: 'arm64',
146+
libC: 'musl',
147+
};
148+
149+
const powerpc64leUnknownLinuxGnu: LinuxTarget = {
150+
id: 'powerpc64le-unknown-linux-gnu',
151+
platform: 'linux',
152+
arch: 'ppc64',
153+
libC: 'glibc',
154+
};
155+
156+
const powerpc64leUnknownLinuxMusl: LinuxTarget = {
157+
id: 'powerpc64le-unknown-linux-musl',
158+
platform: 'linux',
159+
arch: 'ppc64',
160+
libC: 'musl',
94161
};
95162

96163
export const TARGETS: Record<TargetId, Target> = {
@@ -102,13 +169,24 @@ export const TARGETS: Record<TargetId, Target> = {
102169
'i686-pc-windows-msvc': i686PcWindowsMsvc,
103170
'x86_64-pc-windows-msvc': x8664PcWindowsMsvc,
104171
// Linux
172+
'i686-unknown-linux-musl': i686UnknownLinuxMusl,
173+
'i686-unknown-linux-gnu': i686UnknownLinuxGnu,
174+
'x86_64-unknown-linux-musl': x8664UnknownLinuxMusl,
105175
'x86_64-unknown-linux-gnu': x8664UnknownLinuxGnu,
176+
'aarch64-unknown-linux-musl': aarch64UnknownLinuxMusl,
177+
'aarch64-unknown-linux-gnu': aarch64UnknownLinuxGnu,
178+
'powerpc64le-unknown-linux-musl': powerpc64leUnknownLinuxMusl,
179+
'powerpc64le-unknown-linux-gnu': powerpc64leUnknownLinuxGnu,
106180
};
107181

108182
export function getHost(): Target {
109183
return Object.values(TARGETS).find(target => (
110184
target.platform === process.platform &&
111-
target.arch === process.arch
185+
target.arch === process.arch &&
186+
(
187+
process.platform !== 'linux' ||
188+
(target as LinuxTarget).libC === processLibC
189+
)
112190
));
113191
}
114192

0 commit comments

Comments
 (0)