Skip to content

Commit 9a3758e

Browse files
isidornisidorn
committed
Revert "only run component governance"
This reverts commit 9c65568.
1 parent 66f4c5b commit 9a3758e

File tree

2 files changed

+147
-147
lines changed

2 files changed

+147
-147
lines changed

‎build/tfs/linux/product-build-linux.yml

+106-106
Original file line numberDiff line numberDiff line change
@@ -1,111 +1,111 @@
11
steps:
2-
# - task: NodeTool@0
3-
# inputs:
4-
# versionSpec: "8.12.0"
5-
6-
# - task: geeklearningio.gl-vsts-tasks-yarn.yarn-installer-task.YarnInstaller@2
7-
# inputs:
8-
# versionSpec: "1.10.1"
9-
10-
# - script: |
11-
# set -e
12-
# export npm_config_arch="$(VSCODE_ARCH)"
13-
# if [[ "$(VSCODE_ARCH)" == "ia32" ]]; then
14-
# export PKG_CONFIG_PATH="/usr/lib/i386-linux-gnu/pkgconfig"
15-
# fi
16-
17-
# echo "machine monacotools.visualstudio.com password $(VSO_PAT)" > ~/.netrc
18-
# CHILD_CONCURRENCY=1 yarn
19-
# npm run gulp -- hygiene
20-
# npm run monaco-compile-check
21-
# npm run strict-null-check
22-
# VSCODE_MIXIN_PASSWORD="$(VSCODE_MIXIN_PASSWORD)" npm run gulp -- mixin
23-
# node build/tfs/common/installDistro.js
24-
# node build/lib/builtInExtensions.js
25-
26-
# - script: |
27-
# set -e
28-
# VSCODE_MIXIN_PASSWORD="$(VSCODE_MIXIN_PASSWORD)" npm run gulp -- vscode-linux-$(VSCODE_ARCH)-min
29-
# name: build
30-
31-
# - script: |
32-
# set -e
33-
# npm run gulp -- "electron-$(VSCODE_ARCH)"
34-
35-
# # xvfb seems to be crashing often, let's make sure it's always up
36-
# service xvfb start
37-
38-
# DISPLAY=:10 ./scripts/test.sh --build --tfs "Unit Tests"
39-
# # yarn smoketest -- --build "$(agent.builddirectory)/VSCode-linux-$(VSCODE_ARCH)"
40-
# name: test
41-
42-
# - script: |
43-
# set -e
44-
# REPO="$(pwd)"
45-
# ROOT="$REPO/.."
46-
# ARCH="$(VSCODE_ARCH)"
47-
48-
# # Publish tarball
49-
# PLATFORM_LINUX="linux-$(VSCODE_ARCH)"
50-
# [[ "$ARCH" == "ia32" ]] && DEB_ARCH="i386" || DEB_ARCH="amd64"
51-
# [[ "$ARCH" == "ia32" ]] && RPM_ARCH="i386" || RPM_ARCH="x86_64"
52-
# BUILDNAME="VSCode-$PLATFORM_LINUX"
53-
# BUILD="$ROOT/$BUILDNAME"
54-
# BUILD_VERSION="$(date +%s)"
55-
# [ -z "$VSCODE_QUALITY" ] && TARBALL_FILENAME="code-$BUILD_VERSION.tar.gz" || TARBALL_FILENAME="code-$VSCODE_QUALITY-$BUILD_VERSION.tar.gz"
56-
# TARBALL_PATH="$ROOT/$TARBALL_FILENAME"
57-
# PACKAGEJSON="$BUILD/resources/app/package.json"
58-
# VERSION=$(node -p "require(\"$PACKAGEJSON\").version")
59-
60-
# rm -rf $ROOT/code-*.tar.*
61-
# (cd $ROOT && tar -czf $TARBALL_PATH $BUILDNAME)
62-
63-
# AZURE_DOCUMENTDB_MASTERKEY="$(AZURE_DOCUMENTDB_MASTERKEY)" \
64-
# AZURE_STORAGE_ACCESS_KEY_2="$(AZURE_STORAGE_ACCESS_KEY_2)" \
65-
# MOONCAKE_STORAGE_ACCESS_KEY="$(MOONCAKE_STORAGE_ACCESS_KEY)" \
66-
# node build/tfs/common/publish.js "$VSCODE_QUALITY" "$PLATFORM_LINUX" archive-unsigned "$TARBALL_FILENAME" "$VERSION" true "$TARBALL_PATH"
67-
68-
# # Publish hockeyapp symbols
69-
# node build/tfs/common/symbols.js "$(VSCODE_MIXIN_PASSWORD)" "$(VSCODE_HOCKEYAPP_TOKEN)" "$(VSCODE_ARCH)" "$(VSCODE_HOCKEYAPP_ID_LINUX64)"
70-
71-
# # Publish DEB
72-
# npm run gulp -- "vscode-linux-$(VSCODE_ARCH)-build-deb"
73-
# PLATFORM_DEB="linux-deb-$ARCH"
74-
# [[ "$ARCH" == "ia32" ]] && DEB_ARCH="i386" || DEB_ARCH="amd64"
75-
# DEB_FILENAME="$(ls $REPO/.build/linux/deb/$DEB_ARCH/deb/)"
76-
# DEB_PATH="$REPO/.build/linux/deb/$DEB_ARCH/deb/$DEB_FILENAME"
77-
78-
# AZURE_DOCUMENTDB_MASTERKEY="$(AZURE_DOCUMENTDB_MASTERKEY)" \
79-
# AZURE_STORAGE_ACCESS_KEY_2="$(AZURE_STORAGE_ACCESS_KEY_2)" \
80-
# MOONCAKE_STORAGE_ACCESS_KEY="$(MOONCAKE_STORAGE_ACCESS_KEY)" \
81-
# node build/tfs/common/publish.js "$VSCODE_QUALITY" "$PLATFORM_DEB" package "$DEB_FILENAME" "$VERSION" true "$DEB_PATH"
82-
83-
# # Publish RPM
84-
# npm run gulp -- "vscode-linux-$(VSCODE_ARCH)-build-rpm"
85-
# PLATFORM_RPM="linux-rpm-$ARCH"
86-
# [[ "$ARCH" == "ia32" ]] && RPM_ARCH="i386" || RPM_ARCH="x86_64"
87-
# RPM_FILENAME="$(ls $REPO/.build/linux/rpm/$RPM_ARCH/ | grep .rpm)"
88-
# RPM_PATH="$REPO/.build/linux/rpm/$RPM_ARCH/$RPM_FILENAME"
89-
90-
# AZURE_DOCUMENTDB_MASTERKEY="$(AZURE_DOCUMENTDB_MASTERKEY)" \
91-
# AZURE_STORAGE_ACCESS_KEY_2="$(AZURE_STORAGE_ACCESS_KEY_2)" \
92-
# MOONCAKE_STORAGE_ACCESS_KEY="$(MOONCAKE_STORAGE_ACCESS_KEY)" \
93-
# node build/tfs/common/publish.js "$VSCODE_QUALITY" "$PLATFORM_RPM" package "$RPM_FILENAME" "$VERSION" true "$RPM_PATH"
94-
95-
# # Publish Snap
96-
# npm run gulp -- "vscode-linux-$(VSCODE_ARCH)-prepare-snap"
97-
98-
# # Pack snap tarball artifact, in order to preserve file perms
99-
# mkdir -p $REPO/.build/linux/snap-tarball
100-
# SNAP_TARBALL_PATH="$REPO/.build/linux/snap-tarball/snap-$(VSCODE_ARCH).tar.gz"
101-
# rm -rf $SNAP_TARBALL_PATH
102-
# (cd .build/linux && tar -czf $SNAP_TARBALL_PATH snap)
2+
- task: NodeTool@0
3+
inputs:
4+
versionSpec: "8.12.0"
5+
6+
- task: geeklearningio.gl-vsts-tasks-yarn.yarn-installer-task.YarnInstaller@2
7+
inputs:
8+
versionSpec: "1.10.1"
9+
10+
- script: |
11+
set -e
12+
export npm_config_arch="$(VSCODE_ARCH)"
13+
if [[ "$(VSCODE_ARCH)" == "ia32" ]]; then
14+
export PKG_CONFIG_PATH="/usr/lib/i386-linux-gnu/pkgconfig"
15+
fi
16+
17+
echo "machine monacotools.visualstudio.com password $(VSO_PAT)" > ~/.netrc
18+
CHILD_CONCURRENCY=1 yarn
19+
npm run gulp -- hygiene
20+
npm run monaco-compile-check
21+
npm run strict-null-check
22+
VSCODE_MIXIN_PASSWORD="$(VSCODE_MIXIN_PASSWORD)" npm run gulp -- mixin
23+
node build/tfs/common/installDistro.js
24+
node build/lib/builtInExtensions.js
25+
26+
- script: |
27+
set -e
28+
VSCODE_MIXIN_PASSWORD="$(VSCODE_MIXIN_PASSWORD)" npm run gulp -- vscode-linux-$(VSCODE_ARCH)-min
29+
name: build
30+
31+
- script: |
32+
set -e
33+
npm run gulp -- "electron-$(VSCODE_ARCH)"
34+
35+
# xvfb seems to be crashing often, let's make sure it's always up
36+
service xvfb start
37+
38+
DISPLAY=:10 ./scripts/test.sh --build --tfs "Unit Tests"
39+
# yarn smoketest -- --build "$(agent.builddirectory)/VSCode-linux-$(VSCODE_ARCH)"
40+
name: test
41+
42+
- script: |
43+
set -e
44+
REPO="$(pwd)"
45+
ROOT="$REPO/.."
46+
ARCH="$(VSCODE_ARCH)"
47+
48+
# Publish tarball
49+
PLATFORM_LINUX="linux-$(VSCODE_ARCH)"
50+
[[ "$ARCH" == "ia32" ]] && DEB_ARCH="i386" || DEB_ARCH="amd64"
51+
[[ "$ARCH" == "ia32" ]] && RPM_ARCH="i386" || RPM_ARCH="x86_64"
52+
BUILDNAME="VSCode-$PLATFORM_LINUX"
53+
BUILD="$ROOT/$BUILDNAME"
54+
BUILD_VERSION="$(date +%s)"
55+
[ -z "$VSCODE_QUALITY" ] && TARBALL_FILENAME="code-$BUILD_VERSION.tar.gz" || TARBALL_FILENAME="code-$VSCODE_QUALITY-$BUILD_VERSION.tar.gz"
56+
TARBALL_PATH="$ROOT/$TARBALL_FILENAME"
57+
PACKAGEJSON="$BUILD/resources/app/package.json"
58+
VERSION=$(node -p "require(\"$PACKAGEJSON\").version")
59+
60+
rm -rf $ROOT/code-*.tar.*
61+
(cd $ROOT && tar -czf $TARBALL_PATH $BUILDNAME)
62+
63+
AZURE_DOCUMENTDB_MASTERKEY="$(AZURE_DOCUMENTDB_MASTERKEY)" \
64+
AZURE_STORAGE_ACCESS_KEY_2="$(AZURE_STORAGE_ACCESS_KEY_2)" \
65+
MOONCAKE_STORAGE_ACCESS_KEY="$(MOONCAKE_STORAGE_ACCESS_KEY)" \
66+
node build/tfs/common/publish.js "$VSCODE_QUALITY" "$PLATFORM_LINUX" archive-unsigned "$TARBALL_FILENAME" "$VERSION" true "$TARBALL_PATH"
67+
68+
# Publish hockeyapp symbols
69+
node build/tfs/common/symbols.js "$(VSCODE_MIXIN_PASSWORD)" "$(VSCODE_HOCKEYAPP_TOKEN)" "$(VSCODE_ARCH)" "$(VSCODE_HOCKEYAPP_ID_LINUX64)"
70+
71+
# Publish DEB
72+
npm run gulp -- "vscode-linux-$(VSCODE_ARCH)-build-deb"
73+
PLATFORM_DEB="linux-deb-$ARCH"
74+
[[ "$ARCH" == "ia32" ]] && DEB_ARCH="i386" || DEB_ARCH="amd64"
75+
DEB_FILENAME="$(ls $REPO/.build/linux/deb/$DEB_ARCH/deb/)"
76+
DEB_PATH="$REPO/.build/linux/deb/$DEB_ARCH/deb/$DEB_FILENAME"
77+
78+
AZURE_DOCUMENTDB_MASTERKEY="$(AZURE_DOCUMENTDB_MASTERKEY)" \
79+
AZURE_STORAGE_ACCESS_KEY_2="$(AZURE_STORAGE_ACCESS_KEY_2)" \
80+
MOONCAKE_STORAGE_ACCESS_KEY="$(MOONCAKE_STORAGE_ACCESS_KEY)" \
81+
node build/tfs/common/publish.js "$VSCODE_QUALITY" "$PLATFORM_DEB" package "$DEB_FILENAME" "$VERSION" true "$DEB_PATH"
82+
83+
# Publish RPM
84+
npm run gulp -- "vscode-linux-$(VSCODE_ARCH)-build-rpm"
85+
PLATFORM_RPM="linux-rpm-$ARCH"
86+
[[ "$ARCH" == "ia32" ]] && RPM_ARCH="i386" || RPM_ARCH="x86_64"
87+
RPM_FILENAME="$(ls $REPO/.build/linux/rpm/$RPM_ARCH/ | grep .rpm)"
88+
RPM_PATH="$REPO/.build/linux/rpm/$RPM_ARCH/$RPM_FILENAME"
89+
90+
AZURE_DOCUMENTDB_MASTERKEY="$(AZURE_DOCUMENTDB_MASTERKEY)" \
91+
AZURE_STORAGE_ACCESS_KEY_2="$(AZURE_STORAGE_ACCESS_KEY_2)" \
92+
MOONCAKE_STORAGE_ACCESS_KEY="$(MOONCAKE_STORAGE_ACCESS_KEY)" \
93+
node build/tfs/common/publish.js "$VSCODE_QUALITY" "$PLATFORM_RPM" package "$RPM_FILENAME" "$VERSION" true "$RPM_PATH"
94+
95+
# Publish Snap
96+
npm run gulp -- "vscode-linux-$(VSCODE_ARCH)-prepare-snap"
97+
98+
# Pack snap tarball artifact, in order to preserve file perms
99+
mkdir -p $REPO/.build/linux/snap-tarball
100+
SNAP_TARBALL_PATH="$REPO/.build/linux/snap-tarball/snap-$(VSCODE_ARCH).tar.gz"
101+
rm -rf $SNAP_TARBALL_PATH
102+
(cd .build/linux && tar -czf $SNAP_TARBALL_PATH snap)
103103
104104
- task: ms.vss-governance-buildtask.governance-build-task-component-detection.ComponentGovernanceComponentDetection@0
105105
displayName: 'Component Detection'
106106

