lockbox

commit 35d2359bb90c4ec5b36200c2f170c04d27b353e6
parent 66d8344c7f80465ab70ca303d63251e7db868410
Author: Sean Enck <sean@ttypty.com>
Date:   Tue,  7 Mar 2023 18:36:08 -0500

moving scripts into internal area

Diffstat:
M
.github/workflows/build.yml
 | 
6
+++---
M
Makefile
 | 
9
+++++++--
M
cmd/vers.txt
 | 
4
++--
R
scripts/testing/Makefile -> internal/scripts/testing/Makefile
 | 
0

R
scripts/testing/check.go -> internal/scripts/testing/check.go
 | 
0

R
scripts/testing/expected.log -> internal/scripts/testing/expected.log
 | 
0

R
scripts/testing/hooks/all.sh -> internal/scripts/testing/hooks/all.sh
 | 
0

R
scripts/testing/hooks/test.sh -> internal/scripts/testing/hooks/test.sh
 | 
0

R
scripts/version/main.go -> internal/scripts/version/main.go
 | 
0

D
scripts/ci/build.sh
 | 
10
----------

10 files changed, 12 insertions(+), 17 deletions(-)
diff --git a/.github/workflows/build.yml b/.github/workflows/build.yml
@@ -12,7 +12,7 @@ jobs:
       - name: "deps"
         run: apk add go make git
       - name: "build"
-        run: ./scripts/ci/build.sh
+        run: make .runci
   ubuntu-build:
     runs-on: ubuntu-latest
     steps:
@@ -20,7 +20,7 @@ jobs:
       - name: "deps"
         run: sudo apt-get install -y make git golang
       - name: "build"
-        run: ./scripts/ci/build.sh
+        run: make .runci
   macos-build:
     runs-on: macos-latest
     steps:
@@ -30,4 +30,4 @@ jobs:
       - name: "deps"
         run: brew install go
       - name: "build"
-        run: ./scripts/ci/build.sh
+        run: make .runci
diff --git a/Makefile b/Makefile
@@ -1,13 +1,13 @@
 BUILD   := bin/
 TARGET  := $(BUILD)lb
-TESTS   := scripts/testing
+TESTS   := internal/scripts/testing
 
 all: $(TARGET)
 
 build: $(TARGET)
 
 $(TARGET): cmd/main.go internal/**/*.go  go.* internal/cli/completions*
-	go run scripts/version/main.go cmd/vers.txt
+	go run internal/scripts/version/main.go cmd/vers.txt
 	go build $(GOFLAGS) -o $@ cmd/main.go
 
 unittest:
@@ -19,3 +19,8 @@ check: $(TARGET) unittest
 clean:
 	rm -rf $(BUILD)
 	make -C $(TESTS) clean
+
+.runci:
+	rm -rf .git
+	make build
+	make check
diff --git a/cmd/vers.txt b/cmd/vers.txt
@@ -1 +1 @@
-v23.03.01
-\ No newline at end of file
+v23.03.02
+\ No newline at end of file
diff --git a/scripts/testing/Makefile b/internal/scripts/testing/Makefile
diff --git a/scripts/testing/check.go b/internal/scripts/testing/check.go
diff --git a/scripts/testing/expected.log b/internal/scripts/testing/expected.log
diff --git a/scripts/testing/hooks/all.sh b/internal/scripts/testing/hooks/all.sh
diff --git a/scripts/testing/hooks/test.sh b/internal/scripts/testing/hooks/test.sh
diff --git a/scripts/version/main.go b/internal/scripts/version/main.go
diff --git a/scripts/ci/build.sh b/scripts/ci/build.sh
@@ -1,10 +0,0 @@
-#!/bin/sh
-rm -rf ".git"
-if ! make build; then
-  echo "build failed"
-  exit 1
-fi
-if ! make check; then
-  echo "check failed"
-  exit 1
-fi