Skip to content

Commit

Permalink
Merge branch 'develop' into bump-collect-25.01
Browse files Browse the repository at this point in the history
  • Loading branch information
pkippes authored Jan 8, 2025
2 parents 3806680 + 980788e commit 87c516e
Show file tree
Hide file tree
Showing 2 changed files with 9 additions and 5 deletions.
3 changes: 0 additions & 3 deletions .github/actions/package/action.yml
Original file line number Diff line number Diff line change
Expand Up @@ -40,7 +40,6 @@ inputs:
stability:
description: "branch stability (stable, testing, unstable, canary)"
required: true

runs:
using: composite

Expand Down Expand Up @@ -76,7 +75,6 @@ runs:
MAJOR_LEFT=$( echo $MAJOR_VERSION | cut -d "." -f1 )
MAJOR_RIGHT=$( echo $MAJOR_VERSION | cut -d "-" -f1 | cut -d "." -f2 )
BUMP_MAJOR_RIGHT=$(( MAJOR_RIGHT_PART + 1 ))
if [ "$MAJOR_RIGHT" = "04" ]; then
BUMP_MAJOR_LEFT="$MAJOR_LEFT"
BUMP_MAJOR_RIGHT="10"
Expand Down Expand Up @@ -111,7 +109,6 @@ runs:
path: ./*.${{ inputs.package_extension }}
key: ${{ inputs.cache_key }}

# Update if condition to true to get packages as artifacts
- if: ${{ contains(github.event.pull_request.labels.*.name, 'upload-artifacts') }}
name: Upload package artifacts
uses: actions/upload-artifact@b4b15b8c7c6ac21ea08fcf65892d2ee8f75cf882 # v4.4.3
Expand Down
11 changes: 9 additions & 2 deletions .github/workflows/gorgone.yml
Original file line number Diff line number Diff line change
Expand Up @@ -6,6 +6,12 @@ concurrency:

on:
workflow_dispatch:
inputs:
unit_tests:
description: 'Execute the unit tests'
required: true
default: true
type: boolean
pull_request:
types:
- opened
Expand Down Expand Up @@ -62,6 +68,7 @@ jobs:
unit-test-perl:
needs: [get-environment]
if: |
github.event.inputs.unit_tests == 'true' &&
needs.get-environment.outputs.skip_workflow == 'false' &&
needs.get-environment.outputs.stability != 'stable'
strategy:
Expand Down Expand Up @@ -319,7 +326,7 @@ jobs:

deliver-rpm:
runs-on: [self-hosted, common]
needs: [get-environment, package]
needs: [get-environment, unit-test-perl, robot-test-gorgone]
if: |
needs.get-environment.outputs.skip_workflow == 'false' &&
contains(fromJson('["unstable", "testing"]'), needs.get-environment.outputs.stability) &&
Expand Down Expand Up @@ -349,7 +356,7 @@ jobs:

deliver-deb:
runs-on: [self-hosted, common]
needs: [get-environment, package, robot-test-gorgone, unit-test-perl]
needs: [get-environment, unit-test-perl, robot-test-gorgone]
if: |
needs.get-environment.outputs.skip_workflow == 'false' &&
contains(fromJson('["unstable", "testing"]'), needs.get-environment.outputs.stability) &&
Expand Down

0 comments on commit 87c516e

Please sign in to comment.