Skip to content

Commit bc6ca98

Browse files
committed
Merge branch 'main' of github.com:google/autocxx into test-generate-all-string
2 parents d0c58f6 + 35349e7 commit bc6ca98

File tree

165 files changed

+14954
-4926
lines changed

Some content is hidden

Large Commits have some content hidden by default. Use the searchbox below for content that may be hidden.

165 files changed

+14954
-4926
lines changed

.github/ISSUE_TEMPLATE/bug_report.md

+22
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,22 @@
1+
---
2+
name: Bug report
3+
about: Create a report to help us improve
4+
title: ''
5+
labels: ''
6+
assignees: ''
7+
8+
---
9+
10+
**Describe the bug**
11+
A clear and concise description of what the bug is.
12+
13+
**To Reproduce**
14+
Steps to reproduce the behavior with appropriate Rust and C++ code snippets. Ideally, please raise a new pull request with a failing test - instructions are [here](https://google.github.io/autocxx/contributing.html#reporting-bugs). If that isn't possible, a few other options are listed too.
15+
16+
About half of the time people report bugs, they're not readily reproducible. That wastes time for everyone. That's why it's incredibly useful to have a test case which definitely fails. Thanks!
17+
18+
**Expected behavior**
19+
A clear and concise description of what you expected to happen.
20+
21+
**Additional context**
22+
Add any other context about the problem here.

.github/workflows/ci.yml

+25-5
Original file line numberDiff line numberDiff line change
@@ -32,9 +32,10 @@ jobs:
3232
- name: macOS
3333
rust: nightly
3434
os: macos
35-
- name: Windows (gnu)
36-
rust: nightly-x86_64-pc-windows-gnu
37-
os: windows
35+
# Windows GNU disabled due to https://github.com/google/autocxx/issues/1134
36+
# - name: Windows (gnu)
37+
# rust: nightly-x86_64-pc-windows-gnu
38+
# os: windows
3839
- name: Windows (msvc)
3940
rust: nightly-x86_64-pc-windows-msvc
4041
os: windows
@@ -70,7 +71,7 @@ jobs:
7071
# no creduce on Windows, so exclude tests needing creduce there
7172
run: |
7273
echo RUSTFLAGS=$RUSTFLAGS >> $GITHUB_ENV
73-
echo ::set-output name=exclude::${{runner.os == 'Windows' && '--exclude autocxx-reduce --exclude autocxx-gen' || ''}}
74+
echo exclude=${{runner.os == 'Windows' && '--exclude autocxx-reduce --exclude autocxx-gen' || ''}} >> "$GITHUB_OUTPUT"
7475
env:
7576
# non-linux failures https://github.com/google/autocxx/issues/819
7677
# beta failing tests https://github.com/google/autocxx/issues/818
@@ -139,6 +140,13 @@ jobs:
139140
- name: Build non-trivial-type-on-stack example
140141
working-directory: ./examples/non-trivial-type-on-stack
141142
run: cargo build
143+
- name: Build reference-wrappers example
144+
working-directory: ./examples/reference-wrappers
145+
if: matrix.rust == 'nightly'
146+
run: cargo build
147+
- name: Build cpp_calling_rust example
148+
working-directory: ./examples/cpp_calling_rust
149+
run: cargo build
142150

143151
sanitizer:
144152
name: Address Sanitizer
@@ -153,6 +161,7 @@ jobs:
153161
- uses: Swatinem/rust-cache@v1
154162
- name: Tests with asan
155163
env:
164+
AUTOCXX_ASAN: 1
156165
RUSTFLAGS: -Zsanitizer=address -Cdebuginfo=0
157166
RUSTDOCFLAGS: -Zsanitizer=address
158167
ASAN_OPTIONS: "detect_stack_use_after_return=1:detect_leaks=0"
@@ -161,7 +170,18 @@ jobs:
161170
# leak sanitization, but we don't care about backtraces here, so long
162171
# as the other tests have them.
163172
RUST_BACKTRACE: "0"
164-
run: cargo -Z build-std test --workspace --target x86_64-unknown-linux-gnu
173+
run: cargo -Z build-std test --workspace --target x86_64-unknown-linux-gnu --exclude autocxx-macro
174+
175+
force-wrapper-generation:
176+
name: Test forcing wrapper generation
177+
runs-on: ubuntu-latest
178+
steps:
179+
- uses: actions/checkout@v2
180+
- uses: Swatinem/rust-cache@v1
181+
- name: Tests generating all possible shims
182+
env:
183+
AUTOCXX_FORCE_WRAPPER_GENERATION: 1
184+
run: cargo test --workspace
165185

166186
# Clippy check
167187
clippy:

.github/workflows/site.yml

+2-4
Original file line numberDiff line numberDiff line change
@@ -10,7 +10,7 @@ on:
1010

1111
jobs:
1212
deploy:
13-
runs-on: ubuntu-20.04
13+
runs-on: ubuntu-22.04
1414
steps:
1515
- uses: actions/checkout@v2
1616

@@ -27,9 +27,7 @@ jobs:
2727
run: cargo install mdbook-linkcheck
2828

2929
- name: Install mdbook-mermaid
30-
run: |
31-
curl -LSfs https://japaric.github.io/trust/install.sh | \
32-
sh -s -- --git badboy/mdbook-mermaid
30+
run: cargo install mdbook-mermaid
3331

3432
- run: mdbook build
3533
working-directory: book

0 commit comments

Comments
 (0)