Skip to content

Commit

Permalink
Merge branch 'develop' into patch-1
Browse files Browse the repository at this point in the history
  • Loading branch information
tuntoja authored Sep 11, 2024
2 parents 65e4fb9 + 98dd572 commit f0e0a71
Show file tree
Hide file tree
Showing 2 changed files with 20 additions and 1 deletion.
16 changes: 15 additions & 1 deletion .github/workflows/dsm.yml
Original file line number Diff line number Diff line change
Expand Up @@ -31,12 +31,26 @@ env:
module: dsm

jobs:

validation:
runs-on: ubuntu-22.04
outputs:
environment_pull_request: ${{ steps.validate.outputs.environment_pull_request }}
steps:
- name: validate
id: validate
run: |
ENVIRONMENT_PULL_REQUEST="internal_contributor"
if [[ "${{ github.event.pull_request.author_association }}" != "MEMBER" || "${{ github.event.pull_request.author_association }}" != "CONTRIBUTOR" || "${{ github.event.pull_request.author_association }}" != "OWNER" ]]; then
ENVIRONMENT_PULL_REQUEST="external_contributor"
fi
echo "environment_pull_request=$ENVIRONMENT_PULL_REQUEST" >> $GITHUB_OUTPUT
shell: bash

get-version:
uses: ./.github/workflows/get-version.yml
with:
version_file: centreon-dsm/www/modules/centreon-dsm/conf.php
environment_pull_request: ${{ needs.validate.outputs.environment_pull_request }}

veracode-analysis:
needs: [get-version]
Expand Down
5 changes: 5 additions & 0 deletions .github/workflows/get-version.yml
Original file line number Diff line number Diff line change
Expand Up @@ -4,6 +4,10 @@ on:
version_file:
required: true
type: string
environment_pull_request:
description: "environment for pull request runs"
required: true
type: string
outputs:
major_version:
description: "major version"
Expand All @@ -30,6 +34,7 @@ on:
description: "context of release (cloud or not cloud)"
value: ${{ jobs.get-version.outputs.release_cloud }}


jobs:
get-version:
runs-on: ubuntu-22.04
Expand Down

0 comments on commit f0e0a71

Please sign in to comment.