Skip to content

Commit

Permalink
Smaller improvements (#5)
Browse files Browse the repository at this point in the history
  • Loading branch information
emilk authored Apr 18, 2024
1 parent 62b444b commit 657c908
Show file tree
Hide file tree
Showing 7 changed files with 26 additions and 14 deletions.
2 changes: 1 addition & 1 deletion .github/workflows/cpp.yml
Original file line number Diff line number Diff line change
Expand Up @@ -6,7 +6,7 @@ name: C++
jobs:
cpp-check:
name: C++
runs-on: ubuntu-22.04
runs-on: ubuntu-latest
steps:
- uses: actions/checkout@v4

Expand Down
2 changes: 1 addition & 1 deletion .github/workflows/python.yml
Original file line number Diff line number Diff line change
Expand Up @@ -6,7 +6,7 @@ name: C++
jobs:
python-check:
name: Python
runs-on: ubuntu-22.04
runs-on: ubuntu-latest
steps:
- uses: actions/checkout@v4

Expand Down
13 changes: 6 additions & 7 deletions .github/workflows/rust.yml
Original file line number Diff line number Diff line change
Expand Up @@ -10,7 +10,7 @@ env:
jobs:
rust-check:
name: Rust
runs-on: ubuntu-22.04
runs-on: ubuntu-latest
steps:
- uses: actions/checkout@v4

Expand Down Expand Up @@ -101,7 +101,7 @@ jobs:

check_wasm:
name: Check wasm32
runs-on: ubuntu-22.04
runs-on: ubuntu-latest
steps:
- uses: actions/checkout@v4
- uses: actions-rs/toolchain@v1
Expand All @@ -111,8 +111,6 @@ jobs:
target: wasm32-unknown-unknown
override: true

- run: sudo apt-get update && sudo apt-get install libgtk-3-dev

- name: Set up cargo cache
uses: Swatinem/rust-cache@v2

Expand All @@ -125,17 +123,18 @@ jobs:
uses: actions-rs/cargo@v1
with:
command: check
args: --target wasm32-unknown-unknown
args: --target wasm32-unknown-unknown --lib

- name: Cranky wasm32
env:
CLIPPY_CONF_DIR: "scripts/clippy_wasm" # Use scripts/clippy_wasm/clippy.toml
run: cargo cranky --target wasm32-unknown-unknown -- -D warnings
run: cargo cranky --target wasm32-unknown-unknown --lib -- -D warnings

# ---------------------------------------------------------------------------

cargo-deny:
runs-on: ubuntu-22.04
name: Check Rust dependencies (cargo-deny)
runs-on: ubuntu-latest
steps:
- uses: actions/checkout@v3
- uses: EmbarkStudios/cargo-deny-action@v1
Expand Down
1 change: 1 addition & 0 deletions Cargo.toml
Original file line number Diff line number Diff line change
Expand Up @@ -16,6 +16,7 @@ version = "0.1.0"

[package.metadata.docs.rs]
all-features = true
targets = ["x86_64-unknown-linux-gnu", "wasm32-unknown-unknown"]


[features]
Expand Down
2 changes: 2 additions & 0 deletions bacon.toml
Original file line number Diff line number Diff line change
@@ -1,3 +1,5 @@
# Copied from https://github.com/rerun-io/rerun_template

# This is a configuration file for the bacon tool
# More info at https://github.com/Canop/bacon

Expand Down
9 changes: 6 additions & 3 deletions deny.toml
Original file line number Diff line number Diff line change
Expand Up @@ -35,8 +35,11 @@ ignore = []

[bans]
multiple-versions = "deny"
wildcards = "allow" # We use them for examples
deny = []
wildcards = "deny"
deny = [
{ name = "openssl", reason = "Use rustls" },
{ name = "openssl-sys", reason = "Use rustls" },
]
skip = []
skip-tree = []

Expand All @@ -53,7 +56,7 @@ allow = [
"BSL-1.0", # https://tldrlegal.com/license/boost-software-license-1.0-explained
"CC0-1.0", # https://creativecommons.org/publicdomain/zero/1.0/
"ISC", # https://www.tldrlegal.com/license/isc-license
"LicenseRef-UFL-1.0", # See https://github.com/emilk/egui/issues/2321
"LicenseRef-UFL-1.0", # no official SPDX, see https://github.com/emilk/egui/issues/2321
"MIT-0", # https://choosealicense.com/licenses/mit-0/
"MIT", # https://tldrlegal.com/license/mit-license
"MPL-2.0", # https://www.mozilla.org/en-US/MPL/2.0/FAQ/ - see Q11. Used by webpki-roots on Linux.
Expand Down
11 changes: 9 additions & 2 deletions scripts/template_update.py
Original file line number Diff line number Diff line change
Expand Up @@ -21,7 +21,7 @@
import shutil
import tempfile

from git import Repo
from git import Repo # pip install GitPython

OWNER = "rerun-io"

Expand Down Expand Up @@ -107,7 +107,14 @@ def delete_files_and_folder(paths: set[str], dry_run: bool) -> None:

def update(languages: set[str], dry_run: bool) -> None:
# Don't overwrite these
ALWAYS_IGNORE_FILES = {"README.md", "pixi.lock", "Cargo.lock", "main.py", "requirements.txt"}
ALWAYS_IGNORE_FILES = {
"Cargo.lock",
"CHANGELOG.md",
"main.py",
"pixi.lock",
"README.md",
"requirements.txt",
}

files_to_ignore = calc_deny_set(languages) | ALWAYS_IGNORE_FILES
repo_path = os.path.dirname(os.path.dirname(os.path.realpath(__file__)))
Expand Down

0 comments on commit 657c908

Please sign in to comment.