Skip to content

Commit 5bf2458

Browse files
committed
v0.4.0: bump version
1 parent 356c1fd commit 5bf2458

File tree

5 files changed

+15
-36
lines changed

5 files changed

+15
-36
lines changed

.github/workflows/docs.yml

Lines changed: 6 additions & 24 deletions
Original file line numberDiff line numberDiff line change
@@ -9,51 +9,33 @@ jobs:
99
docs:
1010
name: Build and Deploy
1111
runs-on: ubuntu-latest
12-
strategy:
13-
matrix:
14-
rust-toolchain:
15-
- nightly
16-
php:
17-
- '8.0'
18-
llvm:
19-
- '11.0'
2012
steps:
2113
- name: Checkout code
2214
uses: actions/checkout@v2
2315
- name: Setup PHP
2416
uses: shivammathur/setup-php@v2
2517
with:
26-
php-version: ${{ matrix.php }}
18+
php-version: 8.0
2719
- name: Setup Rust
2820
uses: actions-rs/toolchain@v1
2921
with:
30-
toolchain: ${{ matrix.rust-toolchain }}
22+
toolchain: nightly
3123
override: true
3224
- name: Setup LLVM & Clang
3325
uses: KyleMayes/install-llvm-action@v1
3426
with:
35-
version: ${{ matrix.llvm }}
36-
directory: ${{ runner.temp }}/llvm-${{ matrix.llvm }}
27+
version: 11.0
28+
directory: ${{ runner.temp }}/llvm-11.0
3729
- name: Install mdbook
3830
uses: peaceiris/actions-mdbook@v1
3931
with:
4032
mdbook-version: latest
41-
- name: Build docs
42-
env:
43-
LIBCLANG_PATH: ${{ runner.temp }}/llvm-${{ matrix.llvm }}/lib
44-
RUSTDOCFLAGS: --cfg docs
45-
run: cargo doc --release
4633
- name: Build guide
47-
run: |
48-
mdbook build guide
49-
mv guide/book target/doc/guide
50-
- name: Create index redirect
51-
run: |
52-
echo '<meta http-equiv=refresh content=0;url=/ext-php-rs/ext_php_rs>' > target/doc/index.html
34+
run: mdbook build guide
5335
- name: Publish docs
5436
uses: JamesIves/[email protected]
5537
with:
5638
GITHUB_TOKEN: ${{ secrets.GITHUB_TOKEN }}
5739
BRANCH: gh-pages
58-
FOLDER: target/doc
40+
FOLDER: guide/book
5941
CLEAN: true

Cargo.toml

Lines changed: 5 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -5,14 +5,14 @@ repository = "https://github.com/davidcole1340/ext-php-rs"
55
homepage = "https://github.com/davidcole1340/ext-php-rs"
66
license = "MIT OR Apache-2.0"
77
keywords = ["php", "ffi", "zend"]
8-
version = "0.3.0"
8+
version = "0.4.0"
99
authors = ["David Cole <[email protected]>"]
1010
edition = "2018"
1111
categories = ["api-bindings"]
1212

1313
[dependencies]
1414
bitflags = "1.2.1"
15-
ext-php-rs-derive = { version = "=0.3.0", path = "./ext-php-rs-derive" }
15+
ext-php-rs-derive = { version = "=0.4.0", path = "./ext-php-rs-derive" }
1616

1717
[build-dependencies]
1818
bindgen = { version = ">= 0.57.0, < 0.58.1" }
@@ -28,3 +28,6 @@ members = [
2828
"ext-php-rs-derive",
2929
"example/skel"
3030
]
31+
32+
[package.metadata.docs.rs]
33+
rustdoc-args = ["--cfg", "docs"]

README.md

Lines changed: 2 additions & 8 deletions
Original file line numberDiff line numberDiff line change
@@ -62,14 +62,7 @@ The library guide can be read
6262
[here](https://davidcole1340.github.io/ext-php-rs/guide).
6363

6464
The project is documented in-line, so viewing the `cargo` documentation is the
65-
best resource at the moment.
66-
67-
We are currently unable to deploy our documentation to `docs.rs` due to the
68-
crate requiring PHP 8.0, which is unavailable in the default Ubuntu
69-
repositories. Documentation can be viewed
70-
[here](https://davidcole1340.github.io/ext-php-rs/). It is generated from the
71-
latest `master` branch. Documentation will be moved to `docs.rs` when Ubuntu
72-
updates its repositories to PHP 8.0.
65+
best resource at the moment. This can be viewed at [docs.rs].
7366

7467
## Requirements
7568

@@ -132,3 +125,4 @@ at your option.
132125

133126
[LICENSE_APACHE]: https://github.com/davidcole1340/ext-php-rs/blob/master/LICENSE_APACHE
134127
[LICENSE_MIT]: https://github.com/davidcole1340/ext-php-rs/blob/master/LICENSE_MIT
128+
[docs.rs]: https://docs.rs/ext-php-rs

ext-php-rs-derive/Cargo.toml

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -4,7 +4,7 @@ description = "Derive macros for ext-php-rs."
44
repository = "https://github.com/davidcole1340/ext-php-rs"
55
homepage = "https://github.com/davidcole1340/ext-php-rs"
66
license = "MIT OR Apache-2.0"
7-
version = "0.3.0"
7+
version = "0.4.0"
88
authors = ["David Cole <[email protected]>"]
99
edition = "2018"
1010

guide/src/introduction.md

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -35,4 +35,4 @@ future. It's recommended to lock the version at the patch level.
3535
## Documentation
3636

3737
- This guide!
38-
- [Rust docs](https://davidcole1340.github.io/ext-php-rs)
38+
- [Rust docs](https://docs.rs/ext-php-rs)

0 commit comments

Comments
 (0)