mirror of
https://github.com/servo/servo.git
synced 2025-08-06 06:00:15 +01:00
CI: fix python error in mac-wpt job
This commit is contained in:
parent
1b629c6383
commit
a24b12f5bf
1 changed files with 32 additions and 21 deletions
53
.github/workflows/main.yml
vendored
53
.github/workflows/main.yml
vendored
|
@ -17,9 +17,6 @@ jobs:
|
||||||
name: Build (macOS)
|
name: Build (macOS)
|
||||||
runs-on: macos-12
|
runs-on: macos-12
|
||||||
steps:
|
steps:
|
||||||
- name: Branch check
|
|
||||||
if: ${{ !contains('refs/heads/auto refs/heads/try refs/heads/try-mac', github.ref) }}
|
|
||||||
run: exit 0
|
|
||||||
- uses: actions/checkout@v3
|
- uses: actions/checkout@v3
|
||||||
with:
|
with:
|
||||||
fetch-depth: 2
|
fetch-depth: 2
|
||||||
|
@ -40,6 +37,18 @@ jobs:
|
||||||
rm -rf /usr/local/etc/openssl
|
rm -rf /usr/local/etc/openssl
|
||||||
rm -rf /usr/local/etc/openssl@1.1
|
rm -rf /usr/local/etc/openssl@1.1
|
||||||
brew install openssl@1.1 gnu-tar
|
brew install openssl@1.1 gnu-tar
|
||||||
|
- name: Cache mach fetch
|
||||||
|
uses: actions/cache@v3
|
||||||
|
with:
|
||||||
|
path: |
|
||||||
|
~/.rustup
|
||||||
|
~/.cargo
|
||||||
|
key: fetch-${{ runner.os }}
|
||||||
|
- name: Cache target
|
||||||
|
uses: actions/cache@v3
|
||||||
|
with:
|
||||||
|
path: target
|
||||||
|
key: target-${{ runner.os }}
|
||||||
- name: Release build
|
- name: Release build
|
||||||
run: |
|
run: |
|
||||||
export OPENSSL_INCLUDE_DIR="$(brew --prefix openssl)/include"
|
export OPENSSL_INCLUDE_DIR="$(brew --prefix openssl)/include"
|
||||||
|
@ -47,14 +56,14 @@ jobs:
|
||||||
export PKG_CONFIG_PATH="$(brew --prefix libffi)/lib/pkgconfig/"
|
export PKG_CONFIG_PATH="$(brew --prefix libffi)/lib/pkgconfig/"
|
||||||
export PKG_CONFIG_PATH="$(brew --prefix zlib)/lib/pkgconfig/:$PKG_CONFIG_PATH"
|
export PKG_CONFIG_PATH="$(brew --prefix zlib)/lib/pkgconfig/:$PKG_CONFIG_PATH"
|
||||||
python3 ./mach build --release
|
python3 ./mach build --release
|
||||||
- name: Smoketest
|
# - name: Smoketest
|
||||||
run: python3 ./mach smoketest
|
# run: python3 ./mach smoketest
|
||||||
- name: Unit tests
|
# - name: Unit tests
|
||||||
run: python3 ./mach test-unit --release
|
# run: python3 ./mach test-unit --release
|
||||||
- name: Test package
|
# - name: Test package
|
||||||
run: python3 ./mach package --release
|
# run: python3 ./mach package --release
|
||||||
- name: Package smoketest
|
# - name: Package smoketest
|
||||||
run: ./etc/ci/macos_package_smoketest.sh target/release/servo-tech-demo.dmg
|
# run: ./etc/ci/macos_package_smoketest.sh target/release/servo-tech-demo.dmg
|
||||||
- name: Package binary
|
- name: Package binary
|
||||||
run: gtar -czf target.tar.gz target/release/servo target/release/*.dylib resources
|
run: gtar -czf target.tar.gz target/release/servo target/release/*.dylib resources
|
||||||
- name: Archive binary
|
- name: Archive binary
|
||||||
|
@ -76,17 +85,19 @@ jobs:
|
||||||
- uses: actions/checkout@v3
|
- uses: actions/checkout@v3
|
||||||
with:
|
with:
|
||||||
fetch-depth: 2
|
fetch-depth: 2
|
||||||
|
- name: Download release binary
|
||||||
#- name: Download release binary
|
uses: actions/download-artifact@v3
|
||||||
# uses: actions/download-artifact@v3
|
with:
|
||||||
# with:
|
name: release-binary-macos
|
||||||
# name: release-binary-macos
|
# TODO: Remove this step when the compatibility issue between mozjs and
|
||||||
|
# Homebrew's Python 3.10 formula (servo/rust-mozjs#559) is fixed
|
||||||
- name: Fake build
|
- name: Select Python 3.9
|
||||||
run: |
|
run: |
|
||||||
wget https://joshmatthews.net/release-binary-macos.zip
|
brew install python@3.9
|
||||||
unzip release-binary-macos.zip
|
cd $(dirname $(which python3.9))
|
||||||
|
rm -f python3 pip3
|
||||||
|
ln -s python3.9 python3
|
||||||
|
ln -s pip3.9 pip3
|
||||||
- name: Prep test environment
|
- name: Prep test environment
|
||||||
run: |
|
run: |
|
||||||
brew install gnu-tar
|
brew install gnu-tar
|
||||||
|
|
Loading…
Add table
Add a link
Reference in a new issue