From 621098bb59cf8889621a07c9a567266e6af734e2 Mon Sep 17 00:00:00 2001
From: Semyon Levin <231188+remal@users.noreply.github.com>
Date: Mon, 25 Nov 2024 18:47:24 -0800
Subject: [PATCH] Template repository changes: remal/oss-template (#411)

Co-authored-by: remal-gradle-plugins <77341723+remal-gradle-plugins+sync-with-template@users.noreply.github.com>
---
 .github/workflows/bump-repository-activity.yml        | 6 ++++--
 .github/workflows/check-action-secrets.yml            | 6 ++++--
 .github/workflows/codeowners-validator.yml            | 6 ++++--
 .github/workflows/rebase-dependabot-pull-requests.yml | 6 ++++--
 .github/workflows/sync-with-template.yml              | 6 ++++--
 5 files changed, 20 insertions(+), 10 deletions(-)

diff --git a/.github/workflows/bump-repository-activity.yml b/.github/workflows/bump-repository-activity.yml
index adf0fd1..9369d3f 100644
--- a/.github/workflows/bump-repository-activity.yml
+++ b/.github/workflows/bump-repository-activity.yml
@@ -38,12 +38,14 @@ jobs:
           echo "::warning::Not enough rate limits!"
           if [ "${{github.event_name != 'schedule'}}" == "true" ]; then
             echo "::warning::Executing anyway, as event is '${{github.event_name}}'"
+            echo 'enough=true' >> $GITHUB_OUTPUT
+          else
+            echo 'enough=false' >> $GITHUB_OUTPUT
           fi
-          echo 'enough=false' >> $GITHUB_OUTPUT
         fi
 
     - name: Bump repository activity
-      if: ${{env.PUSH_BACK_TOKEN && (github.event_name != 'schedule' || fromJSON(steps.decision.outputs.enough) == true)}}
+      if: ${{env.PUSH_BACK_TOKEN && fromJSON(steps.decision.outputs.enough) == true}}
       uses: remal-github-actions/bump-repository-activity@v1
       with:
         githubToken: ${{env.PUSH_BACK_TOKEN}}
diff --git a/.github/workflows/check-action-secrets.yml b/.github/workflows/check-action-secrets.yml
index d3315ed..61f9456 100644
--- a/.github/workflows/check-action-secrets.yml
+++ b/.github/workflows/check-action-secrets.yml
@@ -40,12 +40,14 @@ jobs:
           echo "::warning::Not enough rate limits!"
           if [ "${{github.event_name != 'schedule'}}" == "true" ]; then
             echo "::warning::Executing anyway, as event is '${{github.event_name}}'"
+            echo 'enough=true' >> $GITHUB_OUTPUT
+          else
+            echo 'enough=false' >> $GITHUB_OUTPUT
           fi
-          echo 'enough=false' >> $GITHUB_OUTPUT
         fi
 
     - name: Check action secrets
-      if: ${{github.event_name != 'schedule' || fromJSON(steps.decision.outputs.enough) == true}}
+      if: ${{fromJSON(steps.decision.outputs.enough) == true}}
       uses: remal-github-actions/check-action-secrets@v1
       with:
         githubToken: ${{secrets.LIST_SECRETS}}
diff --git a/.github/workflows/codeowners-validator.yml b/.github/workflows/codeowners-validator.yml
index 022ac67..dedb1e7 100644
--- a/.github/workflows/codeowners-validator.yml
+++ b/.github/workflows/codeowners-validator.yml
@@ -44,8 +44,10 @@ jobs:
           echo "::warning::Not enough rate limits!"
           if [ "${{github.event_name != 'schedule'}}" == "true" ]; then
             echo "::warning::Executing anyway, as event is '${{github.event_name}}'"
+            echo 'enough=true' >> $GITHUB_OUTPUT
+          else
+            echo 'enough=false' >> $GITHUB_OUTPUT
           fi
-          echo 'enough=false' >> $GITHUB_OUTPUT
         fi
     outputs:
       enough: ${{steps.decision.outputs.enough}}
@@ -53,7 +55,7 @@ jobs:
   codeowners-validation:
     needs:
     - rate-limits
-    if: ${{github.event_name != 'schedule' || fromJSON(needs.rate-limits.outputs.enough) == true}}
+    if: ${{fromJSON(needs.rate-limits.outputs.enough) == true}}
     runs-on: ubuntu-latest
     timeout-minutes: 15
     concurrency:
diff --git a/.github/workflows/rebase-dependabot-pull-requests.yml b/.github/workflows/rebase-dependabot-pull-requests.yml
index 3b7d0d7..a0253c1 100644
--- a/.github/workflows/rebase-dependabot-pull-requests.yml
+++ b/.github/workflows/rebase-dependabot-pull-requests.yml
@@ -43,12 +43,14 @@ jobs:
           echo "::warning::Not enough rate limits!"
           if [ "${{github.event_name != 'schedule'}}" == "true" ]; then
             echo "::warning::Executing anyway, as event is '${{github.event_name}}'"
+            echo 'enough=true' >> $GITHUB_OUTPUT
+          else
+            echo 'enough=false' >> $GITHUB_OUTPUT
           fi
-          echo 'enough=false' >> $GITHUB_OUTPUT
         fi
 
     - name: Rebase Dependabot pull requests
-      if: ${{github.event_name != 'schedule' || fromJSON(steps.decision.outputs.enough) == true}}
+      if: ${{fromJSON(steps.decision.outputs.enough) == true}}
       uses: remal-github-actions/rebase-dependabot-pull-requests@v1
       with:
         githubToken: ${{env.PUSH_BACK_TOKEN}}
diff --git a/.github/workflows/sync-with-template.yml b/.github/workflows/sync-with-template.yml
index a0851f7..f37ec69 100644
--- a/.github/workflows/sync-with-template.yml
+++ b/.github/workflows/sync-with-template.yml
@@ -45,12 +45,14 @@ jobs:
           echo "::warning::Not enough rate limits!"
           if [ "${{github.event_name != 'schedule'}}" == "true" ]; then
             echo "::warning::Executing anyway, as event is '${{github.event_name}}'"
+            echo 'enough=true' >> $GITHUB_OUTPUT
+          else
+            echo 'enough=false' >> $GITHUB_OUTPUT
           fi
-          echo 'enough=false' >> $GITHUB_OUTPUT
         fi
 
     - name: Sync with template repository
-      if: ${{env.PUSH_BACK_TOKEN && (github.event_name != 'schedule' || fromJSON(steps.decision.outputs.enough) == true)}}
+      if: ${{env.PUSH_BACK_TOKEN && fromJSON(steps.decision.outputs.enough) == true}}
       uses: remal-github-actions/sync-with-template@v3
       with:
         githubToken: ${{env.PUSH_BACK_TOKEN}}