diff options
Diffstat
| -rw-r--r-- | .editorconfig | 26 | +0 −26 |
| -rw-r--r-- | .github/workflows/build.yml | 15 | +5 −10 |
| -rw-r--r-- | .gitignore | 5 | +2 −3 |
| -rw-r--r-- | CODEOWNERS | 2 | +1 −1 |
| -rw-r--r-- | Cargo.toml | 4 | +2 −2 |
| -rw-r--r-- | Dockerfile | 2 | +1 −1 |
| -rw-r--r-- | README.md | 2 | +1 −1 |
| -rw-r--r-- | REUSE.toml | 4 | +2 −2 |
| -rw-r--r-- | assets/favicon.ico (renamed from crates/gilti/assets/favicon.ico) | bin | 1078 -> 1078 bytes |
| -rw-r--r-- | assets/gilti.css (renamed from crates/gilti/assets/gilti.css) | 0 | +0 −0 |
| -rw-r--r-- | assets/gilti.js (renamed from crates/gilti/assets/gilti.js) | 0 | +0 −0 |
| -rw-r--r-- | assets/gilti.png (renamed from crates/gilti/assets/gilti.png) | bin | 1366 -> 1366 bytes |
| -rw-r--r-- | charts/gilti/Chart.yaml | 2 | +1 −1 |
| -rw-r--r-- | charts/gilti/README.md | 4 | +2 −2 |
| -rw-r--r-- | crates/gilti/Cargo.toml | 2 | +1 −1 |
| -rw-r--r-- | mise.toml | 8 | +6 −2 |
| -rwxr-xr-x | scripts/build-artifacts.sh | 8 | +4 −4 |
17 files changed, 28 insertions, 56 deletions
diff --git a/.editorconfig b/.editorconfig deleted file mode 100644 --- a/.editorconfig +++ /dev/null @@ -1,26 +0,0 @@ -# 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 09866d3..5d16f7f 100644 --- a/.github/workflows/build.yml +++ b/.github/workflows/build.yml @@ -17,12 +17,8 @@ concurrency: group: gilti-build-${{ github.ref }} cancel-in-progress: true -env: - CARGO_TERM_COLOR: always - RELEASE_TAG: nightly - jobs: - lint: + check: name: Static checks runs-on: ubuntu-latest steps: @@ -37,16 +33,15 @@ jobs: run: mise bootstrap --locked --yes --update - uses: Swatinem/rust-cache@779680da715d629ac1d338a641029a2f4372abb5 # v2.8.2 - - name: formatting + - name: Check formatting run: cargo fmt --all --check - - name: shellcheck - run: shellcheck scripts/*.sh tests/*.sh + - run: shellcheck scripts/*.sh tests/*.sh build: name: Build (${{ matrix.arch }}) runs-on: ${{ matrix.runner }} - needs: [lint] + needs: [check] strategy: fail-fast: false matrix: @@ -67,7 +62,7 @@ jobs: run: mise bootstrap --locked --yes --update - uses: Swatinem/rust-cache@779680da715d629ac1d338a641029a2f4372abb5 # v2.8.2 - - run: cargo clippy --workspace --locked --all-targets --all-features --release -- -D warnings + - run: cargo clippy --locked --all-targets --all-features --release -- -D warnings - run: cargo test --all-features --release --locked - run: tests/chart.sh diff --git a/.gitignore b/.gitignore index bc1d763..2127774 100644 --- a/.gitignore +++ b/.gitignore @@ -1,10 +1,9 @@ # 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 faf8e2e..7aeb094 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/Cargo.toml b/Cargo.toml index fc8833e..2f300b2 100644 --- a/Cargo.toml +++ b/Cargo.toml @@ -12,8 +12,8 @@ rust-version = "1.97" version = "0.1.0" license = "AGPL-3.0-or-later" authors = ["Nikolay Govorov <me@govorov.online>"] -homepage = "https://git.dimidiumlabs.io/gilti" -repository = "https://git.dimidiumlabs.io/gilti" +homepage = "https://github.com/dimidiumlabs/gilti" +repository = "https://github.com/dimidiumlabs/gilti" [workspace.dependencies] axum = { version = "0.8.4", default-features = false, features = ["http1", "tokio"] } diff --git a/Dockerfile b/Dockerfile index a625eb1..58e999e 100644 --- a/Dockerfile +++ b/Dockerfile @@ -13,7 +13,7 @@ ARG REVISION=unknown LABEL org.opencontainers.image.title="Gilti" \ org.opencontainers.image.description="Tiny Git server in a box" \ - org.opencontainers.image.source="https://git.dimidiumlabs.io/gilti" \ + org.opencontainers.image.source="https://github.com/dimidiumlabs/gilti" \ org.opencontainers.image.version="$VERSION" \ org.opencontainers.image.revision="$REVISION" \ org.opencontainers.image.licenses="AGPL-3.0-or-later" diff --git a/README.md b/README.md index 2db136f..9511027 100644 --- a/README.md +++ b/README.md @@ -67,7 +67,7 @@ ssh: helm upgrade --install gilti ./charts/gilti \ --namespace gilti --create-namespace \ --values values.yaml \ - --set web.clonePrefix='ssh://git@git.dimidiumlabs.io/' + --set web.clonePrefix='ssh://git@vcs.dimidiumlabs.io/' ``` See [`charts/gilti/README.md`](charts/gilti/README.md) for persistence, routing, diff --git a/REUSE.toml b/REUSE.toml index 901485f..5759d8f 100644 --- a/REUSE.toml +++ b/REUSE.toml @@ -30,8 +30,8 @@ SPDX-License-Identifier = "CC-BY-3.0" [[annotations]] path = [ - "crates/gilti/assets/gilti.png", - "crates/gilti/assets/favicon.ico", + "assets/gilti.png", + "assets/favicon.ico", ] SPDX-FileCopyrightText = "cgit Development Team <cgit@lists.zx2c4.com>" SPDX-License-Identifier = "GPL-2.0-only" diff --git a/crates/gilti/assets/favicon.ico b/assets/favicon.ico index 56ff593..56ff593 100644 --- a/crates/gilti/assets/favicon.ico +++ b/assets/favicon.ico Binary files differ diff --git a/crates/gilti/assets/gilti.css b/assets/gilti.css index e9a423e..e9a423e 100644 --- a/crates/gilti/assets/gilti.css +++ b/assets/gilti.css diff --git a/crates/gilti/assets/gilti.js b/assets/gilti.js index b4ade48..b4ade48 100644 --- a/crates/gilti/assets/gilti.js +++ b/assets/gilti.js diff --git a/crates/gilti/assets/gilti.png b/assets/gilti.png index 425528e..425528e 100644 --- a/crates/gilti/assets/gilti.png +++ b/assets/gilti.png Binary files differ diff --git a/charts/gilti/Chart.yaml b/charts/gilti/Chart.yaml index 9a4b918..009829b 100644 --- a/charts/gilti/Chart.yaml +++ b/charts/gilti/Chart.yaml @@ -7,5 +7,5 @@ version: 0.1.0 appVersion: 0.1.0 name: gilti -home: https://git.dimidiumlabs.io/gilti +home: https://github.com/dimidiumlabs/gilti description: Boxed tiny Git server powered by Rust and OpenSSH diff --git a/charts/gilti/README.md b/charts/gilti/README.md index 71f45ea..ee0d5d3 100644 --- a/charts/gilti/README.md +++ b/charts/gilti/README.md @@ -54,10 +54,10 @@ ssh: authorizedKeys: - ssh-ed25519 AAAA... operator@example web: - clonePrefix: ssh://git@git.dimidiumlabs.io/ + clonePrefix: ssh://git@vcs.dimidiumlabs.io/ httpRoute: enabled: true - hostnames: [git.dimidiumlabs.io] + hostnames: [vcs.dimidiumlabs.io] parentRefs: - name: public namespace: network diff --git a/crates/gilti/Cargo.toml b/crates/gilti/Cargo.toml index 8296cd9..c98b0a2 100644 --- a/crates/gilti/Cargo.toml +++ b/crates/gilti/Cargo.toml @@ -3,7 +3,7 @@ [package] name = "gilti" -description = "Gilti daemon" +description = "Gilti web-server and daemon" version.workspace = true authors.workspace = true diff --git a/mise.toml b/mise.toml index 37ffe1c..6101ba9 100644 --- a/mise.toml +++ b/mise.toml @@ -8,11 +8,15 @@ 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] dir = "{{cwd}}" includes = [ - "git::https://git.dimidiumlabs.io/platform.git//tasks?ref=8bc35fe8be889c50db2d1fb4425cc1b4097dc6b8", + "git::https://github.com/dimidiumlabs/platform.git//tasks?ref=8bc35fe8be889c50db2d1fb4425cc1b4097dc6b8", ] diff --git a/scripts/build-artifacts.sh b/scripts/build-artifacts.sh index 32016ff..b7949fc 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 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" +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" |
