Mirrors/servo
1
0
Fork 0
mirror of https://github.com/servo/servo.git synced 2025-08-03 20:50:07 +01:00
Code Issues Projects Releases Packages Wiki Activity

Replace environmental cargo_profile___ with ${{}} (#30658)

Browse source
This commit is contained in:
Samson 2023-11-02 06:57:08 +01:00 • committed by GitHub
parent af68769007
commit 31ca45e589
No known key found for this signature in database
GPG key ID: 4AEE18F83AFDEB23
5 changed files with 25 additions and 25 deletions
Download patch file Download diff file Expand all files Collapse all files

4
.github/workflows/linux-wpt.yml vendored
View file

@ -71,7 +71,7 @@ jobs:
if: ${{ inputs.wpt != 'sync' }} if: ${{ inputs.wpt != 'sync' }}
run: | run: |
python3 ./mach test-wpt $WPT_COMMAND_LINE_ARG \ python3 ./mach test-wpt $WPT_COMMAND_LINE_ARG \
${cargo_profile_option} --processes $(nproc) --timeout-multiplier 2 \ ${{ env.cargo_profile_option }} --processes $(nproc) --timeout-multiplier 2 \
--total-chunks ${{ env.max_chunk_id }} --this-chunk ${{ matrix.chunk_id }} \ --total-chunks ${{ env.max_chunk_id }} --this-chunk ${{ matrix.chunk_id }} \
--log-raw test-wpt.${{ matrix.chunk_id }}.log \ --log-raw test-wpt.${{ matrix.chunk_id }}.log \
--log-raw-unexpected unexpected-test-wpt.${{ matrix.chunk_id }}.log \ --log-raw-unexpected unexpected-test-wpt.${{ matrix.chunk_id }}.log \
@ -83,7 +83,7 @@ jobs:
if: ${{ inputs.wpt == 'sync' }} if: ${{ inputs.wpt == 'sync' }}
run: | run: |
python3 ./mach test-wpt $WPT_COMMAND_LINE_ARG \ python3 ./mach test-wpt $WPT_COMMAND_LINE_ARG \
${cargo_profile_option} --processes $(nproc) --timeout-multiplier 2 \ ${{ env.cargo_profile_option }} --processes $(nproc) --timeout-multiplier 2 \
--total-chunks ${{ env.max_chunk_id }} --this-chunk ${{ matrix.chunk_id }} \ --total-chunks ${{ env.max_chunk_id }} --this-chunk ${{ matrix.chunk_id }} \
--log-raw test-wpt.${{ matrix.chunk_id }}.log \ --log-raw test-wpt.${{ matrix.chunk_id }}.log \
--always-succeed --always-succeed

12
.github/workflows/linux.yml vendored
View file

@ -93,14 +93,14 @@ jobs:
- name: Tidy - name: Tidy
run: python3 ./mach test-tidy --no-progress --all run: python3 ./mach test-tidy --no-progress --all
- name: Release build (${{ inputs.production && 'without' || 'with' }} debug assertions) - name: Release build (${{ inputs.production && 'without' || 'with' }} debug assertions)
run: python3 ./mach build ${cargo_profile_option} run: python3 ./mach build ${{ env.cargo_profile_option }}
- name: Smoketest - name: Smoketest
run: xvfb-run python3 ./mach smoketest ${cargo_profile_option} run: xvfb-run python3 ./mach smoketest ${{ env.cargo_profile_option }}
- name: Script tests - name: Script tests
run: ./mach test-scripts run: ./mach test-scripts
- name: Unit tests - name: Unit tests
if: ${{ inputs.unit-tests || github.ref_name == 'try-linux' }} if: ${{ inputs.unit-tests || github.ref_name == 'try-linux' }}
run: python3 ./mach test-unit ${cargo_profile_option} run: python3 ./mach test-unit ${{ env.cargo_profile_option }}
- name: Rename build timing - name: Rename build timing
run: cp -r target/cargo-timings target/cargo-timings-linux run: cp -r target/cargo-timings target/cargo-timings-linux
- name: Archive build timing - name: Archive build timing
@ -112,12 +112,12 @@ jobs:
- name: Lockfile check - name: Lockfile check
run: ./etc/ci/lockfile_changed.sh run: ./etc/ci/lockfile_changed.sh
- name: Build mach package - name: Build mach package
run: python3 ./mach package ${cargo_profile_option} run: python3 ./mach package ${{ env.cargo_profile_option }}
- name: Upload artifact for mach package - name: Upload artifact for mach package
uses: actions/upload-artifact@v3 uses: actions/upload-artifact@v3
with: with:
name: linux name: linux
path: target/${cargo_profile_name}/servo-tech-demo.tar.gz path: target/${{ env.cargo_profile_name }}/servo-tech-demo.tar.gz
- name: Upload nightly - name: Upload nightly
if: ${{ inputs.upload }} if: ${{ inputs.upload }}
run: | run: |
@ -129,7 +129,7 @@ jobs:
NIGHTLY_REPO_TOKEN: ${{ secrets.NIGHTLY_REPO_TOKEN }} NIGHTLY_REPO_TOKEN: ${{ secrets.NIGHTLY_REPO_TOKEN }}
NIGHTLY_REPO: ${{ github.repository_owner }}/servo-nightly-builds NIGHTLY_REPO: ${{ github.repository_owner }}/servo-nightly-builds
- name: Build package for target - name: Build package for target
run: tar -czf target.tar.gz target/${cargo_profile_name}/servo resources run: tar -czf target.tar.gz target/${{ env.cargo_profile_name }}/servo resources
- name: Upload artifact for target - name: Upload artifact for target
uses: actions/upload-artifact@v3 uses: actions/upload-artifact@v3
with: with:

4
.github/workflows/mac-wpt.yml vendored
View file

@ -47,11 +47,11 @@ jobs:
python3 -m pip install --upgrade pip virtualenv python3 -m pip install --upgrade pip virtualenv
python3 ./mach bootstrap python3 ./mach bootstrap
- name: Smoketest - name: Smoketest
run: python3 ./mach smoketest ${cargo_profile_option} run: python3 ./mach smoketest ${{ env.cargo_profile_option }}
- name: Run tests - name: Run tests
run: | run: |
python3 ./mach test-wpt $WPT_COMMAND_LINE_ARG \ python3 ./mach test-wpt $WPT_COMMAND_LINE_ARG \
${cargo_profile_option} --processes $(sysctl -n hw.logicalcpu) --timeout-multiplier 8 \ ${{ env.cargo_profile_option }} --processes $(sysctl -n hw.logicalcpu) --timeout-multiplier 8 \
--total-chunks ${{ env.max_chunk_id }} --this-chunk ${{ matrix.chunk_id }} \ --total-chunks ${{ env.max_chunk_id }} --this-chunk ${{ matrix.chunk_id }} \
--log-raw test-wpt.${{ matrix.chunk_id }}.log \ --log-raw test-wpt.${{ matrix.chunk_id }}.log \
--log-raw-unexpected unexpected-test-wpt.${{ matrix.chunk_id }}.log \ --log-raw-unexpected unexpected-test-wpt.${{ matrix.chunk_id }}.log \

14
.github/workflows/mac.yml vendored
View file

@ -86,19 +86,19 @@ jobs:
brew install gnu-tar brew install gnu-tar
- name: Release build (${{ inputs.production && 'without' || 'with' }} debug assertions) - name: Release build (${{ inputs.production && 'without' || 'with' }} debug assertions)
run: | run: |
python3 ./mach build ${cargo_profile_option} python3 ./mach build ${{ env.cargo_profile_option }}
- name: Smoketest - name: Smoketest
run: python3 ./mach smoketest ${cargo_profile_option} run: python3 ./mach smoketest ${{ env.cargo_profile_option }}
- name: Script tests - name: Script tests
run: ./mach test-scripts run: ./mach test-scripts
- name: Unit tests - name: Unit tests
if: ${{ inputs.unit-tests || github.ref_name == 'try-mac' }} if: ${{ inputs.unit-tests || github.ref_name == 'try-mac' }}
timeout-minutes: 30 # https://github.com/servo/servo/issues/30275 timeout-minutes: 30 # https://github.com/servo/servo/issues/30275
run: python3 ./mach test-unit ${cargo_profile_option} run: python3 ./mach test-unit ${{ env.cargo_profile_option }}
- name: Build mach package - name: Build mach package
run: python3 ./mach package ${cargo_profile_option} run: python3 ./mach package ${{ env.cargo_profile_option }}
- name: Run smoketest for mach package - name: Run smoketest for mach package
run: ./etc/ci/macos_package_smoketest.sh target/${cargo_profile_name}/servo-tech-demo.dmg run: ./etc/ci/macos_package_smoketest.sh target/${{ env.cargo_profile_name }}/servo-tech-demo.dmg
- name: Rename build timing - name: Rename build timing
run: cp -r target/cargo-timings target/cargo-timings-macos run: cp -r target/cargo-timings target/cargo-timings-macos
- name: Archive build timing - name: Archive build timing
@ -111,7 +111,7 @@ jobs:
uses: actions/upload-artifact@v3 uses: actions/upload-artifact@v3
with: with:
name: mac name: mac
path: target/${cargo_profile_name}/servo-tech-demo.dmg path: target/${{ env.cargo_profile_name }}/servo-tech-demo.dmg
- name: Upload nightly - name: Upload nightly
if: ${{ inputs.upload }} if: ${{ inputs.upload }}
run: | run: |
@ -123,7 +123,7 @@ jobs:
NIGHTLY_REPO_TOKEN: ${{ secrets.NIGHTLY_REPO_TOKEN }} NIGHTLY_REPO_TOKEN: ${{ secrets.NIGHTLY_REPO_TOKEN }}
NIGHTLY_REPO: ${{ github.repository_owner }}/servo-nightly-builds NIGHTLY_REPO: ${{ github.repository_owner }}/servo-nightly-builds
- name: Build package for target - 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 run: gtar -czf target.tar.gz target/${{ env.cargo_profile_name }}/servo target/${{ env.cargo_profile_name }}/*.dylib target/${{ env.cargo_profile_name }}/lib/*.dylib resources
- name: Upload package for target - name: Upload package for target
uses: actions/upload-artifact@v3 uses: actions/upload-artifact@v3
with: with:

16
.github/workflows/windows.yml vendored
View file

@ -78,14 +78,14 @@ jobs:
python mach fetch python mach fetch
python mach bootstrap-gstreamer python mach bootstrap-gstreamer
- name: Release build (${{ inputs.production && 'without' || 'with' }} debug assertions) - name: Release build (${{ inputs.production && 'without' || 'with' }} debug assertions)
run: python mach build ($env:cargo_profile_option -split ' ') run: python mach build ${{ env.cargo_profile_option }}
- name: Copy resources - name: Copy resources
run: cp D:\a\servo\servo\resources C:\a\servo\servo -Recurse run: cp D:\a\servo\servo\resources C:\a\servo\servo -Recurse
- name: Smoketest - name: Smoketest
run: python mach smoketest --angle ($env:cargo_profile_option -split ' ') run: python mach smoketest --angle ${{ env.cargo_profile_option }}
- name: Unit tests - name: Unit tests
if: ${{ inputs.unit-tests || github.ref_name == 'try-windows' }} if: ${{ inputs.unit-tests || github.ref_name == 'try-windows' }}
run: python mach test-unit ($env:cargo_profile_option -split ' ') run: python mach test-unit ${{ env.cargo_profile_option }}
- name: Rename build timing - name: Rename build timing
run: cp C:\a\servo\servo\target\cargo-timings C:\a\servo\servo\target\cargo-timings-windows -Recurse run: cp C:\a\servo\servo\target\cargo-timings C:\a\servo\servo\target\cargo-timings-windows -Recurse
- name: Archive build timing - name: Archive build timing
@ -95,16 +95,16 @@ jobs:
# Using a wildcard here ensures that the archive includes the path. # Using a wildcard here ensures that the archive includes the path.
path: C:\\a\\servo\\servo\\target\\cargo-timings-* path: C:\\a\\servo\\servo\\target\\cargo-timings-*
- name: Build mach package - name: Build mach package
run: python mach package ($env:cargo_profile_option -split ' ') run: python mach package ${{ env.cargo_profile_option }}
- name: Upload artifact for mach package - name: Upload artifact for mach package
uses: actions/upload-artifact@v3 uses: actions/upload-artifact@v3
with: with:
name: win name: win
# These files are available # These files are available
# MSI Installer: C:\a\servo\servo\target\$env:cargo_profile_name\msi\Installer.msi # 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 # 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 # 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 path: C:\\a\\servo\\servo\\target\\${{ env.cargo_profile_name }}\\msi\\Servo.exe
- name: Upload nightly - name: Upload nightly
if: ${{ inputs.upload }} if: ${{ inputs.upload }}
run: | run: |