Skip to content

Commit 3b36923

Browse files
committed
Do not merge - simplify CI and test release.
1 parent 6f3f382 commit 3b36923

File tree

1 file changed

+3
-89
lines changed

1 file changed

+3
-89
lines changed

.github/workflows/rust.yml

Lines changed: 3 additions & 89 deletions
Original file line numberDiff line numberDiff line change
@@ -10,59 +10,13 @@ env:
1010
SHELL: /bin/bash
1111

1212
jobs:
13-
mac:
14-
runs-on: macos-latest
15-
strategy:
16-
fail-fast: false
17-
matrix:
18-
features: ["--features debugmozjs", ""]
19-
steps:
20-
- uses: actions/checkout@v2
21-
- name: Install deps
22-
run: brew install python [email protected] ccache llvm yasm
23-
- uses: dtolnay/rust-toolchain@stable
24-
- name: ccache cache files
25-
uses: actions/[email protected]
26-
with:
27-
path: .ccache
28-
key: ${{ runner.os }}-cargo-${{ hashFiles('**/Cargo.toml') }}
29-
- name: Build
30-
run: |
31-
ccache -z
32-
ccache cargo build --verbose ${{ matrix.features }}
33-
ccache cargo test --verbose ${{ matrix.features }}
34-
ccache -s
35-
linux:
36-
runs-on: ubuntu-latest
37-
strategy:
38-
fail-fast: false
39-
matrix:
40-
features: ["--features debugmozjs", ""]
41-
steps:
42-
- uses: actions/checkout@v2
43-
- name: Install deps
44-
run: |
45-
sudo apt install autoconf2.13 ccache llvm -y
46-
- uses: dtolnay/rust-toolchain@stable
47-
- name: ccache cache files
48-
uses: actions/[email protected]
49-
with:
50-
path: .ccache
51-
key: ${{ runner.os }}-cargo-${{ hashFiles('**/Cargo.toml') }}
52-
- name: Build
53-
run: |
54-
ccache -z
55-
ccache cargo build --verbose ${{ matrix.features }}
56-
ccache cargo test --verbose ${{ matrix.features }}
57-
ccache -s
5813
windows:
5914
runs-on: windows-latest
6015
strategy:
6116
fail-fast: false
6217
matrix:
6318
features: ["--features debugmozjs", ""]
64-
#target: [""]
65-
target: ["", "aarch64-uwp-windows-msvc", "x86_64-uwp-windows-msvc"]
19+
target: [""]
6620
steps:
6721
- uses: actions/checkout@v2
6822
- name: Install deps
@@ -74,27 +28,6 @@ jobs:
7428
scoop install [email protected] --global
7529
echo "C:\ProgramData\scoop\shims;C:\Users\runneradmin\scoop\shims" | Out-File -FilePath $env:GITHUB_PATH -Encoding utf8 -Append
7630
- uses: dtolnay/rust-toolchain@stable
77-
if: (!contains(matrix.target, 'uwp'))
78-
- uses: dtolnay/rust-toolchain@master
79-
if: contains(matrix.target, 'uwp')
80-
with:
81-
toolchain: "nightly-2023-02-02"
82-
components: rust-src
83-
- name: Build uwp
84-
if: contains(matrix.target, 'uwp')
85-
shell: cmd
86-
env:
87-
MOZTOOLS_PATH: 'C:\mozilla-build\msys\bin;C:\mozilla-build\bin'
88-
AUTOCONF: "C:/mozilla-build/msys/local/bin/autoconf-2.13"
89-
LINKER: "lld-link.exe"
90-
CC: "clang-cl.exe"
91-
CXX: "clang-cl.exe"
92-
NATIVE_WIN32_PYTHON: "C:\\mozilla-build\\python2\\python.exe"
93-
PYTHON3: "C:\\mozilla-build\\python3\\python3.exe"
94-
LIBCLANG_PATH: "C:\\ProgramData\\scoop\\apps\\llvm\\current\\lib"
95-
run: |
96-
rustc --version --verbose
97-
cargo build --verbose ${{ matrix.features }} -Z build-std=std,panic_abort --target ${{ matrix.target }}
9831
- name: Build Windows
9932
if: contains(matrix.target, 'uwp') != true
10033
shell: cmd
@@ -110,31 +43,12 @@ jobs:
11043
run: |
11144
rustup install nightly-2022-11-20
11245
rustup default nightly-2022-11-20
113-
cargo test --verbose ${{ matrix.features }} --lib
114-
Integrity:
115-
runs-on: ubuntu-latest
116-
steps:
117-
- uses: actions/checkout@v2
118-
- name: Get mozjs
119-
run: |
120-
bash ./mozjs/etc/get_mozjs.sh
121-
- name: Apply patch
122-
run: |
123-
python3 ./mozjs/etc/update.py --no-commit mozjs.tar.xz
124-
# Run `git add` here to force CRLF converted into LF
125-
# so that we can check diff properly in next run
126-
git add --all mozjs
127-
- name: Check patch integrity
128-
working-directory: ./mozjs
129-
# Because we've added files in previous run, we need to
130-
# check diff with `--staged`.
131-
run: |
132-
git diff --staged --no-ext-diff --quiet --exit-code
46+
cargo test --verbose ${{ matrix.features }} --release --lib
13347
build_result:
13448
name: homu build finished
13549
runs-on: ubuntu-latest
13650
# Integrity check is broken for the time being; don't require it.
137-
needs: ["mac", "linux", "windows"]
51+
needs: ["windows"]
13852
steps:
13953
- name: Mark the job as successful
14054
run: exit 0

0 commit comments

Comments
 (0)