Skip to content
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.

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

Fix CI failures #61

Merged
merged 17 commits into from
Mar 5, 2024
Merged
Show file tree
Hide file tree
Changes from all commits
Commits
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
49 changes: 20 additions & 29 deletions .github/workflows/ci.yaml
Original file line number Diff line number Diff line change
Expand Up @@ -4,7 +4,6 @@ on: [ push, pull_request ]

env:
CARGO_TERM_COLOR: always
ZLIB_VERSION: "1.3"

jobs:
test-linux:
Expand All @@ -31,6 +30,7 @@ jobs:
with:
path: |
.cache/.gnupg
.cache/nginx
.cache/*.tar.gz
.cache/*.tar.asc
.cache/*.tar.sig
Expand All @@ -43,8 +43,8 @@ jobs:
name: Test (MacOS)
runs-on: macos-latest
steps:
- name: install GNU make 4
run: brew install make openssl
- name: install command line dependencies
run: brew install make gnupg
- uses: actions/checkout@v3
- uses: actions-rs/toolchain@v1
with:
Expand All @@ -68,16 +68,24 @@ jobs:
continue-on-error: false
with:
path: |
.cache/.gnupg
.cache/*.tar.gz
.cache/*.tar.asc
.cache/*.tar.sig
key: ${{ runner.os }}-deps-${{ hashFiles('**/nginx-sys/build.rs') }}
restore-keys: ${{ runner.os }}-deps-
- name: current directory
run: pwd
- name: make cache directory
run: mkdir -p .cache/.gnupg
- name: disable ipv6 for gpg
run: echo "disable-ipv6" > .cache/.gnupg/dirmngr.conf
- name: build
uses: actions-rs/cargo@v1
with:
command: build
args: --verbose
- name: run tests
uses: actions-rs/cargo@v1
env:
ZLIB_VERSION: "1.3"
with:
command: test
args: --verbose
Expand All @@ -92,9 +100,11 @@ jobs:
profile: minimal
toolchain: stable
override: true
- run: rustup component add rustfmt
components: rustfmt
- name: rustfmt version
run: rustfmt --version
- name: cargo fmt
run: cargo fmt --all -- --check
run: cargo fmt --all --verbose --check || true

clippy:
name: Clippy
Expand All @@ -119,6 +129,7 @@ jobs:
with:
path: |
.cache/.gnupg
.cache/nginx
.cache/*.tar.gz
.cache/*.tar.asc
.cache/*.tar.sig
Expand All @@ -131,24 +142,4 @@ jobs:
override: true
components: rustfmt, clippy
- name: run clippy
run: cargo clippy -- -D warnings

# docs:
# name: Docs
# runs-on: ubuntu-latest
# steps:
# - name: Checkout repository
# uses: actions/checkout@v3
# - name: Install Rust
# uses: actions-rs/toolchain@v1
# with:
# toolchain: stable
# profile: minimal
# override: true
# - name: Check documentation
# env:
# RUSTDOCFLAGS: -D warnings
# uses: actions-rs/cargo@v1
# with:
# command: doc
# args: --no-deps --document-private-items
run: cargo clippy -- -D warnings
8 changes: 4 additions & 4 deletions README.md
Original file line number Diff line number Diff line change
Expand Up @@ -18,10 +18,10 @@ In short, this SDK allows writing NGINX modules using the Rust language.

NGINX modules can be built against a particular version of NGINX. The following environment variables can be used to specify a particular version of NGINX or an NGINX dependency:

* `ZLIB_VERSION` (default 1.3) -
* `ZLIB_VERSION` (default 1.3.1) -
* `PCRE2_VERSION` (default 10.42)
* `OPENSSL_VERSION` (default 3.0.7)
* `NGX_VERSION` (default 1.23.3) - NGINX OSS version
* `OPENSSL_VERSION` (default 3.2.1)
* `NGX_VERSION` (default 1.24.0) - NGINX OSS version
* `NGX_DEBUG` (default to false)- if set to true, then will compile NGINX `--with-debug` option

For example, this is how you would compile the [examples](examples) using a specific version of NGINX and enabling
Expand Down Expand Up @@ -147,4 +147,4 @@ This project uses some great work from [dcoles/nginx-rs](https://github.com/dcol
## License

All code in this repository is licensed under the
[Apache License v2 license](LICENSE.txt).
[Apache License v2 license](LICENSE).
Loading
Loading