aboutsummaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
Diffstat
-rw-r--r--.editorconfig26+26 −0
-rw-r--r--.github/workflows/build.yml15+10 −5
-rw-r--r--.github/workflows/legal.yml1+0 −1
-rw-r--r--.gitignore5+3 −2
-rw-r--r--CODEOWNERS2+1 −1
-rw-r--r--REUSE.toml4+2 −2
-rw-r--r--crates/gilti/Cargo.toml2+1 −1
-rw-r--r--crates/gilti/assets/favicon.ico (renamed from assets/favicon.ico)bin1078 -> 1078 bytes
-rw-r--r--crates/gilti/assets/gilti.css (renamed from assets/gilti.css)0+0 −0
-rw-r--r--crates/gilti/assets/gilti.js (renamed from assets/gilti.js)0+0 −0
-rw-r--r--crates/gilti/assets/gilti.png (renamed from assets/gilti.png)bin1366 -> 1366 bytes
-rw-r--r--mise.toml6+1 −5
-rwxr-xr-xscripts/build-artifacts.sh8+4 −4
13 files changed, 48 insertions, 21 deletions
diff --git a/.editorconfig b/.editorconfig
new file mode 100644
--- /dev/null
+++ b/.editorconfig
@@ -0,0 +1,26 @@
+# SPDX-FileCopyrightText: 2026 Nikolay Govorov
+# SPDX-License-Identifier: AGPL-3.0-or-later
+
+root = true
+
+[*]
+charset = utf-8
+end_of_line = lf
+insert_final_newline = true
+trim_trailing_whitespace = true
+indent_style = space
+indent_size = 4
+
+[*.md]
+# double whitespace at end of line
+# denotes a line break in Markdown
+trim_trailing_whitespace = false
+
+[*.rs]
+max_line_length = 100
+
+[*.yml]
+indent_size = 2
+
+[{Makefile,*.mk}]
+indent_style = tab
diff --git a/.github/workflows/build.yml b/.github/workflows/build.yml
index 5d16f7f..09866d3 100644
--- a/.github/workflows/build.yml
+++ b/.github/workflows/build.yml
@@ -17,8 +17,12 @@ concurrency:
group: gilti-build-${{ github.ref }}
cancel-in-progress: true
+env:
+ CARGO_TERM_COLOR: always
+ RELEASE_TAG: nightly
+
jobs:
- check:
+ lint:
name: Static checks
runs-on: ubuntu-latest
steps:
@@ -33,15 +37,16 @@ jobs:
run: mise bootstrap --locked --yes --update
- uses: Swatinem/rust-cache@779680da715d629ac1d338a641029a2f4372abb5 # v2.8.2
- - name: Check formatting
+ - name: formatting
run: cargo fmt --all --check
- - run: shellcheck scripts/*.sh tests/*.sh
+ - name: shellcheck
+ run: shellcheck scripts/*.sh tests/*.sh
build:
name: Build (${{ matrix.arch }})
runs-on: ${{ matrix.runner }}
- needs: [check]
+ needs: [lint]
strategy:
fail-fast: false
matrix:
@@ -62,7 +67,7 @@ jobs:
run: mise bootstrap --locked --yes --update
- uses: Swatinem/rust-cache@779680da715d629ac1d338a641029a2f4372abb5 # v2.8.2
- - run: cargo clippy --locked --all-targets --all-features --release -- -D warnings
+ - run: cargo clippy --workspace --locked --all-targets --all-features --release -- -D warnings
- run: cargo test --all-features --release --locked
- run: tests/chart.sh
diff --git a/.github/workflows/legal.yml b/.github/workflows/legal.yml
index 0336344..8a739c4 100644
--- a/.github/workflows/legal.yml
+++ b/.github/workflows/legal.yml
@@ -6,7 +6,6 @@ name: Legal
on:
push:
branches: [main]
- tags: ["v*"]
pull_request:
branches: [main]
diff --git a/.gitignore b/.gitignore
index 2127774..bc1d763 100644
--- a/.gitignore
+++ b/.gitignore
@@ -1,9 +1,10 @@
# SPDX-FileCopyrightText: 2026 Nikolay Govorov
# SPDX-License-Identifier: AGPL-3.0-or-later
-/.container
/dist
/target
-/.gilti-state
mise.local.toml
mise.*.local.toml
+
+/.container
+/.gilti-state
diff --git a/CODEOWNERS b/CODEOWNERS
index 7aeb094..faf8e2e 100644
--- a/CODEOWNERS
+++ b/CODEOWNERS
@@ -1,4 +1,4 @@
# SPDX-FileCopyrightText: 2026 Nikolay Govorov
# SPDX-License-Identifier: AGPL-3.0-or-later
-* @mrdimidium
+* @mrdimidium
diff --git a/REUSE.toml b/REUSE.toml
index 5759d8f..901485f 100644
--- a/REUSE.toml
+++ b/REUSE.toml
@@ -30,8 +30,8 @@ SPDX-License-Identifier = "CC-BY-3.0"
[[annotations]]
path = [
- "assets/gilti.png",
- "assets/favicon.ico",
+ "crates/gilti/assets/gilti.png",
+ "crates/gilti/assets/favicon.ico",
]
SPDX-FileCopyrightText = "cgit Development Team <cgit@lists.zx2c4.com>"
SPDX-License-Identifier = "GPL-2.0-only"
diff --git a/crates/gilti/Cargo.toml b/crates/gilti/Cargo.toml
index c98b0a2..8296cd9 100644
--- a/crates/gilti/Cargo.toml
+++ b/crates/gilti/Cargo.toml
@@ -3,7 +3,7 @@
[package]
name = "gilti"
-description = "Gilti web-server and daemon"
+description = "Gilti daemon"
version.workspace = true
authors.workspace = true
diff --git a/assets/favicon.ico b/crates/gilti/assets/favicon.ico
index 56ff593..56ff593 100644
--- a/assets/favicon.ico
+++ b/crates/gilti/assets/favicon.ico
Binary files differ
diff --git a/assets/gilti.css b/crates/gilti/assets/gilti.css
index e9a423e..e9a423e 100644
--- a/assets/gilti.css
+++ b/crates/gilti/assets/gilti.css
diff --git a/assets/gilti.js b/crates/gilti/assets/gilti.js
index b4ade48..b4ade48 100644
--- a/assets/gilti.js
+++ b/crates/gilti/assets/gilti.js
diff --git a/assets/gilti.png b/crates/gilti/assets/gilti.png
index 425528e..425528e 100644
--- a/assets/gilti.png
+++ b/crates/gilti/assets/gilti.png
Binary files differ
diff --git a/mise.toml b/mise.toml
index 6101ba9..d8f17d2 100644
--- a/mise.toml
+++ b/mise.toml
@@ -8,11 +8,7 @@ experimental = true
[tools]
helm = "4.1.1"
-rust = { version = "1.97.1", profile = "minimal", components = [
- "clippy",
- "llvm-tools-preview",
- "rustfmt",
-] }
+rust = { version = "1.97.1", profile = "minimal", components = ["clippy", "llvm-tools-preview", "rustfmt"] }
shellcheck = "0.11.0"
[task_config]
diff --git a/scripts/build-artifacts.sh b/scripts/build-artifacts.sh
index b7949fc..32016ff 100755
--- a/scripts/build-artifacts.sh
+++ b/scripts/build-artifacts.sh
@@ -33,7 +33,7 @@ output="$workspace/.container/binary-$arch"
rm -rf "$output"
install -Dm0755 "$build/target/release/gilti" "$output/gilti"
install -Dm0755 "$build/target/release/gilti-ssh" "$output/gilti-ssh"
-install -Dm0644 assets/gilti.css "$output/gilti.css"
-install -Dm0644 assets/gilti.js "$output/gilti.js"
-install -Dm0644 assets/gilti.png "$output/gilti.png"
-install -Dm0644 assets/favicon.ico "$output/favicon.ico"
+install -Dm0644 crates/gilti/assets/gilti.css "$output/gilti.css"
+install -Dm0644 crates/gilti/assets/gilti.js "$output/gilti.js"
+install -Dm0644 crates/gilti/assets/gilti.png "$output/gilti.png"
+install -Dm0644 crates/gilti/assets/favicon.ico "$output/favicon.ico"
generated by Gilti