Skip to content
Draft
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
2 changes: 1 addition & 1 deletion .clang-format
Original file line number Diff line number Diff line change
Expand Up @@ -69,7 +69,7 @@ DerivePointerAlignment: false
DisableFormat: false
EmptyLineBeforeAccessModifier: LogicalBlock
ExperimentalAutoDetectBinPacking: false
FixNamespaceComments: true
FixNamespaceComments: false
ForEachMacros:
- foreach
- Q_FOREACH
Expand Down
22 changes: 11 additions & 11 deletions .github/workflows/clang-format-check.yml
Original file line number Diff line number Diff line change
@@ -1,13 +1,13 @@
name: clang-format Check
on: [push, pull_request]
name: C++ formatting
on:
pull_request:
workflow_dispatch:
permissions:
contents: read
jobs:
formatting-check:
name: Formatting Check
runs-on: ubuntu-latest
convention_checker:
runs-on: ubuntu-24.04
steps:
- uses: actions/checkout@v4
- name: Run clang-format style check for C/C++/Protobuf programs.
uses: jidicula/clang-format-action@v4.13.0
with:
clang-format-version: "13"
check-path: "rdkit-sys/wrapper"
- uses: actions/checkout@11d5960a326750d5838078e36cf38b85af677262
- run: sudo apt-get update && sudo apt-get install -y clang-format-18
- run: find rdkit-sys/wrapper -type f \( -name '*.h' -o -name '*.cc' \) -print0 | xargs -0 clang-format-18 --dry-run --Werror
192 changes: 84 additions & 108 deletions .github/workflows/test_suite.yml
Original file line number Diff line number Diff line change
@@ -1,119 +1,95 @@
name: Tests, Clippy, and Format
name: Packaged RDKit

on:
pull_request: { }
pull_request:
workflow_dispatch:

env:
REGISTRY: ghcr.io
REPO_LOWER: rdkit-rs/cheminee
permissions:
contents: read

jobs:
test_suite:
runs-on: buildjet-16vcpu-ubuntu-2204
env:
ARCH: amd64
DEBIAN_FRONTEND: noninteractive
permissions:
contents: read
packages: write
steps:
- name: Git checkout
uses: actions/checkout@v2

- name: Run sccache-cache
uses: mozilla/sccache-action@eaed7fb9f8fb32adea8bd40d7f276f312de9beaf
with:
version: "v0.4.0-pre.10"

- name: Run sccache stat for check
test:
name: Ubuntu ${{ matrix.ubuntu }} / RDKit ${{ matrix.rdkit }} / ${{ matrix.arch }}
runs-on: ${{ matrix.runner }}
strategy:
fail-fast: false
matrix:
include:
- ubuntu: '26.04'
rdkit: '2025.03.6'
arch: amd64
runner: ubuntu-24.04
install: install-deps.sh
image: public.ecr.aws/docker/library/ubuntu@sha256:f144425ff09be612d6d9ad965196e9cdc23dae1f42110a8a11a3e9a8198759f7
- ubuntu: '24.04'
rdkit: '2023.09.3'
arch: amd64
runner: ubuntu-24.04
install: install-deps.sh
image: public.ecr.aws/docker/library/ubuntu@sha256:534baea6a22c03a63003dbc8dbe78fe34bc0d7e595d9a9dc9834884ff530eb55
- ubuntu: '26.04'
rdkit: '2026.09.1 reference'
arch: amd64
runner: ubuntu-24.04
install: install-reference-deps.sh
image: public.ecr.aws/docker/library/ubuntu@sha256:f144425ff09be612d6d9ad965196e9cdc23dae1f42110a8a11a3e9a8198759f7
- ubuntu: '26.04'
rdkit: '2026.09.1 reference'
arch: arm64
runner: ubuntu-24.04-arm
install: install-reference-deps.sh
image: public.ecr.aws/docker/library/ubuntu@sha256:f144425ff09be612d6d9ad965196e9cdc23dae1f42110a8a11a3e9a8198759f7
container:
image: ${{ matrix.image }}
defaults:
run:
shell: bash
run: ${SCCACHE_PATH} --show-stats

- name: Install dependencies
run: |
sudo apt-get update
sudo apt-get install -y build-essential libssl-dev libboost-iostreams-dev libboost-serialization-dev pkg-config curl tar

