fix(ci): autostash for pre-push hook in build workflow

Decathlon · Dec 14, 2021 · 3a5c4c4 · 3a5c4c4
1 parent bd7f2bb
commit 3a5c4c4
Show file tree

Hide file tree

Showing 5 changed files with 5 additions and 3 deletions.
diff --git a/.github/cr-candidate-config.yaml b/.github/cr-candidate-config.yaml
@@ -1 +1,2 @@
 release-notes-file: charts/candidate/CHANGELOG.md
+release-name-template: "{{ .Name }}-v{{ .Version }}"
diff --git a/.github/cr-stable-config.yaml b/.github/cr-stable-config.yaml
@@ -1 +1,2 @@
 release-notes-file: charts/stable/CHANGELOG.md
+release-name-template: "{{ .Name }}-v{{ .Version }}"
diff --git a/.github/workflows/build-api.yaml b/.github/workflows/build-api.yaml
@@ -76,7 +76,7 @@ jobs:
         run: |
           cat << EOF > .git/hooks/pre-push
           #!/bin/bash
-          git pull --rebase
+          git pull --rebase --autostash
           EOF
           chmod +x .git/hooks/pre-push
 

diff --git a/.github/workflows/build-web-ui.yaml b/.github/workflows/build-web-ui.yaml
@@ -58,7 +58,7 @@ jobs:
         run: |
           cat << EOF > .git/hooks/pre-push
           #!/bin/bash
-          git pull --rebase
+          git pull --rebase --autostash
           EOF
           chmod +x .git/hooks/pre-push
 

diff --git a/.github/workflows/charts-release.yaml b/.github/workflows/charts-release.yaml
@@ -39,7 +39,7 @@ jobs:
         run: |
           cat << EOF > .git/hooks/pre-push
           #!/bin/bash
-          git pull --rebase
+          git pull --rebase --autostash
           EOF
           chmod +x .git/hooks/pre-push
       - name: Semantic Release
Original file line number	Diff line number	Diff line change
		@@ -1 +1,2 @@
		release-notes-file: charts/candidate/CHANGELOG.md
		release-name-template: "{{ .Name }}-v{{ .Version }}"
Original file line number	Diff line number	Diff line change
		@@ -1 +1,2 @@
		release-notes-file: charts/stable/CHANGELOG.md
		release-name-template: "{{ .Name }}-v{{ .Version }}"