Author: dsahlberg
Date: Sat Mar 1 10:56:45 2025
New Revision: 1924106
URL: http://svn.apache.org/viewvc?rev=1924106&view=rev
Log:
Add a workflow to detect backport conflicts (replacing a previous job
in Buildbot (https://ci2.apache.org).
* .github/workflows/detect-backport-conflicts.yml
(): New file
Added:
subversion/trunk/.github/workflows/detect-backport-conflicts.yml (with
props)
Added: subversion/trunk/.github/workflows/detect-backport-conflicts.yml
URL:
http://svn.apache.org/viewvc/subversion/trunk/.github/workflows/detect-backport-conflicts.yml?rev=1924106&view=auto
==============================================================================
--- subversion/trunk/.github/workflows/detect-backport-conflicts.yml (added)
+++ subversion/trunk/.github/workflows/detect-backport-conflicts.yml Sat Mar 1
10:56:45 2025
@@ -0,0 +1,49 @@
+#
+# Licensed to the Apache Software Foundation (ASF) under one
+# or more contributor license agreements. See the NOTICE file
+# distributed with this work for additional information
+# regarding copyright ownership. The ASF licenses this file
+# to you under the Apache License, Version 2.0 (the
+# "License"); you may not use this file except in compliance
+# with the License. You may obtain a copy of the License at
+#
+# http://www.apache.org/licenses/LICENSE-2.0
+#
+# Unless required by applicable law or agreed to in writing,
+# software distributed under the License is distributed on an
+# "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY
+# KIND, either express or implied. See the License for the
+# specific language governing permissions and limitations
+# under the License.
+#
+# autoconf.yml -- Configuration for autoconf GitHub Action workflow.
+#
+
+name: backportbot
+
+on:
+ push:
+ branches: ["1.14.x"]
+ pull_request:
+ branches: ["1.14.x"]
+
+concurrency:
+ group: ${{ github.workflow }}-${{ github.ref }}
+ cancel-in-progress: false
+
+jobs:
+ conflicts:
+ runs-on: ubuntu-latest
+ name: Detect conflicts
+
+ steps:
+ - name: Use LF for Git checkout
+ run: |
+ git config --global core.autocrlf false
+ git config --global core.eol lf
+
+ - uses: actions/checkout@v4
+
+ - name: Detect conflicting backports
+ run: ./tools/dist/detect-conflicting-backports.py
+
Propchange: subversion/trunk/.github/workflows/detect-backport-conflicts.yml
------------------------------------------------------------------------------
svn:eol-style = native