107-
# - task: PublishPipelineArtifact@0
108-
# displayName: 'Publish Pipeline Artifact'
109-
# inputs:
110-
# artifactName: snap-$(VSCODE_ARCH)
111-
# targetPath: .build/linux/snap-tarball
107+
- task: PublishPipelineArtifact@0
108+
displayName: 'Publish Pipeline Artifact'
109+
inputs:
110+
artifactName: snap-$(VSCODE_ARCH)
111+
targetPath: .build/linux/snap-tarball

‎build/tfs/product-build.yml

+41-41
Original file line numberDiff line numberDiff line change
@@ -8,23 +8,23 @@ resources:
88
image: snapcore/snapcraft
99

1010
jobs:
11-
# - job: Windows
12-
# condition: eq(variables['VSCODE_BUILD_WIN32'], 'true')
13-
# pool:
14-
# vmImage: VS2017-Win2016
15-
# variables:
16-
# VSCODE_ARCH: x64
17-
# steps:
18-
# - template: win32/product-build-win32.yml
11+
- job: Windows
12+
condition: eq(variables['VSCODE_BUILD_WIN32'], 'true')
13+
pool:
14+
vmImage: VS2017-Win2016
15+
variables:
16+
VSCODE_ARCH: x64
17+
steps:
18+
- template: win32/product-build-win32.yml
1919

