root
/
rabbitmq-server
mirror of https://github.com/rabbitmq/rabbitmq-server.git
1
0
Fork 0
Code Issues Actions Packages Projects Releases Wiki Activity

Resolve a conflict #13890 #13891

This commit is contained in:
Michael Klishin 2025-05-13 21:08:25 -04:00
parent 82f7c4abc4
commit 224a5785c9
No known key found for this signature in database
GPG Key ID: 16AB14D00D613900
1 changed files with 0 additions and 10 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

10
.github/workflows/oci-make.yaml vendored
View File

@ -5,15 +5,6 @@
# #
name: OCI (make) name: OCI (make)
on: on:
<<<<<<< HEAD
push:
paths-ignore:
- '.github/workflows/secondary-umbrella.yaml'
- '.github/workflows/update-elixir-patches.yaml'
- '.github/workflows/update-otp-patches.yaml'
- '.github/workflows/release-alphas.yaml'
- '*.md'
=======
pull_request: pull_request:
paths: paths:
- deps/** - deps/**
@ -23,7 +14,6 @@ on:
- rabbitmq-components.mk - rabbitmq-components.mk
- packaging/** - packaging/**
- .github/workflows/oci-make.yaml - .github/workflows/oci-make.yaml
>>>>>>> 4efb3df39 (CI: tweak OCI build triggers)
workflow_dispatch: workflow_dispatch:
inputs: inputs:
otp_version: otp_version: