Merge branch 'dev'

rrigato · Aug 3, 2024 · 9d3e85b · 9d3e85b
2 parents bb2a548 + 72bcbb8
commit 9d3e85b
Show file tree

Hide file tree

Showing 3 changed files with 35 additions and 18 deletions.
diff --git a/.github/workflows/rewatch_codeql.yml b/.github/workflows/rewatch_codeql.yml
@@ -7,7 +7,7 @@ on:
     #runs on first day of month
     - cron: '20 16 1 * *'
   workflow_dispatch:
-    
+
 jobs:
   analyze:
     name: Analyze
@@ -43,3 +43,29 @@ jobs:
       uses: github/codeql-action/analyze@v3
       with:
         category: "/language:${{matrix.language}}"
+
+  prevent-script-disable:
+    permissions:
+      contents: write
+      id-token: write
+    needs: analyze
+    runs-on: ubuntu-latest
+    timeout-minutes: 5
+    steps:
+      - name: checkout-current-branch
+        uses: actions/checkout@v4
+        with:
+          fetch-depth: 0
+
+      ##################
+      #Unnecessary orchestration because public workflows are auto
+      #disabled after 60 days
+      #
+      #https://docs.github.com/en/actions/managing-workflow-runs/disabling-and-enabling-a-workflow
+      ##################
+      - name: script-execution-permissions-disable
+        run: chmod +x ${{env.PREVENT_DISABLE_SCRIPT}}
+
+      - name: prevent-disabled-workflow
+        shell: bash
+        run: ${{env.PREVENT_DISABLE_SCRIPT}}
diff --git a/.github/workflows/rewatch_pipeline.yml b/.github/workflows/rewatch_pipeline.yml
@@ -58,16 +58,3 @@ jobs:
           PROJECT_NAME: ${{vars.PROJECT_NAME}}
           REGION_NAME: ${{vars.REGION_NAME}}
         run: 'scripts/invoke_rewatch_handler.sh'
-
-      ##################
-      #Unnecessary orchestration because public workflows are auto
-      #disabled after 60 days
-      #
-      #https://docs.github.com/en/actions/managing-workflow-runs/disabling-and-enabling-a-workflow
-      ##################
-      - name: script-execution-permissions-disable
-        run: chmod +x scripts/prevent_disable.sh
-
-      - name: prevent-disabled-workflow
-        shell: bash
-        run: scripts/prevent_disable.sh
diff --git a/scripts/prevent_disable.sh b/scripts/prevent_disable.sh
@@ -32,12 +32,16 @@ tag_message="prevent_disable - ${tag_without_minor_version}${new_minor_version}"
 echo "tag_message - ${tag_message}"
 
 
+# only add a tag on the 1st day of the month
+if [ $(date +%d) = "03" ]; then
 
-git tag $new_tag -m "$tag_message"
-echo "added unnecessary tag"
+    git tag $new_tag -m "$tag_message"
+    echo "added unnecessary tag"
 
-git push origin $new_tag
-echo "tag addition complete"
+    git push origin $new_tag
+    echo "tag addition complete"
+
+fi
 
 
 git tag