mirror of
https://github.com/pulsar-edit/pulsar.git
synced 2024-09-11 11:15:24 +03:00
Merge branch 'master' into pr/67
This commit is contained in:
commit
2f0cbdeb08
@ -1,4 +1,4 @@
|
||||
Copyright (c) 2011-2021 GitHub Inc.
|
||||
Copyright (c) 2011-2022 GitHub Inc.
|
||||
|
||||
Permission is hereby granted, free of charge, to any person obtaining
|
||||
a copy of this software and associated documentation files (the
|
||||
|
@ -5,7 +5,7 @@
|
||||
|
||||
[![Badge License]][License]
|
||||
[![Badge Guidelines]][Guidelines]
|
||||
[![Badge Retired]][Retired]
|
||||
[![Badge Sunset]][Retired]
|
||||
[![Badge Discord]][Discord]
|
||||
|
||||
<br>
|
||||
@ -66,7 +66,8 @@
|
||||
<!---------------------------{ Badges }--------------------------->
|
||||
|
||||
[Badge Guidelines]: https://img.shields.io/badge/Logo-Guidelines-d36e2d.svg?style=for-the-badge&labelColor=323232
|
||||
[Badge Retired]: https://img.shields.io/badge/Retired-bb3c1f.svg?style=for-the-badge&labelColor=323232&logoColor=white&logo=Atom
|
||||
[Badge Retired]: https://img.shields.io/badge/Retired-bb3c1f.svg?style=for-the-badge&labelColor=323232&label=Upstream%20Status
|
||||
[Badge Sunset]: https://img.shields.io/badge/Sunset-orange.svg?style=for-the-badge&labelColor=323232&label=Upstream%20Status
|
||||
[Badge Discord]: https://img.shields.io/badge/Discord-6399c4.svg?style=for-the-badge&labelColor=323232&logoColor=white&logo=Discord
|
||||
[Badge License]: https://img.shields.io/badge/License-MIT-e5ab42.svg?style=for-the-badge&labelColor=323232
|
||||
[Badge Status]: https://dev.azure.com/atomcommunity/atomcommunity/_apis/build/status/atom-community/Release%20Branch%20Build?branchName=master
|
||||
|
@ -196,7 +196,10 @@
|
||||
|
||||
{
|
||||
label: 'Packages'
|
||||
submenu: []
|
||||
submenu: [
|
||||
{ label: 'Open Package Manager', command: 'settings-view:view-installed-packages' }
|
||||
{ type: 'separator' }
|
||||
]
|
||||
}
|
||||
|
||||
{
|
||||
|
@ -179,7 +179,10 @@
|
||||
|
||||
{
|
||||
label: '&Packages'
|
||||
submenu: []
|
||||
submenu: [
|
||||
{ label: 'Open Package Manager', command: 'settings-view:view-installed-packages' }
|
||||
{ type: 'separator' }
|
||||
]
|
||||
}
|
||||
|
||||
{
|
||||
|
@ -178,7 +178,10 @@
|
||||
|
||||
{
|
||||
label: '&Packages'
|
||||
submenu: []
|
||||
submenu: [
|
||||
{ label: 'Open Package Manager', command: 'settings-view:view-installed-packages' }
|
||||
{ type: 'separator' }
|
||||
]
|
||||
}
|
||||
|
||||
{
|
||||
|
@ -28,8 +28,12 @@ function dumpSymbol(binaryPath) {
|
||||
minidump.dumpSymbol(binaryPath, function(error, content) {
|
||||
if (error) {
|
||||
// fswin.node is only used on windows, ignore the error on other platforms
|
||||
if (process.platform !== 'win32' && binaryPath.match(/fswin.node/))
|
||||
if (process.platform !== 'win32') {
|
||||
console.warn(
|
||||
`\n##[warning] Failed to dump the symbols via minidump. ${error}. Ignoring the error...`
|
||||
);
|
||||
return resolve();
|
||||
}
|
||||
throw new Error(error);
|
||||
} else {
|
||||
const moduleLine = /MODULE [^ ]+ [^ ]+ ([0-9A-F]+) (.*)\n/.exec(
|
||||
|
@ -14,7 +14,7 @@ jobs:
|
||||
RunCoreMainTests: true
|
||||
|
||||
pool:
|
||||
vmImage: vs2017-win2016
|
||||
vmImage: windows-2019
|
||||
|
||||
variables:
|
||||
AppName: $[ dependencies.GetReleaseVersion.outputs['Version.AppName'] ]
|
||||
|
Loading…
Reference in New Issue
Block a user