Skip to content

Commit

Permalink
chore: bump flakebox
Browse files Browse the repository at this point in the history
  • Loading branch information
Kodylow committed Apr 6, 2024
1 parent 293c476 commit b176625
Show file tree
Hide file tree
Showing 4 changed files with 52 additions and 43 deletions.
2 changes: 1 addition & 1 deletion .config/flakebox/id
Original file line number Diff line number Diff line change
@@ -1 +1 @@
4554d31c5e79420d5b097aad56a49a1c61bb89f32d6b93fb5ff4d0677bc9b587e3426e881d01f5551ff816cfcec2941d0529130f491f6098abb64e6c28592c94
3df12aefd7925a90e8a0e09b721df7d8435ed993774832d5aca2cba090b3d23e11f68bd4826bbf10ca7944dcfa82165dcd5285634f9fcf76e00308bb314664bb
12 changes: 12 additions & 0 deletions .config/flakebox/shellHook.sh
Original file line number Diff line number Diff line change
@@ -1,4 +1,16 @@
#!/usr/bin/env bash
yesterday=$(date -d "yesterday" +%s)
motd_ts_path=".config/flakebox/tmp/motd"

if [ ! -e "$motd_ts_path" ] || [ "$motd_ts_path" -ot "$yesterday" ]; then
mkdir -p "$(dirname "$motd_ts_path")"
touch "$motd_ts_path"
>&2 echo "🚧 In an enfort to improve documentation, we now require all structs and"
>&2 echo "🚧 and public methods to be documented with a docstring."
>&2 echo "🚧 See https://github.com/fedimint/fedimint/issues/3807"

fi

root="$(git rev-parse --show-toplevel)"
dot_git="$(git rev-parse --git-common-dir)"
if [[ ! -d "${dot_git}/hooks" ]]; then mkdir -p "${dot_git}/hooks"; fi
Expand Down
15 changes: 1 addition & 14 deletions JUSTFILE
Original file line number Diff line number Diff line change
@@ -1,7 +1,5 @@
# THIS FILE IS AUTOGENERATED FROM FLAKEBOX CONFIGURATION
import 'justfile.local.just'

set dotenv-load := true
import "justfile.local.just"

alias b := build
alias c := check
Expand Down Expand Up @@ -33,17 +31,6 @@ check *ARGS="--workspace --all-targets":
cargo check {{ARGS}}

# run all checks recommended before opening a PR
final-check: lint clippy
#!/usr/bin/env bash
set -euo pipefail
if [ ! -f Cargo.toml ]; then
cd {{invocation_directory()}}
fi
cargo test --doc
just test

# run code formatters
format:
#!/usr/bin/env bash
Expand Down
66 changes: 38 additions & 28 deletions misc/git-hooks/pre-commit
Original file line number Diff line number Diff line change
Expand Up @@ -48,6 +48,43 @@ function check_cargo_lock() {
}
export -f check_cargo_lock

function check_check_forbidden_dependencies() {
set -euo pipefail

#!/usr/bin/env bash

set -eo pipefail

if grep -E "(fedimint-mint|fedimint-wallet|fedimint-ln)" fedimint-server/Cargo.toml >&2 ; then
>&2 echo "fedimint-server/Cargo.toml must not depend on modules"
return 1
fi
if grep -E "(fedimint-mint|fedimint-wallet|fedimint-ln-(server|common|client))" fedimint-testing/Cargo.toml >&2 ; then
>&2 echo "fedimint-testing/Cargo.toml must not depend on modules"
return 1
fi
find gateway/ -name Cargo.toml | while read -r cargo_toml ; do
if grep -E "fedimint-server" "$cargo_toml" >&2 ; then
>&2 echo "$cargo_toml must not depend on fedimint-server"
return 1
fi
done
find fedimint-client/ -name Cargo.toml | while read -r cargo_toml ; do
if grep -E "fedimint-server" "$cargo_toml" >&2 ; then
>&2 echo "$cargo_toml must not depend on fedimint-server"
return 1
fi
done
find ./ -name Cargo.lock | while read -r cargo_lock ; do
if grep -E "openssl" "$cargo_lock" >&2 ; then
>&2 echo "$cargo_lock must not depend on openssl"
return 1
fi
done

}
export -f check_check_forbidden_dependencies

function check_leftover_dbg() {
set -euo pipefail

Expand Down Expand Up @@ -102,33 +139,6 @@ function check_shellcheck() {
}
export -f check_shellcheck

function check_trailing_newline() {
set -euo pipefail

errors=""
for path in $(echo "$FLAKEBOX_GIT_LS_TEXT"); do

# extra branches for clarity
if [ ! -s "$path" ]; then
# echo "$path is empty"
true
elif [ -z "$(tail -c 1 < "$path")" ]; then
# echo "$path ends with a newline or with a null byte"
true
else
>&2 echo "$path doesn't end with a newline" 1>&2
errors="true"
fi
done

if [ -n "$errors" ]; then
>&2 echo "Fix the problems above or use --no-verify" 1>&2
return 1
fi

}
export -f check_trailing_newline

function check_trailing_whitespace() {
set -euo pipefail

Expand Down Expand Up @@ -161,10 +171,10 @@ parallel \
::: \
check_cargo_fmt \
check_cargo_lock \
check_check_forbidden_dependencies \
check_leftover_dbg \
check_semgrep \
check_shellcheck \
check_trailing_newline \
check_trailing_whitespace \
check_typos \
check_nothing

0 comments on commit b176625

Please sign in to comment.