Skip to content

Update GitHub action #400

New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Merged
merged 2 commits into from
May 29, 2025
Merged
Show file tree
Hide file tree
Changes from all commits
Commits
File filter

Filter by extension

Filter by extension


Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
15 changes: 9 additions & 6 deletions .github/workflows/auto-merge-on-demand.yml
Original file line number Diff line number Diff line change
@@ -1,8 +1,8 @@
name: Auto Merge Scheduled / On Demand
name: Auto Merge On Demand
on:
schedule:
# Workflow runs every 45 minutes
- cron: '*/45 * * * *'
issue_comment:
types:
- created
workflow_dispatch:
inputs:
pr-number:
Expand All @@ -16,7 +16,10 @@ permissions:
jobs:
# Get all open PRs
gather-pull-requests:
if: github.repository_owner == 'sclorg'
if: |
github.repository_owner == 'sclorg'
|| (contains(github.event.comment.body, '/auto-merge')
&& contains(fromJson('["OWNER", "MEMBER"]'), github.event.comment.author_association))
runs-on: ubuntu-latest

outputs:
Expand Down Expand Up @@ -44,7 +47,7 @@ jobs:
name: Parse manual input
run: |
# shellcheck disable=SC2086
echo "result="[ ${{ inputs.pr-number }} ]"" >> $GITHUB_OUTPUT
echo "result="[ ${{ github.event.issue.number }} ]"" >> $GITHUB_OUTPUT
shell: bash

validate-pr:
Expand Down
2 changes: 1 addition & 1 deletion .github/workflows/openshift-pytests.yml
Original file line number Diff line number Diff line change
Expand Up @@ -27,7 +27,7 @@ jobs:
strategy:
fail-fast: false
matrix:
version: [ "8.0" ]
version: [ "8.0", "8.4" ]
os_test: [ "rhel8", "rhel9", "rhel10" ]
test_case: [ "openshift-pytest" ]

Expand Down
2 changes: 1 addition & 1 deletion .github/workflows/openshift-tests.yml
Original file line number Diff line number Diff line change
Expand Up @@ -27,7 +27,7 @@ jobs:
strategy:
fail-fast: false
matrix:
version: [ "8.0" ]
version: [ "8.0", "8.4" ]
os_test: [ "rhel8", "rhel9", "rhel10" ]
test_case: [ "openshift-4" ]

Expand Down