From 20916234bf2866dc0c3b4d46bf9dc847038c595f Mon Sep 17 00:00:00 2001 From: Deniz Cengiz <48965855+dnzxy@users.noreply.github.com> Date: Wed, 23 Aug 2023 20:17:36 +0200 Subject: [PATCH 1/2] Fix broken upstream sync; Remove orphaned environment variable --- .github/workflows/build_loop.yml | 5 ++--- 1 file changed, 2 insertions(+), 3 deletions(-) diff --git a/.github/workflows/build_loop.yml b/.github/workflows/build_loop.yml index fdc86f4e0c..49758a5aca 100644 --- a/.github/workflows/build_loop.yml +++ b/.github/workflows/build_loop.yml @@ -15,7 +15,6 @@ env: UPSTREAM_BRANCH: ${{ github.ref_name }} # branch on upstream repository to sync from (replace with specific branch name if needed) TARGET_BRANCH: ${{ github.ref_name }} # target branch on fork to be kept in sync, and target branch on upstream to be kept alive (replace with specific branch name if needed) ALIVE_BRANCH: alive - WORKFLOW_PERMISSIONS: false jobs: validate: @@ -87,7 +86,7 @@ jobs: # Checks for changes in upstream repository; if changes exist prompts sync for build # Performs keepalive to avoid stale fork check_latest_from_upstream: - needs: check_alive_and_permissions + needs: [validate, check_alive_and_permissions] runs-on: ubuntu-latest name: Check upstream and keep alive outputs: @@ -156,7 +155,7 @@ jobs: # Builds Loop build: name: Build - needs: check_latest_from_upstream + needs: [validate, check_alive_and_permissions, check_latest_from_upstream] runs-on: macos-13 permissions: contents: write From e85a6035a30b3a9745f7687b5a3dece6f9416711 Mon Sep 17 00:00:00 2001 From: Deniz Cengiz <48965855+dnzxy@users.noreply.github.com> Date: Wed, 23 Aug 2023 20:34:15 +0200 Subject: [PATCH 2/2] Fix condition for automated alive branch creation --- .github/workflows/build_loop.yml | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/.github/workflows/build_loop.yml b/.github/workflows/build_loop.yml index 49758a5aca..cf246e1178 100644 --- a/.github/workflows/build_loop.yml +++ b/.github/workflows/build_loop.yml @@ -64,7 +64,7 @@ jobs: fi - name: Create alive branch - if: env.ALIVE_BRANCH_EXISTS != 'true' + if: env.ALIVE_BRANCH_EXISTS == 'false' env: GITHUB_TOKEN: ${{ secrets.GITHUB_TOKEN }} run: |