Skip to content

Commit

Permalink
MSRV is now 1.43; CI builds wasm on 1.43, no wasm-opt, fixes #84
Browse files Browse the repository at this point in the history
  • Loading branch information
cormacrelf committed Nov 27, 2020
1 parent 88f356a commit 7b55e7a
Show file tree
Hide file tree
Showing 5 changed files with 9 additions and 11 deletions.
8 changes: 4 additions & 4 deletions .github/workflows/build-wasm.yml
Original file line number Diff line number Diff line change
Expand Up @@ -10,10 +10,10 @@ jobs:
runs-on: ubuntu-18.04
steps:
- uses: actions/checkout@v2
- name: Install latest nightly
- name: Install Rust 1.43
uses: actions-rs/toolchain@v1
with:
toolchain: nightly
toolchain: 1.43
override: true
- name: Cache cargo directories
uses: actions/cache@v2
Expand Down Expand Up @@ -52,10 +52,10 @@ jobs:
runs-on: ubuntu-18.04
steps:
- uses: actions/checkout@v2
- name: Install latest nightly
- name: Install Rust 1.43
uses: actions-rs/toolchain@v1
with:
toolchain: nightly
toolchain: 1.43
override: true
- name: Cache cargo directories
uses: actions/cache@v2
Expand Down
4 changes: 2 additions & 2 deletions .github/workflows/ci.yml
Original file line number Diff line number Diff line change
Expand Up @@ -121,10 +121,10 @@ jobs:
runs-on: ubuntu-18.04
steps:
- uses: actions/checkout@v2
- name: Install latest nightly
- name: Install Rust 1.43
uses: actions-rs/toolchain@v1
with:
toolchain: nightly
toolchain: 1.43
override: true
- name: Cache cargo directories
uses: actions/cache@v2
Expand Down
2 changes: 1 addition & 1 deletion README.md
Original file line number Diff line number Diff line change
Expand Up @@ -16,7 +16,7 @@ geared at:

## Supported Rust versions

With a stable Rust compiler, 1.39 or later, you can:
With a stable Rust compiler, 1.43 or later, you can:

* Build `citeproc` as a library
* Build a WebAssembly package (see below for details)
Expand Down
2 changes: 0 additions & 2 deletions crates/proc/src/lib.rs
Original file line number Diff line number Diff line change
Expand Up @@ -4,8 +4,6 @@
//
// Copyright © 2018 Corporation for Digital Scholarship

#![feature(rustc_attrs)]

#[macro_use]
extern crate log;

Expand Down
4 changes: 2 additions & 2 deletions crates/wasm/Cargo.toml
Original file line number Diff line number Diff line change
Expand Up @@ -21,8 +21,8 @@ description = "citeproc-rs, compiled to WebAssembly"

# https://github.com/rustwasm/wasm-pack/issues/886#issuecomment-667669802
[package.metadata.wasm-pack.profile.release]
wasm-opt = ["-O3", "--enable-mutable-globals", "-g"]
# wasm-opt = false
# wasm-opt = ["-O3", "--enable-mutable-globals", "-g"]
wasm-opt = false

[lib]
crate-type = ["cdylib", "rlib"]
Expand Down

0 comments on commit 7b55e7a

Please sign in to comment.