diff options
| author | bors[bot] <26634292+bors[bot]@users.noreply.github.com> | 2021-01-19 19:10:51 +0000 |
|---|---|---|
| committer | GitHub <noreply@github.com> | 2021-01-19 19:10:51 +0000 |
| commit | e208b044158ff275e5164ea868702d96192f642a (patch) | |
| tree | 998ba0279c25f13c53c140c650fbdd51dc51603a | |
| parent | e65a86f6962218b66a14b7ccc40eec7976880eba (diff) | |
| parent | 7f7c5b025aa75233b35d711b32f13be079b636b8 (diff) | |
Merge #442
442: Remove GHA ci-failure job r=perlindgren a=AfoHT
Try fixing GHA by removing the ci-failure job
[Related change in Bors](https://github.com/bors-ng/bors-ng/issues/1129)
Co-authored-by: Henrik Tjäder <henrik@grepit.se>
| -rw-r--r-- | .github/workflows/build.yml | 18 | ||||
| -rw-r--r-- | ui/single/locals-cfg.stderr | 4 | ||||
| -rw-r--r-- | ui/single/resources-cfg.stderr | 4 |
3 files changed, 4 insertions, 22 deletions
diff --git a/.github/workflows/build.yml b/.github/workflows/build.yml index e729db6..d9be520 100644 --- a/.github/workflows/build.yml +++ b/.github/workflows/build.yml @@ -763,21 +763,3 @@ jobs: steps: - name: Mark the job as a success run: exit 0 - ci-failure: - name: ci - if: github.event_name == 'push' && !success() - needs: - - style - - check - - checkexamples - - testexamples - - checkmacros - - testmacros - - testv7 - - testv6 - - docs - - mdbook - runs-on: ubuntu-20.04 - steps: - - name: Mark the job as a failure - run: exit 1 diff --git a/ui/single/locals-cfg.stderr b/ui/single/locals-cfg.stderr index 9319ab4..47992b3 100644 --- a/ui/single/locals-cfg.stderr +++ b/ui/single/locals-cfg.stderr @@ -31,5 +31,5 @@ error[E0425]: cannot find value `FOO` in this scope error: duplicate lang item in crate `panic_halt` (which `$CRATE` depends on): `panic_impl`. | = note: the lang item is first defined in crate `std` (which `$CRATE` depends on) - = note: first definition in `std` loaded from /usr/share/rust/.rustup/toolchains/stable-x86_64-unknown-linux-gnu/lib/rustlib/x86_64-unknown-linux-gnu/lib/libstd-93cbfed54dd1bac8.rlib - = note: second definition in `panic_halt` loaded from $DIR/target/tests/target/x86_64-unknown-linux-gnu/debug/deps/libpanic_halt-e17d79bd6be439e3.rmeta + = note: first definition in `std` loaded from /usr/share/rust/.rustup/toolchains/stable-x86_64-unknown-linux-gnu/lib/rustlib/x86_64-unknown-linux-gnu/lib/libstd-e12de7683a34c500.rlib + = note: second definition in `panic_halt` loaded from $DIR/target/tests/target/x86_64-unknown-linux-gnu/debug/deps/libpanic_halt-f6dc7d4a3dd7a21d.rmeta diff --git a/ui/single/resources-cfg.stderr b/ui/single/resources-cfg.stderr index e0b82b9..39f2c1a 100644 --- a/ui/single/resources-cfg.stderr +++ b/ui/single/resources-cfg.stderr @@ -1,8 +1,8 @@ error: duplicate lang item in crate `panic_halt` (which `$CRATE` depends on): `panic_impl`. | = note: the lang item is first defined in crate `std` (which `$CRATE` depends on) - = note: first definition in `std` loaded from /usr/share/rust/.rustup/toolchains/stable-x86_64-unknown-linux-gnu/lib/rustlib/x86_64-unknown-linux-gnu/lib/libstd-93cbfed54dd1bac8.rlib - = note: second definition in `panic_halt` loaded from $DIR/target/tests/target/x86_64-unknown-linux-gnu/debug/deps/libpanic_halt-e17d79bd6be439e3.rmeta + = note: first definition in `std` loaded from /usr/share/rust/.rustup/toolchains/stable-x86_64-unknown-linux-gnu/lib/rustlib/x86_64-unknown-linux-gnu/lib/libstd-e12de7683a34c500.rlib + = note: second definition in `panic_halt` loaded from $DIR/target/tests/target/x86_64-unknown-linux-gnu/debug/deps/libpanic_halt-f6dc7d4a3dd7a21d.rmeta error[E0609]: no field `o1` on type `initResources<'_>` --> $DIR/resources-cfg.rs:47:21 |