Skip to content

Commit e6807b3

Browse files
author
John Kleinschmidt
authored
ci: Revert CircleCI changes (electron#20916)
* Revert "build: lengthen wait times and retries for CircleCI releases (electron#20893)" This reverts commit 41b32cf. * Revert "ci: verify CircleCI job number before returning job url (electron#20864)" This reverts commit b97c3ac. * Revert "build: run publish jobs in the secure context and enable sccache (electron#20863)" This reverts commit 055b5d2. * Revert "ci: use CircleCI 2.1 config and v2 APIs (electron#20852)" This reverts commit 1841742.
1 parent f6f73a5 commit e6807b3

File tree

2 files changed

+35
-235
lines changed

2 files changed

+35
-235
lines changed

‎.circleci/config.yml‎

Lines changed: 16 additions & 116 deletions
Original file line numberDiff line numberDiff line change
@@ -1,46 +1,3 @@
1-
version: 2.1
2-
3-
parameters:
4-
upload-to-s3:
5-
type: string
6-
default: '1'
7-
8-
run-lint:
9-
type: boolean
10-
default: true
11-
12-
run-build-linux:
13-
type: boolean
14-
default: true
15-
16-
run-build-mac:
17-
type: boolean
18-
default: true
19-
20-
run-linux-x64-publish:
21-
type: boolean
22-
default: false
23-
24-
run-linux-ia32-publish:
25-
type: boolean
26-
default: false
27-
28-
run-linux-arm-publish:
29-
type: boolean
30-
default: false
31-
32-
run-linux-arm64-publish:
33-
type: boolean
34-
default: false
35-
36-
run-osx-publish:
37-
type: boolean
38-
default: false
39-
40-
run-mas-publish:
41-
type: boolean
42-
default: false
43-
441
# The config expects the following environment variables to be set:
452
# - "SLACK_WEBHOOK" Slack hook URL to send notifications.
463
#
@@ -694,7 +651,7 @@ steps-lint: &steps-lint
694651
chromium_revision="$(grep -A1 chromium_version src/electron/DEPS | tr -d '\n' | cut -d\' -f4)"
695652
gn_version="$(curl -sL "https://chromium.googlesource.com/chromium/src/+/${chromium_revision}/DEPS?format=TEXT" | base64 -d | grep gn_version | head -n1 | cut -d\' -f4)"
696653
697-
cipd ensure -ensure-file - -root . \<<-CIPD
654+
cipd ensure -ensure-file - -root . <<-CIPD
698655
\$ServiceURL https://chrome-infra-packages.appspot.com/
699656
@Subdir src/buildtools/linux64
700657
gn/gn/linux-amd64 $gn_version
@@ -1051,6 +1008,7 @@ chromium-upgrade-branches: &chromium-upgrade-branches
10511008
/chromium\-upgrade\/[0-9]+/
10521009

10531010
# List of all jobs.
1011+
version: 2
10541012
jobs:
10551013
# Layer 0: Lint. Standalone.
10561014
lint:
@@ -1170,8 +1128,6 @@ jobs:
11701128
<<: *env-linux-2xlarge-release
11711129
GCLIENT_EXTRA_ARGS: '--custom-var=checkout_boto=True --custom-var=checkout_requests=True'
11721130
<<: *env-release-build
1173-
<<: *env-enable-sccache
1174-
UPLOAD_TO_S3: << pipeline.parameters.upload-to-s3 >>
11751131
<<: *steps-electron-build-for-publish
11761132

11771133
linux-ia32-debug:
@@ -1222,8 +1178,6 @@ jobs:
12221178
GCLIENT_EXTRA_ARGS: '--custom-var=checkout_boto=True --custom-var=checkout_requests=True'
12231179
<<: *env-ia32
12241180
<<: *env-release-build
1225-
<<: *env-enable-sccache
1226-
UPLOAD_TO_S3: << pipeline.parameters.upload-to-s3 >>
12271181
<<: *steps-electron-build-for-publish
12281182

12291183
linux-arm-debug:
@@ -1274,9 +1228,7 @@ jobs:
12741228
<<: *env-linux-2xlarge-release
12751229
<<: *env-arm
12761230
<<: *env-release-build
1277-
<<: *env-enable-sccache
12781231
GCLIENT_EXTRA_ARGS: '--custom-var=checkout_arm=True --custom-var=checkout_boto=True --custom-var=checkout_requests=True'
1279-
UPLOAD_TO_S3: << pipeline.parameters.upload-to-s3 >>
12801232
<<: *steps-electron-build-for-publish
12811233

12821234
linux-arm64-debug:
@@ -1343,9 +1295,7 @@ jobs:
13431295
<<: *env-linux-2xlarge-release
13441296
<<: *env-arm64
13451297
<<: *env-release-build
1346-
<<: *env-enable-sccache
13471298
GCLIENT_EXTRA_ARGS: '--custom-var=checkout_arm64=True --custom-var=checkout_boto=True --custom-var=checkout_requests=True'
1348-
UPLOAD_TO_S3: << pipeline.parameters.upload-to-s3 >>
13491299
<<: *steps-electron-build-for-publish
13501300

13511301
osx-testing:
@@ -1403,9 +1353,7 @@ jobs:
14031353
environment:
14041354
<<: *env-mac-large-release
14051355
<<: *env-release-build
1406-
<<: *env-enable-sccache
14071356
GCLIENT_EXTRA_ARGS: '--custom-var=checkout_boto=True --custom-var=checkout_requests=True'
1408-
UPLOAD_TO_S3: << pipeline.parameters.upload-to-s3 >>
14091357
<<: *steps-electron-build-for-publish
14101358

14111359
mas-testing:
@@ -1469,9 +1417,7 @@ jobs:
14691417
<<: *env-mac-large-release
14701418
<<: *env-mas
14711419
<<: *env-release-build
1472-
<<: *env-enable-sccache
14731420
GCLIENT_EXTRA_ARGS: '--custom-var=checkout_boto=True --custom-var=checkout_requests=True'
1474-
UPLOAD_TO_S3: << pipeline.parameters.upload-to-s3 >>
14751421
<<: *steps-electron-build-for-publish
14761422

14771423
# Layer 3: Tests.
@@ -1727,56 +1673,11 @@ jobs:
17271673

17281674
workflows:
17291675
version: 2
1730-
1731-
# The publish workflows below each contain one job so that they are
1732-
# compatible with how sudowoodo works today. If these workflows are
1733-
# changed to have multiple jobs, then scripts/release/ci-release-build.js
1734-
# will need to be updated and there will most likely need to be changes to
1735-
# sudowoodo
1736-
1737-
publish-x64-linux:
1738-
when: << pipeline.parameters.run-linux-x64-publish >>
1739-
jobs:
1740-
- linux-x64-publish:
1741-
context: release-env
1742-
1743-
publish-ia32-linux:
1744-
when: << pipeline.parameters.run-linux-ia32-publish >>
1745-
jobs:
1746-
- linux-ia32-publish:
1747-
context: release-env
1748-
1749-
publish-arm-linux:
1750-
when: << pipeline.parameters.run-linux-arm-publish >>
1751-
jobs:
1752-
- linux-arm-publish:
1753-
context: release-env
1754-
1755-
publish-arm64-linux:
1756-
when: << pipeline.parameters.run-linux-arm64-publish >>
1757-
jobs:
1758-
- linux-arm64-publish:
1759-
context: release-env
1760-
1761-
publish-osx:
1762-
when: << pipeline.parameters.run-osx-publish >>
1763-
jobs:
1764-
- osx-publish:
1765-
context: release-env
1766-
1767-
publish-mas:
1768-
when: << pipeline.parameters.run-mas-publish >>
1769-
jobs:
1770-
- mas-publish:
1771-
context: release-env
1772-
17731676
lint:
1774-
when: << pipeline.parameters.run-lint >>
17751677
jobs:
17761678
- lint
17771679

17781680
build-linux:
1779-
when: << pipeline.parameters.run-build-linux >>
17801681
jobs:
17811682
- linux-checkout-fast
17821683
- linux-checkout-and-save-cache
@@ -1843,7 +1744,6 @@ workflows:
18431744
- linux-checkout-fast
18441745

18451746
build-mac:
1846-
when: << pipeline.parameters.run-build-mac >>
18471747
jobs:
18481748
- mac-checkout-fast
18491749
- mac-checkout-and-save-cache
@@ -1898,11 +1798,11 @@ workflows:
18981798
- master
18991799
- *chromium-upgrade-branches
19001800
jobs:
1901-
- linux-checkout-fast
1801+
- linux-checkout
19021802

19031803
- linux-x64-release:
19041804
requires:
1905-
- linux-checkout-fast
1805+
- linux-checkout
19061806
- linux-x64-release-tests:
19071807
requires:
19081808
- linux-x64-release
@@ -1914,7 +1814,7 @@ workflows:
19141814
- linux-x64-release
19151815
- linux-x64-chromedriver:
19161816
requires:
1917-
- linux-checkout-fast
1817+
- linux-checkout
19181818
- linux-x64-release-summary:
19191819
requires:
19201820
- linux-x64-release
@@ -1924,7 +1824,7 @@ workflows:
19241824

19251825
- linux-ia32-release:
19261826
requires:
1927-
- linux-checkout-fast
1827+
- linux-checkout
19281828
- linux-ia32-release-tests:
19291829
requires:
19301830
- linux-ia32-release
@@ -1936,7 +1836,7 @@ workflows:
19361836
- linux-ia32-release
19371837
- linux-ia32-chromedriver:
19381838
requires:
1939-
- linux-checkout-fast
1839+
- linux-checkout
19401840
- linux-ia32-release-summary:
19411841
requires:
19421842
- linux-ia32-release
@@ -1946,10 +1846,10 @@ workflows:
19461846

19471847
- linux-arm-release:
19481848
requires:
1949-
- linux-checkout-fast
1849+
- linux-checkout
19501850
- linux-arm-chromedriver:
19511851
requires:
1952-
- linux-checkout-fast
1852+
- linux-checkout
19531853
- linux-arm-release-summary:
19541854
requires:
19551855
- linux-arm-release
@@ -1958,10 +1858,10 @@ workflows:
19581858

19591859
- linux-arm64-release:
19601860
requires:
1961-
- linux-checkout-fast
1861+
- linux-checkout
19621862
- linux-arm64-chromedriver:
19631863
requires:
1964-
- linux-checkout-fast
1864+
- linux-checkout
19651865
- linux-arm64-release-summary:
19661866
requires:
19671867
- linux-arm64-release
@@ -1977,11 +1877,11 @@ workflows:
19771877
- master
19781878
- *chromium-upgrade-branches
19791879
jobs:
1980-
- mac-checkout-fast
1880+
- mac-checkout
19811881

19821882
- osx-release:
19831883
requires:
1984-
- mac-checkout-fast
1884+
- mac-checkout
19851885
- osx-release-tests:
19861886
requires:
19871887
- osx-release
@@ -1993,7 +1893,7 @@ workflows:
19931893
- osx-release
19941894
- osx-chromedriver:
19951895
requires:
1996-
- mac-checkout-fast
1896+
- mac-checkout
19971897
- osx-release-summary:
19981898
requires:
19991899
- osx-release
@@ -2003,7 +1903,7 @@ workflows:
20031903

20041904
- mas-release:
20051905
requires:
2006-
- mac-checkout-fast
1906+
- mac-checkout
20071907
- mas-release-tests:
20081908
requires:
20091909
- mas-release
@@ -2015,7 +1915,7 @@ workflows:
20151915
- mas-release
20161916
- mas-chromedriver:
20171917
requires:
2018-
- mac-checkout-fast
1918+
- mac-checkout
20191919
- mas-release-summary:
20201920
requires:
20211921
- mas-release

0 commit comments

Comments
 (0)