From 6503fbab6f67c50690a321d8167ff4a6e5262c9d Mon Sep 17 00:00:00 2001 From: Adam Byczkowski <38091261+qduk@users.noreply.github.com> Date: Thu, 8 Jun 2023 16:01:36 -0500 Subject: [PATCH 1/2] Add -f to flatbot branch pushes --- .github/workflows/oui_filepull.yml | 2 +- .github/workflows/proto_filepull.yml | 2 +- 2 files changed, 2 insertions(+), 2 deletions(-) diff --git a/.github/workflows/oui_filepull.yml b/.github/workflows/oui_filepull.yml index 6d178e08..65ded7ca 100644 --- a/.github/workflows/oui_filepull.yml +++ b/.github/workflows/oui_filepull.yml @@ -24,7 +24,7 @@ jobs: run: "git checkout -b $BRANCH_NAME" # Push new branch so Flatbot can make its commit - name: "Push Flatbot branch" - run: "git push --set-upstream origin $BRANCH_NAME" + run: "git push -f --set-upstream origin $BRANCH_NAME" # This step installs Deno, which is a new Javascript runtime that improves on Node. Can be used for an optional postprocessing step - name: "Setup deno" uses: "denoland/setup-deno@main" diff --git a/.github/workflows/proto_filepull.yml b/.github/workflows/proto_filepull.yml index 4611e14e..d332ace7 100644 --- a/.github/workflows/proto_filepull.yml +++ b/.github/workflows/proto_filepull.yml @@ -24,7 +24,7 @@ jobs: run: "git checkout -b $BRANCH_NAME" # Push new branch so Flatbot can make its commit - name: "Push Flatbot branch" - run: "git push --set-upstream origin $BRANCH_NAME" + run: "git push -f --set-upstream origin $BRANCH_NAME" # Install Black - name: "Install Python Black" run: "pip install black" From c2e1a45fa91e2bcde0fb0e112347f3e7017971d5 Mon Sep 17 00:00:00 2001 From: Adam Byczkowski <38091261+qduk@users.noreply.github.com> Date: Thu, 8 Jun 2023 16:17:15 -0500 Subject: [PATCH 2/2] Added spaces to workflow files --- .github/workflows/oui_filepull.yml | 2 +- .github/workflows/proto_filepull.yml | 2 +- 2 files changed, 2 insertions(+), 2 deletions(-) diff --git a/.github/workflows/oui_filepull.yml b/.github/workflows/oui_filepull.yml index 65ded7ca..ab396a64 100644 --- a/.github/workflows/oui_filepull.yml +++ b/.github/workflows/oui_filepull.yml @@ -1,7 +1,7 @@ --- name: "OUI-Updates" -on: # yamllint disable-line rule:truthy +on: # yamllint disable-line rule:truthy schedule: - cron: "0 8 * * 4" diff --git a/.github/workflows/proto_filepull.yml b/.github/workflows/proto_filepull.yml index d332ace7..bf02c00c 100644 --- a/.github/workflows/proto_filepull.yml +++ b/.github/workflows/proto_filepull.yml @@ -1,7 +1,7 @@ --- name: "Protocol-Updates" -on: # yamllint disable-line rule:truthy +on: # yamllint disable-line rule:truthy schedule: - cron: "0 8 * * 4"