Skip to content

Commit 239dc39

Browse files
authored
Merge pull request #174 from atom-ide-community/upstream_master
2 parents b5cc05b + 11d6a0f commit 239dc39

File tree

5 files changed

+94
-71
lines changed

5 files changed

+94
-71
lines changed

package-lock.json

Lines changed: 58 additions & 59 deletions
Some generated files are not rendered by default. Learn more about customizing how changed files appear on GitHub.

package.json

Lines changed: 3 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -135,7 +135,7 @@
135135
"open-on-github": "https://www.atom.io/api/packages/open-on-github/versions/1.3.2/tarball",
136136
"package-generator": "https://www.atom.io/api/packages/package-generator/versions/1.3.0/tarball",
137137
"pathwatcher": "8.1.0",
138-
"postcss": "5.2.4",
138+
"postcss": "8.0.5",
139139
"postcss-selector-parser": "2.2.1",
140140
"prebuild-install": "5.3.5",
141141
"property-accessors": "^1.1.3",
@@ -160,9 +160,9 @@
160160
"temp": "^0.9.0",
161161
"text-buffer": "13.17.3",
162162
"timecop": "https://www.atom.io/api/packages/timecop/versions/0.36.2/tarball",
163-
"tree-sitter": "0.16.2",
163+
"tree-sitter": "0.16.0",
164164
"tree-view": "https://www.atom.io/api/packages/tree-view/versions/0.228.1/tarball",
165-
"typescript-simple": "1.0.0",
165+
"typescript-simple": "8.0.6",
166166
"update-package-dependencies": "file:./packages/update-package-dependencies",
167167
"vscode-ripgrep": "1.9.0",
168168
"welcome": "file:packages/welcome",

script/package-lock.json

Lines changed: 13 additions & 3 deletions
Some generated files are not rendered by default. Learn more about customizing how changed files appear on GitHub.

script/vsts/package-lock.json

Lines changed: 14 additions & 4 deletions
Some generated files are not rendered by default. Learn more about customizing how changed files appear on GitHub.

script/vsts/platforms/windows.yml

Lines changed: 6 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -70,7 +70,7 @@ jobs:
7070
condition: and(succeeded(), eq(variables['IsReleaseBranch'], 'true'))
7171

7272
- job: Windows_Tests
73-
displayName: Windows
73+
displayName: Windows test
7474
dependsOn: Windows_build
7575
timeoutInMinutes: 180
7676
strategy:
@@ -109,8 +109,12 @@ jobs:
109109
- pwsh: |
110110
if ($env:BUILD_ARCH -eq "x64") {
111111
$env:FileID="-x64"
112-
echo "##vso[task.setvariable variable=FileID]$env:FileID" # Azure syntax
112+
} else {
113+
$env:FileID=""
113114
}
115+
echo "##vso[task.setvariable variable=FileID]$env:FileID" # Azure syntax
116+
env:
117+
BUILD_ARCH: $(BUILD_ARCH)
114118
displayName: Set FileID based on the arch
115119
116120
- template: templates/download-unzip.yml

0 commit comments

Comments
 (0)