chore: remove ia32 Linux support

electron · Apr 22, 2022 · 389ef07 · 389ef07
1 parent e416a5a
commit 389ef07
Show file tree

Hide file tree

Showing 4 changed files with 3 additions and 133 deletions.
diff --git a/.circleci/config/base.yml b/.circleci/config/base.yml
@@ -24,7 +24,7 @@ parameters:
   linux-publish-arch-limit:
     type: enum
     default: all
-    enum: ["all", "arm", "arm64", "x64", "ia32"]
+    enum: ["all", "arm", "arm64", "x64"]
 
   run-macos-publish:
     type: boolean
@@ -115,12 +115,6 @@ env-unittests: &env-unittests
   BUILD_TARGET: electron/spec:chromium_unittests
   TESTS_CONFIG: src/electron/spec/configs/unittests.yml
 
-# Build targets options.
-env-ia32: &env-ia32
-  GN_EXTRA_ARGS: 'target_cpu = "x86"'
-  NPM_CONFIG_ARCH: ia32
-  TARGET_ARCH: ia32
-
 env-arm: &env-arm
   GN_EXTRA_ARGS: 'target_cpu = "arm"'
   MKSNAPSHOT_TOOLCHAIN: //build/toolchain/linux:clang_arm
@@ -586,8 +580,6 @@ step-maybe-electron-dist-strip: &step-maybe-electron-dist-strip
       if [ "$STRIP_BINARIES" == "true" ] && [ "`uname`" == "Linux" ]; then
         if [ x"$TARGET_ARCH" == x ]; then
           target_cpu=x64
-        elif [ "$TARGET_ARCH" == "ia32" ]; then
-          target_cpu=x86
         else
           target_cpu="$TARGET_ARCH"
         fi
@@ -618,8 +610,6 @@ step-electron-dist-build: &step-electron-dist-build
             target_os=linux
             if [ x"$TARGET_ARCH" == x ]; then
               target_cpu=x64
-            elif [ "$TARGET_ARCH" == "ia32" ]; then
-              target_cpu=x86
             else
               target_cpu="$TARGET_ARCH"
             fi
@@ -1802,54 +1792,6 @@ jobs:
                 attach: false
                 checkout: true
 
-  linux-ia32-testing:
-    executor: linux-docker
-    environment:
-      <<: *env-global
-      <<: *env-ia32
-      <<: *env-testing-build
-      <<: *env-ninja-status
-      GCLIENT_EXTRA_ARGS: '--custom-var=checkout_arm=True --custom-var=checkout_arm64=True'
-    steps:
-      - electron-build:
-          persist: true
-          checkout: true
-          use-out-cache: false
-
-  linux-ia32-release:
-    executor: linux-docker
-    environment:
-      <<: *env-linux-2xlarge-release
-      <<: *env-ia32
-      <<: *env-release-build
-      <<: *env-send-slack-notifications
-      <<: *env-ninja-status
-      GCLIENT_EXTRA_ARGS: '--custom-var=checkout_arm=True --custom-var=checkout_arm64=True'
-    steps:
-      - electron-build:
-          persist: true
-          checkout: true
-
-  linux-ia32-publish:
-    executor: linux-docker
-    environment:
-      <<: *env-linux-2xlarge-release
-      <<: *env-ia32
-      <<: *env-release-build
-      <<: *env-32bit-release
-      UPLOAD_TO_S3: << pipeline.parameters.upload-to-s3 >>
-      <<: *env-ninja-status
-    steps:
-      - run: echo running
-      - when:
-          condition:
-            or:
-              - equal: ["all", << pipeline.parameters.linux-publish-arch-limit >>]
-              - equal: ["ia32", << pipeline.parameters.linux-publish-arch-limit >>]
-          steps:
-            - electron-publish:
-                attach: false
-                checkout: true
 
   linux-arm-testing:
     executor: linux-docker
@@ -2240,60 +2182,6 @@ jobs:
       <<: *env-send-slack-notifications
     <<: *steps-verify-ffmpeg
 
-  linux-ia32-testing-tests:
-    executor:
-      name: linux-docker
-      size: medium
-    environment:
-      <<: *env-linux-medium
-      <<: *env-ia32
-      <<: *env-headless-testing
-      <<: *env-stack-dumping
-    parallelism: 3
-    <<: *steps-tests
-
-  linux-ia32-testing-nan:
-    executor:
-      name: linux-docker
-      size: medium
-    environment:
-      <<: *env-linux-medium
-      <<: *env-ia32
-      <<: *env-headless-testing
-      <<: *env-stack-dumping
-    <<: *steps-test-nan
-
-  linux-ia32-testing-node:
-    executor: linux-docker
-    environment:
-      <<: *env-linux-medium
-      <<: *env-ia32
-      <<: *env-headless-testing
-      <<: *env-stack-dumping
-    <<: *steps-test-node
-
-  linux-ia32-release-tests:
-    executor:
-      name: linux-docker
-      size: medium
-    environment:
-      <<: *env-linux-medium
-      <<: *env-ia32
-      <<: *env-headless-testing
-      <<: *env-send-slack-notifications
-    <<: *steps-tests
-
-  linux-ia32-verify-ffmpeg:
-    executor:
-      name: linux-docker
-      size: medium
-    environment:
-      <<: *env-linux-medium
-      <<: *env-ia32
-      <<: *env-headless-testing
-      <<: *env-send-slack-notifications
-    <<: *steps-verify-ffmpeg
-
   linux-arm-testing-tests:
     executor: linux-arm
     environment:
@@ -2371,8 +2259,6 @@ workflows:
     jobs:
     - linux-x64-publish:
         context: release-env
-    - linux-ia32-publish:
-        context: release-env
     - linux-arm-publish:
         context: release-env
     - linux-arm64-publish:
@@ -2426,16 +2312,6 @@ workflows:
       - linux-x64-testing-node:
           requires:
             - linux-x64-testing
-      - linux-ia32-testing
-      - linux-ia32-testing-tests:
-          requires:
-            - linux-ia32-testing
-      - linux-ia32-testing-nan:
-          requires:
-            - linux-ia32-testing
-      - linux-ia32-testing-node:
-          requires:
-            - linux-ia32-testing
       - linux-arm-testing
       - linux-arm-testing-tests:
           filters:

diff --git a/docs/development/build-instructions-linux.md b/docs/development/build-instructions-linux.md
@@ -82,7 +82,7 @@ $ sudo apt-get install libc6-dev-arm64-cross linux-libc-dev-arm64-cross \
                        g++-aarch64-linux-gnu
 ```
 
-And to cross-compile for `arm` or `ia32` targets, you should pass the
+And to cross-compile for `arm` or targets, you should pass the
 `target_cpu` parameter to `gn gen`:
 
 ```sh

diff --git a/script/release/ci-release-build.js b/script/release/ci-release-build.js
@@ -22,7 +22,7 @@ const circleCIPublishWorkflows = [
 
 const circleCIPublishIndividualArches = {
   'macos-publish': ['osx-x64', 'mas-x64', 'osx-arm64', 'mas-arm64'],
-  'linux-publish': ['arm', 'arm64', 'ia32', 'x64']
+  'linux-publish': ['arm', 'arm64', 'x64']
 };
 
 const vstsArmJobs = [

diff --git a/script/release/release.js b/script/release/release.js
@@ -101,7 +101,6 @@ function assetsForVersion (version, validatingRelease) {
     `chromedriver-${version}-darwin-arm64.zip`,
     `chromedriver-${version}-linux-arm64.zip`,
     `chromedriver-${version}-linux-armv7l.zip`,
-    `chromedriver-${version}-linux-ia32.zip`,
     `chromedriver-${version}-linux-x64.zip`,
     `chromedriver-${version}-mas-x64.zip`,
     `chromedriver-${version}-mas-arm64.zip`,
@@ -120,8 +119,6 @@ function assetsForVersion (version, validatingRelease) {
     `electron-${version}-linux-arm64.zip`,
     `electron-${version}-linux-armv7l-symbols.zip`,
     `electron-${version}-linux-armv7l.zip`,
-    `electron-${version}-linux-ia32-symbols.zip`,
-    `electron-${version}-linux-ia32.zip`,
     `electron-${version}-linux-x64-debug.zip`,
     `electron-${version}-linux-x64-symbols.zip`,
     `electron-${version}-linux-x64.zip`,
@@ -150,13 +147,11 @@ function assetsForVersion (version, validatingRelease) {
     'libcxxabi_headers.zip',
     `libcxx-objects-${version}-linux-arm64.zip`,
     `libcxx-objects-${version}-linux-armv7l.zip`,
-    `libcxx-objects-${version}-linux-ia32.zip`,
     `libcxx-objects-${version}-linux-x64.zip`,
     `ffmpeg-${version}-darwin-x64.zip`,
     `ffmpeg-${version}-darwin-arm64.zip`,
     `ffmpeg-${version}-linux-arm64.zip`,
     `ffmpeg-${version}-linux-armv7l.zip`,
-    `ffmpeg-${version}-linux-ia32.zip`,
     `ffmpeg-${version}-linux-x64.zip`,
     `ffmpeg-${version}-mas-x64.zip`,
     `ffmpeg-${version}-mas-arm64.zip`,
@@ -167,7 +162,6 @@ function assetsForVersion (version, validatingRelease) {
     `mksnapshot-${version}-darwin-arm64.zip`,
     `mksnapshot-${version}-linux-arm64-x64.zip`,
     `mksnapshot-${version}-linux-armv7l-x64.zip`,
-    `mksnapshot-${version}-linux-ia32.zip`,
     `mksnapshot-${version}-linux-x64.zip`,
     `mksnapshot-${version}-mas-x64.zip`,
     `mksnapshot-${version}-mas-arm64.zip`,