20-
# - job: Windows32
21-
# condition: eq(variables['VSCODE_BUILD_WIN32_32BIT'], 'true')
22-
# pool:
23-
# vmImage: VS2017-Win2016
24-
# variables:
25-
# VSCODE_ARCH: ia32
26-
# steps:
27-
# - template: win32/product-build-win32.yml
20+
- job: Windows32
21+
condition: eq(variables['VSCODE_BUILD_WIN32_32BIT'], 'true')
22+
pool:
23+
vmImage: VS2017-Win2016
24+
variables:
25+
VSCODE_ARCH: ia32
26+
steps:
27+
- template: win32/product-build-win32.yml
2828

2929
- job: Linux
3030
condition: eq(variables['VSCODE_BUILD_LINUX'], 'true')
@@ -36,30 +36,30 @@ jobs:
3636
steps:
3737
- template: linux/product-build-linux.yml
3838

39-
# - job: LinuxSnap
40-
# condition: eq(variables['VSCODE_BUILD_LINUX'], 'true')
41-
# pool:
42-
# vmImage: 'Ubuntu-16.04'
43-
# variables:
44-
# VSCODE_ARCH: x64
45-
# container: snapcraft
46-
# dependsOn: Linux
47-
# steps:
48-
# - template: linux/snap-build-linux.yml
39+
- job: LinuxSnap
40+
condition: eq(variables['VSCODE_BUILD_LINUX'], 'true')
41+
pool:
42+
vmImage: 'Ubuntu-16.04'
43+
variables:
44+
VSCODE_ARCH: x64
45+
container: snapcraft
46+
dependsOn: Linux
47+
steps:
48+
- template: linux/snap-build-linux.yml
4949

50-
# - job: Linux32
51-
# condition: eq(variables['VSCODE_BUILD_LINUX_32BIT'], 'true')
52-
# pool:
53-
# vmImage: 'Ubuntu-16.04'
54-
# variables:
55-
# VSCODE_ARCH: ia32
56-
# container: vscode-ia32
57-
# steps:
58-
# - template: linux/product-build-linux.yml
50+
- job: Linux32
51+
condition: eq(variables['VSCODE_BUILD_LINUX_32BIT'], 'true')
52+
pool:
53+
vmImage: 'Ubuntu-16.04'
54+
variables:
55+
VSCODE_ARCH: ia32
56+
container: vscode-ia32
57+
steps:
58+
- template: linux/product-build-linux.yml
5959

60-
# - job: macOS
61-
# condition: eq(variables['VSCODE_BUILD_MACOS'], 'true')
62-
# pool:
63-
# vmImage: macOS 10.13
64-
# steps:
65-
# - template: darwin/product-build-darwin.yml
60+
- job: macOS
61+
condition: eq(variables['VSCODE_BUILD_MACOS'], 'true')
62+
pool:
63+
vmImage: macOS 10.13
64+
steps:
65+
- template: darwin/product-build-darwin.yml

0 commit comments

Comments
 (0)