Browse Source

Remove lastrun.sha256 from git to avoid merging conflict (#259)

Rafael Blumberg 3 years ago
parent
commit
e1f7e6ea4c
3 changed files with 3 additions and 4 deletions
  1. 3 0
      .gitignore
  2. 0 3
      build/lastrun.sha256
  3. 0 1
      build/pre-commit

+ 3 - 0
.gitignore

@@ -1,2 +1,5 @@
 
 .DS_Store
+
+# Ignore latest.run file from build hoook
+build/lastrun.sha256

+ 0 - 3
build/lastrun.sha256

@@ -1,3 +0,0 @@
-ef7231c2ed89eb25fcabe4c4ecb65969207525b7dadd3b557221bb8510f2d02a  ../build/appinfo.json
-600921725b754fca4589eb100398700c451f7f886fcd5578682f9e232aa16eb0  ../template/portainer-v2-arm32.json
-4ad926282eb9bd712948062dccb45c32c510f049d521b85f55561ee54fafb970  ../template/portainer-v2-arm64.json

+ 0 - 1
build/pre-commit

@@ -25,7 +25,6 @@ if ! sha256sum -c --quiet "$verificationFile" &> /dev/null ; then
 	sha256sum "$appinfo" "$pt32" "$pt64" > "$verificationFile" 
 
 	# Add files to stagging
-	git add -- "$verificationFile"
 	git add -- "$README"
 	git add -- "$TOOLSREADME"
 	git add -- "$AppList"