Merge pull request mercedes-benz#3435 from mercedes-benz/gha_feature-…

…3357-fix-wrong-if-condition-in-pipeline fix if statement in github-action-scan.yml & gradle.yml
de-jcup · Sep 19, 2024 · d35616d · d35616d
2 parents 633b312 + c1c4a22
commit d35616d
Show file tree

Hide file tree

Showing 2 changed files with 4 additions and 4 deletions.
diff --git a/.github/workflows/github-action-scan.yml b/.github/workflows/github-action-scan.yml
@@ -22,8 +22,8 @@ jobs:
   build-scan:
     # This job is only executed if the branch name starts with 'gha_feature-' or 'dependabot/'
     # or equals 'main', 'master', 'develop' 'hotfix'
-    if: "startsWith(github.head_ref, 'gha_feature-') || startsWith(github.head_ref, 'dependabot/') || 
-         github.head_ref == 'main' || github.head_ref == 'master' || github.head_ref == 'develop' || github.head_ref == 'hotfix'"
+    if: ${{ startsWith(github.head_ref, 'gha_feature-') || startsWith(github.head_ref, 'dependabot/') ||
+      github.head_ref == 'main' || github.head_ref == 'master' || github.head_ref == 'develop' || github.head_ref == 'hotfix' }}
     runs-on: ubuntu-latest
     # Let's set the scan action folder as the working directory for all "run" steps:
 

diff --git a/.github/workflows/gradle.yml b/.github/workflows/gradle.yml
@@ -28,8 +28,8 @@ jobs:
   build:
     # This job is only executed if the branch name starts with 'feature-' or 'dependabot/'
     # or equals 'main', 'master', 'develop' 'hotfix'
-    if: "startsWith(github.head_ref, 'feature-') || startsWith(github.head_ref, 'dependabot/') || 
-         github.head_ref == 'main' || github.head_ref == 'master' || github.head_ref == 'develop' || github.head_ref == 'hotfix'"
+    if: ${{ startsWith(github.head_ref, 'feature-') || startsWith(github.head_ref, 'dependabot/') || 
+         github.head_ref == 'main' || github.head_ref == 'master' || github.head_ref == 'develop' || github.head_ref == 'hotfix' }}
     runs-on: ubuntu-latest
     steps:
       - uses: actions/checkout@692973e3d937129bcbf40652eb9f2f61becf3332