[BRE-139] - Revert to Using Push Trigger, Fix bug

bitwarden · Nov 6, 2024 · 774b863 · 774b863
1 parent a595504
commit 774b863
Show file tree

Hide file tree

Showing 8 changed files with 9 additions and 16 deletions.
diff --git a/.github/workflows/cd.yml b/.github/workflows/cd.yml
@@ -1,23 +1,23 @@
 name: CD
 
 on:
-  pull_request:
-    types:
-      - closed
+  push:
     branches:
       - main
     paths:
       - "src/**"
+  workflow_dispatch:
+
 
 jobs:
   version-type:
     name: Get version type
-    if: github.event.pull_request.merged == true
+    if: github.actor != 'bitwarden-devops-bot'
     uses: ./.github/workflows/_version_type.yml
 
   version-bump:
     name: Version bump
-    if: github.event.pull_request.merged == true
+    if: github.actor != 'bitwarden-devops-bot'
     runs-on: ubuntu-22.04
     needs: version-type
     outputs:
@@ -88,7 +88,7 @@ jobs:
 
   release:
     name: GitHub release
-    if: github.event.pull_request.merged == true
+    if: github.actor != 'bitwarden-devops-bot'
     runs-on: ubuntu-22.04
     needs: version-bump
     steps:
@@ -99,14 +99,14 @@ jobs:
         uses: ncipollo/release-action@2c591bcc8ecdcd2db72b97d6147f871fcd833ba5 # v1.14.0
         with:
           commit: ${{ github.sha }}
-          tag: v${{ steps.get-version.outputs.version }}
-          name: v${{ steps.get-version.outputs.version }}
+          tag: v${{ steps.version-bump.outputs.version }}
+          name: v${{ steps.version-bump.outputs.version }}
           token: ${{ secrets.GITHUB_TOKEN }}
           draft: false
 
   deploy:
     name: Deploy workflow-linter (v2)
-    if: github.event.pull_request.merged == true
+    if: github.actor != 'bitwarden-devops-bot'
     runs-on: ubuntu-22.04
     needs: version-bump
     steps:

diff --git a/src/bitwarden_workflow_linter/rules/job_environment_prefix.py b/src/bitwarden_workflow_linter/rules/job_environment_prefix.py
@@ -6,7 +6,6 @@
 from ..rule import Rule
 from ..utils import LintLevels, Settings
 
-
 class RuleJobEnvironmentPrefix(Rule):
     """Rule to enforce specific prefixes for environment variables.
 

diff --git a/src/bitwarden_workflow_linter/rules/name_capitalized.py b/src/bitwarden_workflow_linter/rules/name_capitalized.py
@@ -8,7 +8,6 @@
 from ..rule import Rule
 from ..utils import LintLevels, Settings
 
-
 class RuleNameCapitalized(Rule):
     """Rule to enforce all 'name' values start with a capital letter.
 

diff --git a/src/bitwarden_workflow_linter/rules/name_exists.py b/src/bitwarden_workflow_linter/rules/name_exists.py
@@ -8,7 +8,6 @@
 from ..rule import Rule
 from ..utils import LintLevels, Settings
 
-
 class RuleNameExists(Rule):
     """Rule to enforce a 'name' key exists for every object in GitHub Actions.
 

diff --git a/src/bitwarden_workflow_linter/rules/pinned_job_runner.py b/src/bitwarden_workflow_linter/rules/pinned_job_runner.py
@@ -6,7 +6,6 @@
 from ..rule import Rule
 from ..utils import LintLevels, Settings
 
-
 class RuleJobRunnerVersionPinned(Rule):
     """Rule to enforce pinned Runner OS versions.
 

diff --git a/src/bitwarden_workflow_linter/rules/step_approved.py b/src/bitwarden_workflow_linter/rules/step_approved.py
@@ -6,7 +6,6 @@
 from ..rule import Rule
 from ..utils import LintLevels, Settings
 
-
 class RuleStepUsesApproved(Rule):
     """Rule to enforce that all Actions have been pre-approved.
 

diff --git a/src/bitwarden_workflow_linter/rules/step_pinned.py b/src/bitwarden_workflow_linter/rules/step_pinned.py
@@ -6,7 +6,6 @@
 from ..rule import Rule
 from ..utils import LintLevels, Settings
 
-
 class RuleStepUsesPinned(Rule):
     """Rule to contain the enforcement logic for pinning Actions versions.
 

diff --git a/src/bitwarden_workflow_linter/rules/underscore_outputs.py b/src/bitwarden_workflow_linter/rules/underscore_outputs.py
@@ -8,7 +8,6 @@
 from ..models.step import Step
 from ..utils import LintLevels, Settings
 
-
 class RuleUnderscoreOutputs(Rule):
     """Rule to enforce all GitHub 'outputs' more than one words contain an underscore.