From 657c908ed19bd8d216ec194264eb00d555ddc6ac Mon Sep 17 00:00:00 2001
From: Emil Ernerfeldt <emil.ernerfeldt@gmail.com>
Date: Thu, 18 Apr 2024 10:55:20 +0200
Subject: [PATCH] Smaller improvements (#5)

---
 .github/workflows/cpp.yml    |  2 +-
 .github/workflows/python.yml |  2 +-
 .github/workflows/rust.yml   | 13 ++++++-------
 Cargo.toml                   |  1 +
 bacon.toml                   |  2 ++
 deny.toml                    |  9 ++++++---
 scripts/template_update.py   | 11 +++++++++--
 7 files changed, 26 insertions(+), 14 deletions(-)

diff --git a/.github/workflows/cpp.yml b/.github/workflows/cpp.yml
index 9b2bc02..60f3bbc 100644
--- a/.github/workflows/cpp.yml
+++ b/.github/workflows/cpp.yml
@@ -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
 
diff --git a/.github/workflows/python.yml b/.github/workflows/python.yml
index d6faacf..7af773c 100644
--- a/.github/workflows/python.yml
+++ b/.github/workflows/python.yml
@@ -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
 
diff --git a/.github/workflows/rust.yml b/.github/workflows/rust.yml
index 3c66cf0..47c52c4 100644
--- a/.github/workflows/rust.yml
+++ b/.github/workflows/rust.yml
@@ -10,7 +10,7 @@ env:
 jobs:
   rust-check:
     name: Rust
-    runs-on: ubuntu-22.04
+    runs-on: ubuntu-latest
     steps:
       - uses: actions/checkout@v4
 
@@ -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
@@ -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
 
@@ -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
diff --git a/Cargo.toml b/Cargo.toml
index c80d1f7..29a3405 100644
--- a/Cargo.toml
+++ b/Cargo.toml
@@ -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]
diff --git a/bacon.toml b/bacon.toml
index 0476b3e..a6a49bb 100644
--- a/bacon.toml
+++ b/bacon.toml
@@ -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
 
diff --git a/deny.toml b/deny.toml
index f6b4251..756b9e1 100644
--- a/deny.toml
+++ b/deny.toml
@@ -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 = []
 
@@ -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.
diff --git a/scripts/template_update.py b/scripts/template_update.py
index 85e3110..4e4665f 100755
--- a/scripts/template_update.py
+++ b/scripts/template_update.py
@@ -21,7 +21,7 @@
 import shutil
 import tempfile
 
-from git import Repo
+from git import Repo  # pip install GitPython
 
 OWNER = "rerun-io"
 
@@ -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__)))