Skip to content

Commit 1013968

Browse files
committed
Do not merge - simplify CI and test release.
1 parent ab17aa4 commit 1013968

File tree

1 file changed

+3
-86
lines changed

1 file changed

+3
-86
lines changed

.github/workflows/rust.yml

Lines changed: 3 additions & 86 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,24 +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-
- name: Build uwp
78-
if: contains(matrix.target, 'uwp')
79-
shell: cmd
80-
env:
81-
MOZTOOLS_PATH: 'C:\mozilla-build\msys\bin;C:\mozilla-build\bin'
82-
AUTOCONF: "C:/mozilla-build/msys/local/bin/autoconf-2.13"
83-
LINKER: "lld-link.exe"
84-
CC: "clang-cl.exe"
85-
CXX: "clang-cl.exe"
86-
NATIVE_WIN32_PYTHON: "C:\\mozilla-build\\python2\\python.exe"
87-
PYTHON3: "C:\\mozilla-build\\python3\\python3.exe"
88-
LIBCLANG_PATH: "C:\\ProgramData\\scoop\\apps\\llvm\\current\\lib"
89-
run: |
90-
rustup install nightly-2022-11-20
91-
rustup default nightly-2022-11-20
92-
rustup component add rust-src
93-
rustc --version --verbose
94-
cargo build --verbose ${{ matrix.features }} -Z build-std=std,panic_abort --target ${{ matrix.target }}
9531
- name: Build Windows
9632
if: contains(matrix.target, 'uwp') != true
9733
shell: cmd
@@ -107,31 +43,12 @@ jobs:
10743
run: |
10844
rustup install nightly-2022-11-20
10945
rustup default nightly-2022-11-20
110-
cargo test --verbose ${{ matrix.features }} --lib
111-
Integrity:
112-
runs-on: ubuntu-latest
113-
steps:
114-
- uses: actions/checkout@v2
115-
- name: Get mozjs
116-
run: |
117-
bash ./mozjs/etc/get_mozjs.sh
118-
- name: Apply patch
119-
run: |
120-
python3 ./mozjs/etc/update.py --no-commit mozjs.tar.xz
121-
# Run `git add` here to force CRLF converted into LF
122-
# so that we can check diff properly in next run
123-
git add --all mozjs
124-
- name: Check patch integrity
125-
working-directory: ./mozjs
126-
# Because we've added files in previous run, we need to
127-
# check diff with `--staged`.
128-
run: |
129-
git diff --staged --no-ext-diff --quiet --exit-code
46+
cargo test --verbose ${{ matrix.features }} --release --lib
13047
build_result:
13148
name: homu build finished
13249
runs-on: ubuntu-latest
13350
# Integrity check is broken for the time being; don't require it.
134-
needs: ["mac", "linux", "windows"]
51+
needs: ["windows"]
13552
steps:
13653
- name: Mark the job as successful
13754
run: exit 0

0 commit comments

Comments
 (0)