Skip to content

Force use of mdbook 0.2.1 as 0.2.2 is broken for now #31

New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Merged
merged 4 commits into from
Nov 10, 2018
Merged

Force use of mdbook 0.2.1 as 0.2.2 is broken for now #31

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
4 commits
Select commit Hold shift + click to select a range
c20e5a9
Force use of mdbook 0.2.1 as 0.2.2 is broken for now
adamgreig Nov 10, 2018
971b518
Fix CI script
adamgreig Nov 10, 2018
fae2db0
Private statics have global linkage now
adamgreig Nov 10, 2018
aff95c5
Missed one more objdump
adamgreig Nov 10, 2018
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
2 changes: 2 additions & 0 deletions ci/install.sh
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -6,6 +6,8 @@ main() {
| grep -E '^v[0.1.0-9.]+$' \
| sort --version-sort \
| tail -n1)
# Temporarily use older version until packages are available for 0.2.2 (or newer)
local tag="v0.2.1"
curl -LSfs https://japaric.github.io/trust/install.sh | \
sh -s -- --git rust-lang-nursery/mdbook --tag $tag

Expand Down
4 changes: 2 additions & 2 deletions ci/logging/app/dev.objdump
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -1,2 +1,2 @@
00001fe1 l .rodata 00000001 Goodbye
00001fe0 l .rodata 00000001 Hello, world!
00001fe1 g .rodata 00000001 Goodbye
00001fe0 g .rodata 00000001 Hello, world!
4 changes: 2 additions & 2 deletions ci/logging/app/release.objdump
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -1,2 +1,2 @@
00000a7d l .rodata 00000001 Goodbye
00000a7c l .rodata 00000001 Hello, world!
00000b9d g O .rodata 00000001 Goodbye
00000b9c g O .rodata 00000001 Hello, world!
4 changes: 2 additions & 2 deletions ci/logging/app/release.out
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -1,2 +1,2 @@
0xa7c
0xa7d
0xb9c
0xb9d
4 changes: 2 additions & 2 deletions ci/logging/app2/dev.objdump
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -1,2 +1,2 @@
00000001 l .log 00000001 Goodbye
00000000 l .log 00000001 Hello, world!
00000001 g .log 00000001 Goodbye
00000000 g .log 00000001 Hello, world!
4 changes: 2 additions & 2 deletions ci/logging/app3/dev.objdump
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -1,2 +1,2 @@
00000001 l .log 00000001 Goodbye
00000000 l .log 00000001 Hello, world!
00000001 g .log 00000001 Goodbye
00000000 g .log 00000001 Hello, world!
4 changes: 2 additions & 2 deletions ci/logging/app4/dev.objdump
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -1,3 +1,3 @@
00000000 l .log 00000001 Goodbye
00000001 l .log 00000001 Hello, world!
00000000 g .log 00000001 Goodbye
00000001 g .log 00000001 Hello, world!
00000001 .log 00000000 __log_warning_start__
2 changes: 1 addition & 1 deletion ci/script.sh
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -146,7 +146,7 @@ main() {
done

cargo run --release > release.out
cargo objdump --bin app --release -- -t | grep '\.rodata\s*0*1\b' > dev.objdump
cargo objdump --bin app --release -- -t | grep '\.rodata\s*0*1\b' > release.objdump
for address in $(cat release.out); do
grep ${address#0x} release.objdump
done
Expand Down
4 changes: 2 additions & 2 deletions ci/singleton/app/dev.objdump
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -1,2 +1,2 @@
00000001 l .log 00000001 Goodbye
00000000 l .log 00000001 Hello, world!
00000001 g .log 00000001 Goodbye
00000000 g .log 00000001 Hello, world!