Revert "Enable debug assertions for all builds other than official re…

…leases (#30509)" This reverts commit a3d2f0c.
servo · Oct 27, 2023 · e68be1b · e68be1b
1 parent 4c8eb13
commit e68be1b
Show file tree

Hide file tree

Showing 31 changed files with 187 additions and 341 deletions.
diff --git a/.github/workflows/linux-wpt.yml b/.github/workflows/linux-wpt.yml
@@ -2,9 +2,6 @@ name: Linux WPT Tests
 on:
   workflow_call:
     inputs:
-      production:
-        required: false
-        type: boolean
       wpt:
         required: false
         type: string
@@ -13,7 +10,6 @@ on:
         type: string
 
 env:
-  cargo_profile_option: ${{ inputs.production && '--profile production' || '--release' }}
   RUST_BACKTRACE: 1
   SHELL: /bin/bash
   WPT_COMMAND_LINE_ARG: "${{ inputs.layout == 'layout-2013' && '--legacy-layout' || '' }}"
@@ -71,7 +67,7 @@ jobs:
         if: ${{ inputs.wpt != 'sync' }}
         run: |
           python3 ./mach test-wpt $WPT_COMMAND_LINE_ARG \
-            ${cargo_profile_option} --processes $(nproc) --timeout-multiplier 2 \
+            --release --processes $(nproc) --timeout-multiplier 2 \
             --total-chunks ${{ env.max_chunk_id }} --this-chunk ${{ matrix.chunk_id }} \
             --log-raw test-wpt.${{ matrix.chunk_id }}.log \
             --log-raw-unexpected unexpected-test-wpt.${{ matrix.chunk_id }}.log \
@@ -83,7 +79,7 @@ jobs:
         if: ${{ inputs.wpt == 'sync' }}
         run: |
           python3 ./mach test-wpt $WPT_COMMAND_LINE_ARG \
-            ${cargo_profile_option} --processes $(nproc) --timeout-multiplier 2 \
+            --release --processes $(nproc) --timeout-multiplier 2 \
             --total-chunks ${{ env.max_chunk_id }} --this-chunk ${{ matrix.chunk_id }} \
             --log-raw test-wpt.${{ matrix.chunk_id }}.log \
             --always-succeed

diff --git a/.github/workflows/linux.yml b/.github/workflows/linux.yml
@@ -2,9 +2,6 @@ name: Linux
 on:
   workflow_call:
     inputs:
-      production:
-        required: false
-        type: boolean
       wpt:
         required: false
         type: string
@@ -24,9 +21,6 @@ on:
         type: string
   workflow_dispatch:
     inputs:
-      production:
-        required: false
-        type: boolean
       wpt:
         default: "test"
         required: false
@@ -48,8 +42,6 @@ on:
     branches: ["try-linux", "try-wpt", "try-wpt-2020"]
 
 env:
-  cargo_profile_option: ${{ inputs.production && '--profile production' || '--release' }}
-  cargo_profile_name: ${{ inputs.production && 'production' || 'release' }}
   RUST_BACKTRACE: 1
   SHELL: /bin/bash
   SCCACHE_GHA_ENABLED: "true"
@@ -90,15 +82,15 @@ jobs:
         run: sudo apt update && python3 ./mach bootstrap
       - name: Tidy
         run: python3 ./mach test-tidy --no-progress --all
-      - name: Release build (${{ inputs.production && 'without' || 'with' }} debug assertions)
-        run: python3 ./mach build ${cargo_profile_option}
+      - name: Release build
+        run: python3 ./mach build --release
       - name: Smoketest
-        run: xvfb-run python3 ./mach smoketest ${cargo_profile_option}
+        run: xvfb-run python3 ./mach smoketest --release
       - name: Script tests
         run: ./mach test-scripts
       - name: Unit tests
         if: ${{ inputs.unit-tests || github.ref_name == 'try-linux' }}
-        run: python3 ./mach test-unit ${cargo_profile_option}
+        run: python3 ./mach test-unit --release
       - name: Rename build timing
         run: cp -r target/cargo-timings target/cargo-timings-linux
       - name: Archive build timing
@@ -109,14 +101,14 @@ jobs:
           path: target/cargo-timings-*
       - name: Lockfile check
         run: ./etc/ci/lockfile_changed.sh
-      - name: Build mach package
-        run: python3 ./mach package ${cargo_profile_option}
-      - name: Upload artifact for mach package
+      - name: Package
+        run: python3 ./mach package --release
+      - name: Upload Package
         uses: actions/upload-artifact@v3
         with:
           name: linux
-          path: target/${cargo_profile_name}/servo-tech-demo.tar.gz
-      - name: Upload nightly
+          path: target/release/servo-tech-demo.tar.gz
+      - name: Upload
         if: ${{ inputs.upload }}
         run: |
           python3 ./mach upload-nightly linux \
@@ -126,9 +118,9 @@ jobs:
           S3_UPLOAD_CREDENTIALS: ${{ secrets.S3_UPLOAD_CREDENTIALS }}
           NIGHTLY_REPO_TOKEN: ${{ secrets.NIGHTLY_REPO_TOKEN }}
           NIGHTLY_REPO: ${{ github.repository_owner }}/servo-nightly-builds
-      - name: Build package for target
-        run: tar -czf target.tar.gz target/${cargo_profile_name}/servo resources
-      - name: Upload artifact for target
+      - name: Package binary
+        run: tar -czf target.tar.gz target/release/servo resources
+      - name: Archive binary
         uses: actions/upload-artifact@v3
         with:
           name: release-binary
@@ -140,7 +132,6 @@ jobs:
     needs: ["build"]
     uses: ./.github/workflows/linux-wpt.yml
     with:
-      production: ${{ inputs.production }}
       wpt: ${{ inputs.wpt }}
       layout: "layout-2020"
 
@@ -150,7 +141,6 @@ jobs:
     needs: ["build"]
     uses: ./.github/workflows/linux-wpt.yml
     with:
-      production: ${{ inputs.production }}
       wpt: ${{ inputs.wpt }}
       layout: "layout-2013"
 

diff --git a/.github/workflows/mac-wpt.yml b/.github/workflows/mac-wpt.yml
@@ -3,15 +3,11 @@ name: Mac WPT Tests
 on:
   workflow_call:
     inputs:
-      production:
-        required: false
-        type: boolean
       layout:
         required: true
         type: string
 
 env:
-  cargo_profile_option: ${{ inputs.production && '--profile production' || '--release' }}
   RUST_BACKTRACE: 1
   SHELL: /bin/bash
   WPT_COMMAND_LINE_ARG: "${{ inputs.layout == 'layout-2013' && '--legacy-layout' || '' }}"
@@ -47,11 +43,11 @@ jobs:
           python3 -m pip install --upgrade pip virtualenv
           python3 ./mach bootstrap
       - name: Smoketest
-        run: python3 ./mach smoketest ${cargo_profile_option}
+        run: python3 ./mach smoketest --release
       - name: Run tests
         run: |
           python3 ./mach test-wpt $WPT_COMMAND_LINE_ARG \
-            ${cargo_profile_option} --processes $(sysctl -n hw.logicalcpu) --timeout-multiplier 8 \
+            --release --processes $(sysctl -n hw.logicalcpu) --timeout-multiplier 8 \
             --total-chunks ${{ env.max_chunk_id }} --this-chunk ${{ matrix.chunk_id }} \
             --log-raw test-wpt.${{ matrix.chunk_id }}.log \
             --log-raw-unexpected unexpected-test-wpt.${{ matrix.chunk_id }}.log \

diff --git a/.github/workflows/mac.yml b/.github/workflows/mac.yml
@@ -3,9 +3,6 @@ name: Mac
 on:
   workflow_call:
     inputs:
-      production:
-        required: false
-        type: boolean
       wpt-layout:
         required: false
         type: string
@@ -22,9 +19,6 @@ on:
         type: string
   workflow_dispatch:
     inputs:
-      production:
-        required: false
-        type: boolean
       wpt-layout:
         required: false
         type: choice
@@ -41,8 +35,6 @@ on:
     branches: ["try-mac", "try-wpt-mac", "try-wpt-mac-2020"]
 
 env:
-  cargo_profile_option: ${{ inputs.production && '--profile production' || '--release' }}
-  cargo_profile_name: ${{ inputs.production && 'production' || 'release' }}
   RUST_BACKTRACE: 1
   SHELL: /bin/bash
   SCCACHE_GHA_ENABLED: "true"
@@ -78,21 +70,21 @@ jobs:
           python3 -m pip install --upgrade pip virtualenv
           python3 ./mach bootstrap
           brew install gnu-tar
-      - name: Release build (${{ inputs.production && 'without' || 'with' }} debug assertions)
+      - name: Release build
         run: |
-          python3 ./mach build ${cargo_profile_option}
+          python3 ./mach build --release
       - name: Smoketest
-        run: python3 ./mach smoketest ${cargo_profile_option}
+        run: python3 ./mach smoketest --release
       - name: Script tests
         run: ./mach test-scripts
       - name: Unit tests
         if: ${{ inputs.unit-tests || github.ref_name == 'try-mac' }}
         timeout-minutes: 30 # https://github.com/servo/servo/issues/30275
-        run: python3 ./mach test-unit ${cargo_profile_option}
-      - name: Build mach package
-        run: python3 ./mach package ${cargo_profile_option}
-      - name: Run smoketest for mach package
-        run: ./etc/ci/macos_package_smoketest.sh target/${cargo_profile_name}/servo-tech-demo.dmg
+        run: python3 ./mach test-unit --release
+      - name: Package
+        run: python3 ./mach package --release
+      - name: Package smoketest
+        run: ./etc/ci/macos_package_smoketest.sh target/release/servo-tech-demo.dmg
       - name: Rename build timing
         run: cp -r target/cargo-timings target/cargo-timings-macos
       - name: Archive build timing
@@ -101,12 +93,12 @@ jobs:
           name: cargo-timings
           # Using a wildcard here ensures that the archive includes the path.
           path: target/cargo-timings-*
-      - name: Upload artifact for mach package
+      - name: Upload package
         uses: actions/upload-artifact@v3
         with:
           name: mac
-          path: target/${cargo_profile_name}/servo-tech-demo.dmg
-      - name: Upload nightly
+          path: target/release/servo-tech-demo.dmg
+      - name: Upload
         if: ${{ inputs.upload }}
         run: |
           python3 ./mach upload-nightly mac --secret-from-environment \
@@ -116,9 +108,9 @@ jobs:
           GITHUB_HOMEBREW_TOKEN: ${{ secrets.HOMEBREW_TOKEN }}
           NIGHTLY_REPO_TOKEN: ${{ secrets.NIGHTLY_REPO_TOKEN }}
           NIGHTLY_REPO: ${{ github.repository_owner }}/servo-nightly-builds
-      - name: Build package for target
-        run: gtar -czf target.tar.gz target/${cargo_profile_name}/servo target/${cargo_profile_name}/*.dylib target/${cargo_profile_name}/lib/*.dylib resources
-      - name: Upload package for target
+      - name: Package binary
+        run: gtar -czf target.tar.gz target/release/servo target/release/*.dylib target/release/lib/*.dylib resources
+      - name: Archive binary
         uses: actions/upload-artifact@v3
         with:
           name: release-binary-macos
@@ -130,7 +122,6 @@ jobs:
     needs: ["build"]
     uses: ./.github/workflows/mac-wpt.yml
     with:
-      production: ${{ inputs.production }}
       layout: "layout-2020"
 
   wpt-2013:
@@ -139,7 +130,6 @@ jobs:
     needs: ["build"]
     uses: ./.github/workflows/mac-wpt.yml
     with:
-      production: ${{ inputs.production }}
       layout: "layout-2013"
 
   result:

diff --git a/.github/workflows/main.yml b/.github/workflows/main.yml
@@ -71,7 +71,6 @@ jobs:
             }
 
             let returnValue =  {
-              production: false,
               platforms,
               layout,
               unit_tests,
@@ -86,7 +85,6 @@ jobs:
     if: ${{ contains(fromJson(needs.decision.outputs.configuration).platforms, 'windows') }}
     uses: ./.github/workflows/windows.yml
     with:
-      production: ${{ fromJson(needs.decision.outputs.configuration).production }}
       unit-tests: ${{ fromJson(needs.decision.outputs.configuration).unit_tests }}
 
   build-mac:
@@ -95,7 +93,6 @@ jobs:
     if: ${{ contains(fromJson(needs.decision.outputs.configuration).platforms, 'macos') }}
     uses: ./.github/workflows/mac.yml
     with:
-      production: ${{ fromJson(needs.decision.outputs.configuration).production }}
       unit-tests: ${{ fromJson(needs.decision.outputs.configuration).unit_tests }}
 
   build-linux:
@@ -104,7 +101,6 @@ jobs:
     if: ${{ contains(fromJson(needs.decision.outputs.configuration).platforms, 'linux') }}
     uses: ./.github/workflows/linux.yml
     with:
-      production: ${{ fromJson(needs.decision.outputs.configuration).production }}
       wpt: 'test'
       layout: ${{ fromJson(needs.decision.outputs.configuration).layout }}
       unit-tests: ${{ fromJson(needs.decision.outputs.configuration).unit_tests }}

diff --git a/.github/workflows/nightly.yml b/.github/workflows/nightly.yml
@@ -70,7 +70,6 @@ jobs:
       - create-draft-release
     uses: ./.github/workflows/windows.yml
     with:
-      production: true
       upload: true
       github-release-id: ${{ needs.create-draft-release.outputs.release-id }}
     secrets: inherit
@@ -83,7 +82,6 @@ jobs:
       - create-draft-release
     uses: ./.github/workflows/mac.yml
     with:
-      production: true
       upload: true
       github-release-id: ${{ needs.create-draft-release.outputs.release-id }}
     secrets: inherit
@@ -96,7 +94,6 @@ jobs:
       - create-draft-release
     uses: ./.github/workflows/linux.yml
     with:
-      production: true
       upload: true
       github-release-id: ${{ needs.create-draft-release.outputs.release-id }}
-    secrets: inherit
+    secrets: inherit
diff --git a/.github/workflows/windows.yml b/.github/workflows/windows.yml
@@ -3,9 +3,6 @@ name: Windows
 on:
   workflow_call:
     inputs:
-      production:
-        required: false
-        type: boolean
       unit-tests:
         required: false
         default: false
@@ -19,9 +16,6 @@ on:
         type: string
   workflow_dispatch:
     inputs:
-      production:
-        required: false
-        type: boolean
       unit-tests:
         required: false
         default: false
@@ -34,8 +28,6 @@ on:
     branches: ["try-windows"]
 
 env:
-  cargo_profile_option: ${{ inputs.production && '--profile production' || '--release' }}
-  cargo_profile_name: ${{ inputs.production && 'production' || 'release' }}
   RUST_BACKTRACE: 1
   SHELL: /bin/bash
   CCACHE: "ccache"
@@ -77,15 +69,15 @@ jobs:
           python -m pip install --upgrade pip virtualenv
           python mach fetch
           python mach bootstrap-gstreamer
-      - name: Release build (${{ inputs.production && 'without' || 'with' }} debug assertions)
-        run: python mach build ($env:cargo_profile_option -split ' ')
+      - name: Release build
+        run: python mach build --release
       - name: Copy resources
         run: cp D:\a\servo\servo\resources C:\a\servo\servo -Recurse
       - name: Smoketest
-        run: python mach smoketest --angle ($env:cargo_profile_option -split ' ')
+        run: python mach smoketest --angle --release
       - name: Unit tests
         if: ${{ inputs.unit-tests || github.ref_name == 'try-windows' }}
-        run: python mach test-unit ($env:cargo_profile_option -split ' ')
+        run: python mach test-unit --release
       - name: Rename build timing
         run: cp C:\a\servo\servo\target\cargo-timings C:\a\servo\servo\target\cargo-timings-windows -Recurse
       - name: Archive build timing
@@ -94,17 +86,17 @@ jobs:
           name: cargo-timings
           # Using a wildcard here ensures that the archive includes the path.
           path: C:\\a\\servo\\servo\\target\\cargo-timings-*
-      - name: Build mach package
-        run: python mach package ($env:cargo_profile_option -split ' ')
-      - name: Upload artifact for mach package
+      - name: Package
+        run: python mach package --release
+      - name: Upload package
         uses: actions/upload-artifact@v3
         with:
           name: win
           # These files are available
-          # MSI Installer: C:\a\servo\servo\target\$env:cargo_profile_name\msi\Installer.msi
-          # Bundle: C:\a\servo\servo\target\$env:cargo_profile_name\msi\Servo.exe
-          # Zip: C:\a\servo\servo\target\$env:cargo_profile_name\msi\Servo.zip
-          path: C:\\a\\servo\\servo\\target\\$env:cargo_profile_name\\msi\\Servo.exe
+          # MSI Installer: C:\a\servo\servo\target\release\msi\Installer.msi
+          # Bundle: C:\a\servo\servo\target\release\msi\Servo.exe
+          # Zip: C:\a\servo\servo\target\release\msi\Servo.zip
+          path: C:\\a\\servo\\servo\\target/release/msi/Servo.exe
       - name: Upload nightly
         if: ${{ inputs.upload }}
         run: |