Log git diff output before commit

tie · May 15, 2021 · 5480938 · 5480938
1 parent e1031e5
commit 5480938
Show file tree

Hide file tree

Showing 2 changed files with 12 additions and 7 deletions.
diff --git a/.github/workflows/release.yaml b/.github/workflows/release.yaml
@@ -154,6 +154,8 @@ jobs:
           version: ${{ needs.prepare1.outputs.version }}
         run: |
           go mod tidy
+          git diff
+          git add go.mod go.sum
           git commit --allow-empty -m "Bump version to ${version}"
           git tag "${version}"
           git push origin "${version}"
@@ -261,6 +263,7 @@ jobs:
           go mod edit -dropreplace=github.com/genjidb/genji
           go mod edit -require=github.com/genjidb/genji@"${version}"
           go mod tidy
+          git diff
           git add go.mod go.sum
           git commit --allow-empty -m "Bump version to ${version}"
           git tag engine/badgerengine/"${version}"
@@ -302,13 +305,12 @@ jobs:
         env:
           version: ${{ needs.prepare1.outputs.version }}
         run: |
-          go mod edit \
-            -dropreplace=github.com/genjidb/genji \
-            -dropreplace=github.com/genjidb/genji/engine/badgerengine
-          go mod edit \
-            -require=github.com/genjidb/genji@"${version}" \
-            -require=github.com/genjidb/genji/engine/badgerengine@"${version}"
+          go mod edit -dropreplace=github.com/genjidb/genji
+          go mod edit -dropreplace=github.com/genjidb/genji/engine/badgerengine
+          go mod edit -require=github.com/genjidb/genji@"${version}"
+          go mod edit -require=github.com/genjidb/genji/engine/badgerengine@"${version}"
           go mod tidy
+          git diff
           git add go.mod go.sum
           git commit --allow-empty -m "Bump version to ${version}"
           git tag cmd/genji/"${version}"
@@ -396,18 +398,21 @@ jobs:
       - name: Add replace directives
         run: |
           go mod tidy
+          git diff
           git add go.mod go.sum
           (
             cd engine/badgerengine
             go mod edit -replace=github.com/genjidb/genji=../../ 
             go mod tidy
+            git diff
             git add go.mod go.sum
           )
           (
             cd cmd/genji
             go mod edit -replace=github.com/genjidb/genji=../../
             go mod edit -replace=github.com/genjidb/genji/engine/badgerengine=../../engine/badgerengine/
             go mod tidy
+            git diff
             git add go.mod go.sum
           )
           git commit --allow-empty -m 'Add replace directives [skip ci]'

diff --git a/cmd/genji/go.mod b/cmd/genji/go.mod
@@ -17,5 +17,5 @@ require (
 
 replace (
 	github.com/genjidb/genji => ../../
-	github.com/genjidb/genji/engine/badgerengine => ../../engine/badgerengine
+	github.com/genjidb/genji/engine/badgerengine => ../../engine/badgerengine/
 )