T6349: updated pr-labels workflow permission and updated reusable wor…

…kflow version for all
vyos · May 18, 2024 · fd3fb3f · fd3fb3f
1 parent 9a58976
commit fd3fb3f
Show file tree

Hide file tree

Showing 9 changed files with 39 additions and 0 deletions.
diff --git a/.github/workflows/add-pr-labels.yml b/.github/workflows/add-pr-labels.yml
@@ -9,7 +9,14 @@ on:
       - equuleus
       - sagitta
 
+permissions:
+  pull-requests: write
+
 jobs:
   add-pr-label:
+<<<<<<< HEAD
+    uses: vyos/.github/.github/workflows/add-pr-labels.yml@main
+=======
     uses: vyos/.github/.github/workflows/add-pr-labels.yml@feature/T6349-reusable-workflows
+>>>>>>> 9a5897682a6d7fb59e2e90eb50b87dbbe8babaea
     secrets: inherit
diff --git a/.github/workflows/auto-author-assign.yml b/.github/workflows/auto-author-assign.yml
@@ -8,5 +8,9 @@ permissions:
 
 jobs:
   assign-author:
+<<<<<<< HEAD
+    uses: vyos/.github/.github/workflows/assign-author.yml@main
+=======
     uses: vyos/.github/.github/workflows/assign-author.yml@feature/T6349-reusable-workflows
+>>>>>>> 9a5897682a6d7fb59e2e90eb50b87dbbe8babaea
     secrets: inherit
diff --git a/.github/workflows/chceck-pr-message.yml b/.github/workflows/chceck-pr-message.yml
@@ -10,5 +10,9 @@ on:
 
 jobs:
   check-pr-title:
+<<<<<<< HEAD
+    uses: vyos/.github/.github/workflows/check-pr-message.yml@main
+=======
     uses: vyos/.github/.github/workflows/check-pr-message.yml@feature/T6349-reusable-workflows
+>>>>>>> 9a5897682a6d7fb59e2e90eb50b87dbbe8babaea
     secrets: inherit
diff --git a/.github/workflows/check-pr-conflicts.yml b/.github/workflows/check-pr-conflicts.yml
@@ -9,5 +9,9 @@ permissions:
 
 jobs:
   check-pr-conflict-call:
+<<<<<<< HEAD
+    uses: vyos/.github/.github/workflows/check-pr-merge-conflict.yml@main
+=======
     uses: vyos/.github/.github/workflows/check-pr-merge-conflict.yml@feature/T6349-reusable-workflows
+>>>>>>> 9a5897682a6d7fb59e2e90eb50b87dbbe8babaea
     secrets: inherit
diff --git a/.github/workflows/check-stale.yml b/.github/workflows/check-stale.yml
@@ -5,5 +5,9 @@ on:
 
 jobs:
   stale:
+<<<<<<< HEAD
+    uses: vyos/.github/.github/workflows/check-stale.yml@main
+=======
     uses: vyos/.github/.github/workflows/check-stale.yml@feature/T6349-reusable-workflows
+>>>>>>> 9a5897682a6d7fb59e2e90eb50b87dbbe8babaea
     secrets: inherit
diff --git a/.github/workflows/check-unused-imports.yml b/.github/workflows/check-unused-imports.yml
@@ -7,5 +7,9 @@ on:
 
 jobs:
   Check-Unused-Imports:
+<<<<<<< HEAD
+    uses: vyos/.github/.github/workflows/check-unused-imports.yml@main
+=======
     uses: vyos/.github/.github/workflows/check-unused-imports.yml@feature/T6349-reusable-workflows
+>>>>>>> 9a5897682a6d7fb59e2e90eb50b87dbbe8babaea
     secrets: inherit
diff --git a/.github/workflows/codeql.yml b/.github/workflows/codeql.yml
@@ -16,7 +16,11 @@ permissions:
 
 jobs:
   codeql-analysis-call:
+<<<<<<< HEAD
+    uses: vyos/.github/.github/workflows/codeql-analysis.yml@main
+=======
     uses: vyos/.github/.github/workflows/codeql-analysis.yml@feature/T6349-reusable-workflows
+>>>>>>> 9a5897682a6d7fb59e2e90eb50b87dbbe8babaea
     secrets: inherit
     with:
       languages: "['python']"
diff --git a/.github/workflows/label-backport.yml b/.github/workflows/label-backport.yml
@@ -4,5 +4,9 @@ on: [issue_comment]
 
 jobs:
   mergifyio_backport:
+<<<<<<< HEAD
+    uses: vyos/.github/.github/workflows/label-backport.yml@main
+=======
     uses: vyos/.github/.github/workflows/label-backport.yml@feature/T6349-reusable-workflows
+>>>>>>> 9a5897682a6d7fb59e2e90eb50b87dbbe8babaea
     secrets: inherit
diff --git a/.github/workflows/linit-j2.yml b/.github/workflows/linit-j2.yml
@@ -10,5 +10,9 @@ on:
 
 jobs:
   j2lint:
+<<<<<<< HEAD
+    uses: vyos/.github/.github/workflows/lint-j2.yml@main
+=======
     uses: vyos/.github/.github/workflows/lint-j2.yml@feature/T6349-reusable-workflows
+>>>>>>> 9a5897682a6d7fb59e2e90eb50b87dbbe8babaea
     secrets: inherit