From 87ad2ef97e263a5936c61c46fc8769a0e2b66c71 Mon Sep 17 00:00:00 2001 From: lowlighter <22963968+lowlighter@users.noreply.github.com> Date: Tue, 18 Jan 2022 17:48:00 -0500 Subject: [PATCH] ci: squash examples branch --- .github/scripts/files/examples.yml | 6 ++++-- .github/workflows/examples.yml | 6 ++++-- 2 files changed, 8 insertions(+), 4 deletions(-) diff --git a/.github/scripts/files/examples.yml b/.github/scripts/files/examples.yml index 834e4145..340e9e9e 100644 --- a/.github/scripts/files/examples.yml +++ b/.github/scripts/files/examples.yml @@ -48,13 +48,15 @@ jobs: if: ${{ success() || failure() }} run: | set +e + rm -rf /metrics_renders/metrics.markdown.* sudo mv /metrics_renders/* ./ git config user.name github-actions[bot] git config user.email 41898282+github-actions[bot]@users.noreply.github.com git pull + git reset --soft c8d364ee752ad090945b7e104873d24d011b521e git add --all git commit -m "chore: update examples" - git push + git push --force # ====================================================================================== # Special job used to render lowlighter/metrics repository assets @@ -130,4 +132,4 @@ jobs: git pull git add --all git commit -m "chore: update examples" - git push + git push --force diff --git a/.github/workflows/examples.yml b/.github/workflows/examples.yml index 7ec6eb53..da09dd12 100644 --- a/.github/workflows/examples.yml +++ b/.github/workflows/examples.yml @@ -1141,13 +1141,15 @@ jobs: if: ${{ success() || failure() }} run: | set +e + rm -rf /metrics_renders/metrics.markdown.* sudo mv /metrics_renders/* ./ git config user.name github-actions[bot] git config user.email 41898282+github-actions[bot]@users.noreply.github.com git pull + git reset --soft c8d364ee752ad090945b7e104873d24d011b521e git add --all git commit -m "chore: update examples" - git push + git push --force # ====================================================================================== # Special job used to render lowlighter/metrics repository assets @@ -1223,4 +1225,4 @@ jobs: git pull git add --all git commit -m "chore: update examples" - git push + git push --force