jolly winter cleanup (#251)

* ci: bump DeterminateSystems/nix-installer-action from 13 to 16 Bumps [DeterminateSystems/nix-installer-action](https://github.com/determinatesystems/nix-installer-action) from 13 to 16. - [Release notes](https://github.com/determinatesystems/nix-installer-action/releases) - [Commits](DeterminateSystems/nix-installer-action@v13...v16) --- updated-dependencies: - dependency-name: DeterminateSystems/nix-installer-action dependency-type: direct:production update-type: version-update:semver-major ... Signed-off-by: dependabot[bot] <[email protected]> * crates: bump serde from 1.0.209 to 1.0.215 Bumps [serde](https://github.com/serde-rs/serde) from 1.0.209 to 1.0.215. - [Release notes](https://github.com/serde-rs/serde/releases) - [Commits](serde-rs/serde@v1.0.209...v1.0.215) --- updated-dependencies: - dependency-name: serde dependency-type: direct:production update-type: version-update:semver-patch ... Signed-off-by: dependabot[bot] <[email protected]> * crates: bump serde_json from 1.0.127 to 1.0.133 Bumps [serde_json](https://github.com/serde-rs/json) from 1.0.127 to 1.0.133. - [Release notes](https://github.com/serde-rs/json/releases) - [Commits](serde-rs/json@v1.0.127...v1.0.133) --- updated-dependencies: - dependency-name: serde_json dependency-type: direct:production update-type: version-update:semver-patch ... Signed-off-by: dependabot[bot] <[email protected]> * crates: bump tokio from 1.40.0 to 1.41.1 Bumps [tokio](https://github.com/tokio-rs/tokio) from 1.40.0 to 1.41.1. - [Release notes](https://github.com/tokio-rs/tokio/releases) - [Commits](tokio-rs/tokio@tokio-1.40.0...tokio-1.41.1) --- updated-dependencies: - dependency-name: tokio dependency-type: direct:production update-type: version-update:semver-minor ... Signed-off-by: dependabot[bot] <[email protected]> * crates: bump reqwest from 0.12.7 to 0.12.9 Bumps [reqwest](https://github.com/seanmonstar/reqwest) from 0.12.7 to 0.12.9. - [Release notes](https://github.com/seanmonstar/reqwest/releases) - [Changelog](https://github.com/seanmonstar/reqwest/blob/master/CHANGELOG.md) - [Commits](seanmonstar/reqwest@v0.12.7...v0.12.9) --- updated-dependencies: - dependency-name: reqwest dependency-type: direct:production update-type: version-update:semver-patch ... Signed-off-by: dependabot[bot] <[email protected]> * nix: update flake.lock * ci: bump DeterminateSystems/magic-nix-cache-action from 7 to 8 Bumps [DeterminateSystems/magic-nix-cache-action](https://github.com/determinatesystems/magic-nix-cache-action) from 7 to 8. - [Release notes](https://github.com/determinatesystems/magic-nix-cache-action/releases) - [Commits](DeterminateSystems/magic-nix-cache-action@v7...v8) --- updated-dependencies: - dependency-name: DeterminateSystems/magic-nix-cache-action dependency-type: direct:production update-type: version-update:semver-major ... Signed-off-by: dependabot[bot] <[email protected]> * treewide: debrand * nix: adopt new darwin sdk * nix: drop treefmt * nix: misc formatting changes * ci: cleanup * nix: pass version info to static builds * nix: mv {derivation,package}.nix * eyre -> anyhow * remove 2024 edition warnings * format with rustfmt * remove optional commands * ci: don't include internal variables in job names * nix: enable for lto builds --------- Signed-off-by: dependabot[bot] <[email protected]> Co-authored-by: dependabot[bot] <49699333+dependabot[bot]@users.noreply.github.com> Co-authored-by: getchoo-bot[bot] <183349775+getchoo-bot[bot]@users.noreply.github.com>
getchoo · Dec 19, 2024 · 2ae2b97 · 2ae2b97
1 parent 7730984
commit 2ae2b97
Show file tree

Hide file tree

Showing 43 changed files with 621 additions and 826 deletions.
diff --git a/.env.template b/.env.template
@@ -2,4 +2,4 @@ TOKEN=
 REDIS_URL=
 
 RUST_BACKTRACE=1
-RUST_LOG="teawiebot=debug,warn"
+RUST_LOG="chill=debug,warn"
diff --git a/.github/workflows/autobot.yaml b/.github/workflows/autobot.yaml
@@ -1,31 +1,34 @@
-name: Auto-merge Dependabot
+name: "Auto-merge Dependabot"
 
-on: pull_request
+on:
+  pull_request:
 
 jobs:
   automerge:
-    name: Check and merge PR
-    if: github.actor == 'dependabot[bot]'
+    name: "Check and merge PR"
 
-    runs-on: ubuntu-latest
+    if: ${{ github.actor == 'dependabot[bot]' }}
+
+    runs-on: "ubuntu-latest"
 
     steps:
-      - name: Generate GitHub App token
-        uses: actions/create-github-app-token@v1
-        id: app-token
+      - name: "Generate GitHub App token"
+        uses: "actions/create-github-app-token@v1"
+        id: "app-token"
         with:
           app-id: ${{ vars.APP_ID }}
           private-key: ${{ secrets.PRIVATE_KEY }}
 
-      - name: Fetch metadata
-        uses: dependabot/fetch-metadata@v2
-        id: metadata
+      - name: "Fetch metadata"
+        uses: "dependabot/fetch-metadata@v2"
+        id: "metadata"
         with:
           github-token: ${{ steps.app-token.outputs.token }}
 
-      - name: Enable auto-merge
+      - name: "Enable auto-merge"
         if: ${{ steps.metadata.outputs.update-type == 'version-update:semver-patch' || steps.metadata.outputs.update-type == 'version-update:semver-minor' }}
-        run: gh pr merge --auto --squash "$PR"
         env:
-          PR: ${{ github.event.pull_request.html_url }}
           GH_TOKEN: ${{ steps.app-token.outputs.token }}
+          PR: ${{ github.event.pull_request.html_url }}
+        run: |
+          gh pr merge --auto --squash "$PR"
diff --git a/.github/workflows/ci.yaml b/.github/workflows/ci.yaml
@@ -1,8 +1,8 @@
-name: CI
+name: "CI"
 
 on:
   push:
-    branches: [main]
+    branches: [ "main" ]
     paths:
       - "**.nix"
       - "**.rs"
@@ -18,71 +18,64 @@ on:
 
 jobs:
   build:
-    name: Build
+    name: "Build (${{ matrix.os }})"
 
     strategy:
       fail-fast: false
       matrix:
-        os: [macos-latest, windows-latest]
+        include:
+          - os: "ubuntu-latest"
+            use-nix: true
+          - os: "windows-latest"
+            use-nix: false
 
     runs-on: ${{ matrix.os }}
 
     steps:
-      - name: Checkout repository
-        uses: actions/checkout@v4
+      - name: "Checkout repository"
+        uses: "actions/checkout@v4"
 
-      - name: Install Rust
-        uses: actions-rust-lang/setup-rust-toolchain@v1
+      - name: "Install Nix"
+        if: ${{ matrix.use-nix }}
+        uses: "cachix/install-nix-action@v30"
 
-      - name: Run build
-        run: |
-          cargo build --locked --release
-
-  nix:
-    name: Nix
-
-    runs-on: ubuntu-latest
-
-    steps:
-      - name: Checkout repository
-        uses: actions/checkout@v4
-
-      - name: Install Nix
-        uses: DeterminateSystems/nix-installer-action@v13
+      - name: "Setup Nix cache"
+        if: ${{ matrix.use-nix }}
+        uses: "DeterminateSystems/magic-nix-cache-action@v8"
 
-      - name: Setup Nix cache
-        uses: DeterminateSystems/magic-nix-cache-action@v7
+      - name: "Install Rust"
+        if: ${{ !matrix.use-nix }}
+        uses: "actions-rust-lang/setup-rust-toolchain@v1"
 
-      - name: Run flake checks
+      - name: "Run cargo build"
+        if: ${{ !matrix.use-nix }}
         run: |
-          nix build --print-build-logs --show-trace
-
-  rustfmt:
-    name: Rustfmt
-
-    runs-on: ubuntu-latest
+          cargo build --locked --release
 
-    steps:
-      - name: Checkout repository
-        uses: actions/checkout@v4
+      - name: "Evaluate flake.nix"
+        if: ${{ matrix.use-nix }}
+        run: nix flake check --no-build --show-trace
 
-      - name: Install Rust
-        uses: actions-rust-lang/setup-rust-toolchain@v1
-        with:
-          components: rustfmt
+      - name: "Run nix build"
+        if: ${{ matrix.use-nix }}
+        run: |
+          nix build --print-build-logs
 
-      - name: Run rustfmt
-        uses: actions-rust-lang/rustfmt@v1
+      - name: "Build Flake checks"
+        if: ${{ matrix.os == 'ubuntu-latest' }}
+        run: |
+          nix flake check --print-build-logs
 
   release-gate:
-    name: CI Release gate
-    needs: [build, rustfmt, nix]
+    name: "CI Release gate"
+    needs: [ "build" ]
 
     if: ${{ always() }}
 
-    runs-on: ubuntu-latest
+    runs-on: "ubuntu-latest"
 
     steps:
-      - name: Exit with error
-        if: contains(needs.*.result, 'failure') || contains(needs.*.result, 'cancelled')
-        run: exit 1
+      - name: "Exit with error"
+        if: ${{ contains(needs.*.result, 'failure') || contains(needs.*.result, 'cancelled') }}
+        run: |
+          exit 1
diff --git a/.github/workflows/clippy.yaml b/.github/workflows/clippy.yaml
@@ -1,56 +1,54 @@
-name: Clippy
+name: "Clippy"
 
 on:
   push:
-    branches: [main]
+    branches: [ "main" ]
     paths:
-      - 'Cargo.toml'
-      - 'Cargo.lock'
-      - '**.rs'
+      - "**.rs"
+      - "**.lock"
+      - "Cargo.toml"
+      - "flake.nix"
+
+      - ".github/workflows/clippy.yaml"
   pull_request:
     paths:
-      - 'Cargo.toml'
-      - 'Cargo.lock'
-      - '**.rs'
+      - "**.rs"
+      - "**.lock"
+      - "Cargo.toml"
+      - "flake.nix"
+
+      - ".github/workflows/clippy.yaml"
   workflow_dispatch:
 
 jobs:
   clippy:
-    name: Run scan
+    name: "Run scan"
 
-    runs-on: ubuntu-latest
+    runs-on: "ubuntu-latest"
 
     permissions:
-      security-events: write
+      contents: "read"
+      security-events: "write"
 
     steps:
-      - name: Checkout repository
-        uses: actions/checkout@v4
+      - name: "Checkout repository"
+        uses: "actions/checkout@v4"
 
-      - name: Install Rust
-        uses: actions-rust-lang/setup-rust-toolchain@v1
-        with:
-          components: clippy
+      - name: "Install Nix"
+        uses: "cachix/install-nix-action@v30"
 
-      - name: Install SARIF tools
-        run: |
-          cargo install clippy-sarif sarif-fmt
+      - name: "Setup Nix cache"
+        uses: "DeterminateSystems/magic-nix-cache-action@v8"
 
-      - name: Fetch Cargo deps
+      - name: "Run Clippy"
+        id: "clippy-run"
         run: |
-          cargo fetch --locked
+          nix build --print-build-logs .#checks.x86_64-linux.clippy-sarif
+          [ -L result ] || exit 1
+          echo "sarif-file=$(readlink -f result)" >> "$GITHUB_OUTPUT"
 
-      - name: Run Clippy
-        continue-on-error: true
-        run: |
-          cargo clippy \
-            --all-features \
-            --all-targets \
-            --message-format=json \
-          | clippy-sarif | tee /tmp/clippy.sarif | sarif-fmt
-
-      - name: Upload results
-        uses: github/codeql-action/upload-sarif@v3
+      - name: "Upload results"
+        uses: "github/codeql-action/upload-sarif@v3"
         with:
-          sarif_file: /tmp/clippy.sarif
+          sarif_file: ${{ steps.clippy-run.outputs.sarif-file }}
           wait-for-processing: true