Skip to content

Commit bf433ca

Browse files
authored
Auto merge of #53 - sagudev:cii, r=jdm
Move all CI to GitHub Actions Also fixes #41 [CI build](https://github.com/sagudev/mozangle/actions/runs/4994292124/jobs/8944645116)
2 parents b261771 + d7eab2a commit bf433ca

File tree

4 files changed

+30
-37
lines changed

4 files changed

+30
-37
lines changed

.github/workflows/rust.yml

Lines changed: 26 additions & 9 deletions
Original file line numberDiff line numberDiff line change
@@ -2,23 +2,40 @@ name: Rust
22

33
on:
44
push:
5-
branches: [ master ]
65
pull_request:
7-
branches: [ master ]
86

97
env:
108
CARGO_TERM_COLOR: always
119

1210
jobs:
1311
build:
14-
runs-on: windows-latest
12+
strategy:
13+
fail-fast: false
14+
matrix:
15+
os: ["windows-latest", "ubuntu-latest", "macos-latest"]
16+
runs-on: ${{ matrix.os }}
1517
steps:
16-
- uses: actions/checkout@v2
17-
- name: Install latest nightly
18-
uses: actions-rs/toolchain@v1
19-
with:
20-
toolchain: 1.45.0
21-
default: true
18+
- uses: actions/checkout@v3
19+
- uses: dtolnay/rust-toolchain@stable
2220
- name: Run tests
21+
if: contains(matrix.os, 'windows')
2322
run: cargo test --verbose --features "egl build_dlls"
23+
- name: Run test (POSIX)
24+
if: ${{ !contains(matrix.os, 'windows') }}
25+
run: |
26+
cargo test --verbose
27+
cargo test --verbose --features egl
2428
29+
build_result:
30+
name: homu build finished
31+
runs-on: ubuntu-latest
32+
needs:
33+
- "build"
34+
35+
steps:
36+
- name: Mark the job as successful
37+
run: exit 0
38+
if: success()
39+
- name: Mark the job as unsuccessful
40+
run: exit 1
41+
if: "!success()"

.travis.yml

Lines changed: 0 additions & 14 deletions
This file was deleted.

appveyor.yml

Lines changed: 0 additions & 14 deletions
This file was deleted.

build.rs

Lines changed: 4 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -124,6 +124,8 @@ fn build_egl(target: &str) {
124124
assert!(status.unwrap().success());
125125
}
126126

127+
build.link_lib_modifier("-whole-archive");
128+
127129
// Build lib.
128130
build.compile("EGL");
129131
}
@@ -187,6 +189,8 @@ fn build_angle() {
187189
.flag_if_supported("-arch:SSE2"); // MSVC
188190
}
189191

192+
build.link_lib_modifier("-whole-archive");
193+
190194
build.compile("angle");
191195

192196
if egl {

0 commit comments

Comments
 (0)