Skip to content

Commit 1958ff4

Browse files
aminyaDeeDeeG
andauthored
CI: option to skip upload (#99)
Co-authored-by: Amin Yahyaabadi <[email protected]> Co-authored-by: DeeDeeG <[email protected]>
1 parent 24504c8 commit 1958ff4

File tree

4 files changed

+72
-32
lines changed

4 files changed

+72
-32
lines changed

script/vsts/nightly-release.yml

Lines changed: 11 additions & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -1,3 +1,10 @@
1+
# workaround for https://bit.ly/2CK8itc
2+
variables:
3+
_ATOM_RELEASES_S3_KEY: $[ variables.ATOM_RELEASES_S3_KEY ]
4+
_ATOM_RELEASES_S3_SECRET: $[ variables.ATOM_RELEASES_S3_SECRET ]
5+
_ATOM_RELEASES_S3_BUCKET: $[ variables.ATOM_RELEASES_S3_BUCKET ]
6+
_PACKAGE_CLOUD_API_KEY: $[ variables.PACKAGE_CLOUD_API_KEY ]
7+
18
jobs:
29
# GetReleaseVersion for nightly release
310
- template: platforms/templates/get-release-version.yml
@@ -42,10 +49,10 @@ jobs:
4249
env:
4350
GITHUB_TOKEN: $(GITHUB_TOKEN)
4451
ATOM_RELEASE_VERSION: $(ReleaseVersion)
45-
ATOM_RELEASES_S3_KEY: $(ATOM_RELEASES_S3_KEY)
46-
ATOM_RELEASES_S3_SECRET: $(ATOM_RELEASES_S3_SECRET)
47-
ATOM_RELEASES_S3_BUCKET: $(ATOM_RELEASES_S3_BUCKET)
48-
PACKAGE_CLOUD_API_KEY: $(PACKAGE_CLOUD_API_KEY)
52+
ATOM_RELEASES_S3_KEY: $(_ATOM_RELEASES_S3_KEY)
53+
ATOM_RELEASES_S3_SECRET: $(_ATOM_RELEASES_S3_SECRET)
54+
ATOM_RELEASES_S3_BUCKET: $(_ATOM_RELEASES_S3_BUCKET)
55+
PACKAGE_CLOUD_API_KEY: $(_PACKAGE_CLOUD_API_KEY)
4956
displayName: Create Nightly Release
5057
- job: bump_dependencies
5158
displayName: Bump Dependencies

script/vsts/release-branch-build.yml

Lines changed: 11 additions & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -4,6 +4,13 @@ trigger:
44
- electron-*
55
pr: none # no PR triggers
66

7+
# workaround for https://bit.ly/2CK8itc
8+
variables:
9+
_ATOM_RELEASES_S3_KEY: $[ variables.ATOM_RELEASES_S3_KEY ]
10+
_ATOM_RELEASES_S3_SECRET: $[ variables.ATOM_RELEASES_S3_SECRET ]
11+
_ATOM_RELEASES_S3_BUCKET: $[ variables.ATOM_RELEASES_S3_BUCKET ]
12+
_PACKAGE_CLOUD_API_KEY: $[ variables.PACKAGE_CLOUD_API_KEY ]
13+
714
jobs:
815
# GetReleaseVersion
916
- template: platforms/templates/get-release-version.yml
@@ -47,10 +54,10 @@ jobs:
4754
env:
4855
GITHUB_TOKEN: $(GITHUB_TOKEN)
4956
ATOM_RELEASE_VERSION: $(ReleaseVersion)
50-
ATOM_RELEASES_S3_KEY: $(ATOM_RELEASES_S3_KEY)
51-
ATOM_RELEASES_S3_SECRET: $(ATOM_RELEASES_S3_SECRET)
52-
ATOM_RELEASES_S3_BUCKET: $(ATOM_RELEASES_S3_BUCKET)
53-
PACKAGE_CLOUD_API_KEY: $(PACKAGE_CLOUD_API_KEY)
57+
ATOM_RELEASES_S3_KEY: $(_ATOM_RELEASES_S3_KEY)
58+
ATOM_RELEASES_S3_SECRET: $(_ATOM_RELEASES_S3_SECRET)
59+
ATOM_RELEASES_S3_BUCKET: $(_ATOM_RELEASES_S3_BUCKET)
60+
PACKAGE_CLOUD_API_KEY: $(_PACKAGE_CLOUD_API_KEY)
5461
displayName: Create Draft Release
5562
condition: and(succeeded(), eq(variables['Atom.AutoDraftRelease'], 'true'), eq(variables['IsReleaseBranch'], 'true'))
5663

script/vsts/upload-artifacts.js

Lines changed: 34 additions & 18 deletions
Original file line numberDiff line numberDiff line change
@@ -65,27 +65,43 @@ async function uploadArtifacts() {
6565
return;
6666
}
6767

68-
console.log(
69-
`Uploading ${
70-
assets.length
71-
} release assets for ${releaseVersion} to S3 under '${bucketPath}'`
72-
);
73-
74-
await uploadToS3(
75-
process.env.ATOM_RELEASES_S3_KEY,
76-
process.env.ATOM_RELEASES_S3_SECRET,
77-
process.env.ATOM_RELEASES_S3_BUCKET,
78-
bucketPath,
79-
assets
80-
);
68+
if (
69+
process.env.ATOM_RELEASES_S3_KEY &&
70+
process.env.ATOM_RELEASES_S3_SECRET &&
71+
process.env.ATOM_RELEASES_S3_BUCKET
72+
) {
73+
console.log(
74+
`Uploading ${
75+
assets.length
76+
} release assets for ${releaseVersion} to S3 under '${bucketPath}'`
77+
);
8178

82-
if (argv.linuxRepoName) {
83-
await uploadLinuxPackages(
84-
argv.linuxRepoName,
85-
process.env.PACKAGE_CLOUD_API_KEY,
86-
releaseVersion,
79+
await uploadToS3(
80+
process.env.ATOM_RELEASES_S3_KEY,
81+
process.env.ATOM_RELEASES_S3_SECRET,
82+
process.env.ATOM_RELEASES_S3_BUCKET,
83+
bucketPath,
8784
assets
8885
);
86+
} else {
87+
console.log(
88+
'\nEnvironment variables "ATOM_RELEASES_S3_BUCKET", "ATOM_RELEASES_S3_KEY" and/or "ATOM_RELEASES_S3_SECRET" are not set, skipping S3 upload.'
89+
);
90+
}
91+
92+
if (argv.linuxRepoName) {
93+
if (process.env.PACKAGE_CLOUD_API_KEY) {
94+
await uploadLinuxPackages(
95+
argv.linuxRepoName,
96+
process.env.PACKAGE_CLOUD_API_KEY,
97+
releaseVersion,
98+
assets
99+
);
100+
} else {
101+
console.log(
102+
'\nEnvironment variable "PACKAGE_CLOUD_API_KEY" is not set, skipping PackageCloud upload.'
103+
);
104+
}
89105
} else {
90106
console.log(
91107
'\nNo Linux package repo name specified, skipping Linux package upload.'

script/vsts/upload-crash-reports.js

Lines changed: 16 additions & 6 deletions
Original file line numberDiff line numberDiff line change
@@ -40,9 +40,19 @@ async function uploadCrashReports() {
4040
}
4141
}
4242

43-
// Wrap the call the async function and catch errors from its promise because
44-
// Node.js doesn't yet allow use of await at the script scope
45-
uploadCrashReports().catch(err => {
46-
console.error('An error occurred while uploading crash reports:\n\n', err);
47-
process.exit(1);
48-
});
43+
if (
44+
process.env.ATOM_RELEASES_S3_KEY &&
45+
process.env.ATOM_RELEASES_S3_SECRET &&
46+
process.env.ATOM_RELEASES_S3_BUCKET
47+
) {
48+
// Wrap the call the async function and catch errors from its promise because
49+
// Node.js doesn't yet allow use of await at the script scope
50+
uploadCrashReports().catch(err => {
51+
console.error('An error occurred while uploading crash reports:\n\n', err);
52+
process.exit(1);
53+
});
54+
} else {
55+
console.log(
56+
'\n\nEnvironment variables "ATOM_RELEASES_S3_BUCKET", "ATOM_RELEASES_S3_KEY" and/or "ATOM_RELEASES_S3_SECRET" are not set, skipping S3 upload.'
57+
);
58+
}

0 commit comments

Comments
 (0)