Skip to content

Commit

Permalink
Merge branch 'main' of github.com:bisohns/saido into FEAT/web-dashboard
Browse files Browse the repository at this point in the history
  • Loading branch information
deven96 committed Nov 10, 2022
2 parents e930dac + 8a4ef32 commit 2df9464
Show file tree
Hide file tree
Showing 2 changed files with 2 additions and 4 deletions.
3 changes: 0 additions & 3 deletions .air.toml
Original file line number Diff line number Diff line change
Expand Up @@ -7,9 +7,6 @@ tmp_dir = "tmp"

[build]
# Just plain old shell command. You could use `make` as well.
cmd = "go build -o ./tmp/main ."
# Binary file yields from `cmd`.
bin = "tmp/main"
# Watch these filename extensions.
include_ext = ["go", "tpl", "tmpl", "html", "yaml"]
# Ignore these filename extensions or directories.
Expand Down
3 changes: 2 additions & 1 deletion Makefile
Original file line number Diff line number Diff line change
@@ -1,3 +1,4 @@
version=fake
# Example:
# make
# make prep-ci-ssh
Expand All @@ -18,7 +19,7 @@ prep-ci-local-windows:
cp ".\scripts\config.local.yaml" ".\config-test.yaml"
cat config-test.yaml

ifneq($(findstring fake, $(version)), fake)
ifneq ($(findstring fake, $(version)), fake)
upgrade:
@echo ">>> Recreating version_num.go"
@echo 'package cmd\n\nconst Version = "$(version)"' > cmd/version_num.go
Expand Down

0 comments on commit 2df9464

Please sign in to comment.