- name: Install RDKit
run: |
cd /tmp
if [ $(dpkg --print-architecture) = "amd64" ]; then
curl -O https://rdkit-rs-debian.s3.eu-central-1.amazonaws.com/rdkit_2024_09_1_ubuntu_22_04_amd64.tar.gz
sudo tar xf rdkit_2024_09_1_ubuntu_22_04_amd64.tar.gz
else
curl -O https://rdkit-rs-debian.s3.eu-central-1.amazonaws.com/rdkit_2024_09_1_ubuntu_22_04_arm64.tar.gz
sudo tar xf rdkit_2024_09_1_ubuntu_22_04_arm64.tar.gz
fi
sudo mv /tmp/rdkit-Release_2024_09_1/Code /usr/local/include/rdkit
sudo mv /tmp/rdkit-Release_2024_09_1/build/lib/* /usr/lib/

- name: Install latest stable
uses: actions-rs/toolchain@v1
with:
toolchain: stable
override: true
components: rustfmt, clippy

- name: Cargo test
run: |
RUST_WRAPPER=$SCCACHE_PATH cargo clean
RUST_WRAPPER=$SCCACHE_PATH cargo test --workspace

convention_checker:
env:
ARCH: amd64
runs-on: buildjet-16vcpu-ubuntu-2204
permissions:
contents: read
packages: write
steps:
- name: Git checkout
uses: actions/checkout@v2

- name: Run sccache-cache
uses: mozilla/sccache-action@eaed7fb9f8fb32adea8bd40d7f276f312de9beaf
- uses: actions/checkout@11d5960a326750d5838078e36cf38b85af677262
- run: bash ci/${{ matrix.install }}
- uses: dtolnay/rust-toolchain@e2a55d2ffb04f378e9626c28d38b36d230d1e12f
with:
version: "v0.4.0-pre.10"

- name: Run sccache stat for check
toolchain: '1.99.0'
components: rustfmt, clippy
- run: cargo fmt --all --check
- run: cargo test --workspace --locked
- run: cargo clippy --workspace --all-targets --locked -- -D warnings
- run: cargo doc --workspace --no-deps --locked
env:
RUSTDOCFLAGS: -D warnings
- run: cargo check --workspace --all-features --locked
env:
CONDA_PREFIX: /usr

sanitizers:
name: C++ ASan and UBSan / Ubuntu 26.04 / ${{ matrix.rdkit }}
runs-on: ubuntu-24.04
strategy:
fail-fast: false
matrix:
include:
- rdkit: '2025.03.6'
install: install-deps.sh
- rdkit: '2026.09.1 reference'
install: install-reference-deps.sh
container:
image: public.ecr.aws/docker/library/ubuntu@sha256:f144425ff09be612d6d9ad965196e9cdc23dae1f42110a8a11a3e9a8198759f7
defaults:
run:
shell: bash
run: ${SCCACHE_PATH} --show-stats

- name: Install dependencies
run: |
sudo apt-get update
sudo apt-get install -y build-essential libssl-dev libboost-iostreams-dev libboost-serialization-dev pkg-config curl tar

- name: Install RDKit
run: |
cd /tmp
if [ $(dpkg --print-architecture) = "amd64" ]; then
curl -O https://rdkit-rs-debian.s3.eu-central-1.amazonaws.com/rdkit_2024_09_1_ubuntu_22_04_amd64.tar.gz
sudo tar xf rdkit_2024_09_1_ubuntu_22_04_amd64.tar.gz
else
curl -O https://rdkit-rs-debian.s3.eu-central-1.amazonaws.com/rdkit_2024_09_1_ubuntu_22_04_arm64.tar.gz
sudo tar xf rdkit_2024_09_1_ubuntu_22_04_arm64.tar.gz
fi
sudo mv /tmp/rdkit-Release_2024_09_1/Code /usr/local/include/rdkit
sudo mv /tmp/rdkit-Release_2024_09_1/build/lib/* /usr/lib/

- name: Install latest stable
uses: actions-rs/toolchain@v1
steps:
- uses: actions/checkout@11d5960a326750d5838078e36cf38b85af677262
- run: bash ci/${{ matrix.install }}
- uses: dtolnay/rust-toolchain@e2a55d2ffb04f378e9626c28d38b36d230d1e12f
with:
toolchain: nightly
override: true
components: rustfmt, clippy

- name: Rust Format Check
run: |
RUST_WRAPPER=$SCCACHE_PATH cargo fmt --check
pushd rdkit-sys
RUST_WRAPPER=$SCCACHE_PATH cargo fmt --check
popd
toolchain: '1.99.0'
- run: bash ci/test-sanitizers.sh
env:
CARGO_BUILD_JOBS: '2'

- name: Clippy Check
run: |
RUST_WRAPPER=$SCCACHE_PATH cargo clippy
pushd rdkit-sys
RUST_WRAPPER=$SCCACHE_PATH cargo clippy
popd
test_suite:
runs-on: ubuntu-24.04
needs: [test, sanitizers]
if: always()
steps:
- run: test '${{ needs.test.result }}' = success && test '${{ needs.sanitizers.result }}' = success
1 change: 0 additions & 1 deletion .gitignore
Original file line number Diff line number Diff line change
@@ -1,5 +1,4 @@
/target
/Cargo.lock
.idea/
tests/fixtures/*
*.iml
Loading
Loading