Skip to content

Commit

Permalink
MON-111639 Sync Centreon next 23.04 (#1463)
Browse files Browse the repository at this point in the history
  • Loading branch information
pkippes authored Jun 20, 2024
2 parents 33b2e84 + 8c10e68 commit 4440001
Show file tree
Hide file tree
Showing 3 changed files with 12 additions and 7 deletions.
15 changes: 10 additions & 5 deletions .github/actions/release/action.yml
Original file line number Diff line number Diff line change
Expand Up @@ -39,6 +39,10 @@ runs:
SCOPE_VERSION="COLLECT"
MINOR_VERSION_FILE_PATH=".version"
RELEASE_CLOUD=0
RELEASE_CLOUD=0 # (0 = not a release cloud, 1 = release cloud)
MAJOR_VERSION=""
MINOR_VERSION=""
CURRENT_STABLE_BRANCH_MAJOR_VERSION=""
# Get current stable branch name
# If MASTER, use root .version
Expand Down Expand Up @@ -138,9 +142,9 @@ runs:
fi
# Rebuild NEW_STABLE_TAGS as an array
for i in ${NEW_STABLE_TAGS[@]}; do
NEW_RELEASE_TAGS+=("$i")
done
# for i in ${NEW_STABLE_TAGS[@]}; do
# NEW_RELEASE_TAGS+=("$i")
# done
# Create GITHUB release for each release components
# Abort if no tags
Expand Down Expand Up @@ -182,6 +186,7 @@ runs:
JIRA_RELEASE_NAME=""
JIRA_PROJECT_ID="${{ inputs.jira_project_id }}"
JIRA_RELEASE_RELEASED="false"
JIRA_RELEASE_ID="$(git log |grep -E "^\s+Centreon.*#[0-9]{5,}#)" |grep -Eo "([0-9]{5,})" |head -n 1)"
# Create JIRA version for each released component
echo "Creating JIRA releases."
Expand All @@ -191,7 +196,7 @@ runs:
# Build JSON with release information for JIRA API
JIRA_RELEASE_DATA=$(jq -nc \
--arg archived "$JIRA_RELEASE_ARCHIVED" \
--arg description "$TAG" \
--arg description "$JIRA_RELEASE_ID $TAG" \
--arg releaseDate "$JIRA_RELEASE_DATE" \
--arg name "$TAG" \
--arg projectId "$JIRA_PROJECT_ID" \
Expand All @@ -200,7 +205,7 @@ runs:
# Send to JIRA API release
echo "Sending to JIRA API release: $JIRA_RELEASE_DATA"
curl --fail --request POST \
--url 'https://${{ inputs.jira_base_url }}/rest/api/3/version' \
--url "${{ inputs.jira_base_url }}/rest/api/3/version" \
--user '${{ inputs.jira_user_email }}:${{ inputs.jira_api_token }}' \
--header 'Accept: application/json' \
--header 'Content-Type: application/json' \
Expand Down
2 changes: 1 addition & 1 deletion .version
Original file line number Diff line number Diff line change
@@ -1,2 +1,2 @@
MAJOR=23.04
MINOR=12
MINOR=13
2 changes: 1 addition & 1 deletion CMakeLists.txt
Original file line number Diff line number Diff line change
Expand Up @@ -116,7 +116,7 @@ endif()
# Version.
set(COLLECT_MAJOR 23)
set(COLLECT_MINOR 04)
set(COLLECT_PATCH 12)
set(COLLECT_PATCH 13)
set(COLLECT_VERSION "${COLLECT_MAJOR}.${COLLECT_MINOR}.${COLLECT_PATCH}")
add_definitions(-DCENTREON_CONNECTOR_VERSION=\"${COLLECT_VERSION}\")

Expand Down

0 comments on commit 4440001

Please sign in to comment.