Skip to content

Commit bd0a831

Browse files
committed
* Remove generate licenses
* Added --target for builds
1 parent 89feb06 commit bd0a831

File tree

1 file changed

+9
-28
lines changed

1 file changed

+9
-28
lines changed

.circleci/config.yml

Lines changed: 9 additions & 28 deletions
Original file line numberDiff line numberDiff line change
@@ -35,22 +35,6 @@ aliases:
3535
when:
3636
not: *manual-build-conditions
3737

38-
licenses-generate: &licensesGenerate
39-
run:
40-
name: Generate license file for all vscode dependencies
41-
command: |
42-
sudo npm i -g license-checker
43-
sudo license-checker --json --out licenses.json
44-
shell: /bin/bash
45-
46-
licenses-generate-windows: &licensesGenerateWindows
47-
run:
48-
name: Generate license file for all vscode dependencies
49-
command: |
50-
npm i -g license-checker
51-
license-checker --json --out licenses.json
52-
shell: powershell.exe
53-
5438
orbs:
5539
node: circleci/node@5.3.0
5640
win: circleci/windows@5.0.0
@@ -195,7 +179,6 @@ jobs:
195179
name: Install dependencies
196180
command: |
197181
yarn install --frozen-lockfile --cache-folder ~/.cache/yarn
198-
- <<: *licensesGenerate
199182
- run:
200183
name: Build .vsix package
201184
command: |
@@ -205,13 +188,13 @@ jobs:
205188
206189
if [ << parameters.env >> == 'prod' ]; then
207190
echo "RI_SEGMENT_WRITE_KEY='$RI_SEGMENT_WRITE_KEY'" >> $envFile
208-
yarn package:prod --out ${packagePath}
191+
yarn package:prod --ignore-other-target-folders --target linux-x64 --out ${packagePath}
209192
exit 0;
210193
fi
211194
212195
echo "RI_SEGMENT_WRITE_KEY='$RI_SEGMENT_WRITE_KEY_STAGE'" >> $envFile
213196
sed -i "s/^RI_APP_FOLDER_NAME=.*/RI_APP_FOLDER_NAME='.redis-for-vscode-stage'/" $envFile
214-
yarn package:stage --out ${packagePath}
197+
yarn package:stage --ignore-other-target-folders --target linux-x64 --out ${packagePath}
215198
- persist_to_workspace:
216199
root: .
217200
paths:
@@ -245,7 +228,6 @@ jobs:
245228
command: |
246229
yarn install
247230
no_output_timeout: 15m
248-
- <<: *licensesGenerate
249231
- run:
250232
name: Build .vsix package
251233
command: |
@@ -257,27 +239,27 @@ jobs:
257239
258240
echo "RI_SEGMENT_WRITE_KEY='$RI_SEGMENT_WRITE_KEY_STAGE'" >> $envFile
259241
sed -i '' "s/^RI_APP_FOLDER_NAME=.*/RI_APP_FOLDER_NAME='.redis-for-vscode-stage'/" $envFile
260-
yarn package:stage --target darwin-<< parameters.target >> --out ${packagePath}-<< parameters.target >>.vsix
242+
yarn package:stage --ignore-other-target-folders --target darwin-<< parameters.target >> --out ${packagePath}-<< parameters.target >>.vsix
261243
exit 0;
262244
fi
263245
264246
if [ << parameters.env >> == 'prod' ]; then
265247
echo "RI_SEGMENT_WRITE_KEY='$RI_SEGMENT_WRITE_KEY'" >> $envFile
266248
yarn download:backend arm64
267-
yarn package:prod --target darwin-arm64 --out ${packagePath}-arm64.vsix
249+
yarn package:prod --ignore-other-target-folders --target darwin-arm64 --out ${packagePath}-arm64.vsix
268250
269251
yarn download:backend x64
270-
yarn package:prod --target darwin-x64 --out ${packagePath}-x64.vsix
252+
yarn package:prod --ignore-other-target-folders --target darwin-x64 --out ${packagePath}-x64.vsix
271253
exit 0;
272254
fi
273255
274256
echo "RI_SEGMENT_WRITE_KEY='$RI_SEGMENT_WRITE_KEY_STAGE'" >> $envFile
275257
sed -i '' "s/^RI_APP_FOLDER_NAME=.*/RI_APP_FOLDER_NAME='.redis-for-vscode-stage'/" $envFile
276258
yarn download:backend arm64
277-
yarn package:stage --target darwin-arm64 --out ${packagePath}-arm64.vsix
259+
yarn package:stage --ignore-other-target-folders --target darwin-arm64 --out ${packagePath}-arm64.vsix
278260
279261
yarn download:backend x64
280-
yarn package:stage --target darwin-x64 --out ${packagePath}-x64.vsix
262+
yarn package:stage --ignore-other-target-folders --target darwin-x64 --out ${packagePath}-x64.vsix
281263
- persist_to_workspace:
282264
root: .
283265
paths:
@@ -310,7 +292,6 @@ jobs:
310292
yarn install
311293
shell: bash.exe
312294
no_output_timeout: 15m
313-
- <<: *licensesGenerateWindows
314295
- run:
315296
name: Build .vsix package
316297
command: |
@@ -320,12 +301,12 @@ jobs:
320301
321302
if [ << parameters.env >> == 'prod' ]; then
322303
echo "RI_SEGMENT_WRITE_KEY='$RI_SEGMENT_WRITE_KEY'" >> $envFile
323-
yarn package:prod --out ${packagePath}
304+
yarn package:prod --ignore-other-target-folders --target win32-x64 --out ${packagePath}
324305
exit 0;
325306
fi
326307
327308
sed -i "s/^RI_APP_FOLDER_NAME=.*/RI_APP_FOLDER_NAME='.redis-for-vscode-stage'/" $envFile
328-
yarn package:stage --out ${packagePath}
309+
yarn package:stage --ignore-other-target-folders --target win32-x64 --out ${packagePath}
329310
shell: bash.exe
330311
no_output_timeout: 20m
331312
- persist_to_workspace:

0 commit comments

Comments
 (0)