You are viewing a plain text version of this content. The canonical link for it is here.
Posted to commits@camel.apache.org by or...@apache.org on 2024/01/04 12:27:06 UTC

(camel) branch main updated: (ci): updated to use the branch labeling feature from the new Labeler

This is an automated email from the ASF dual-hosted git repository.

orpiske pushed a commit to branch main
in repository https://gitbox.apache.org/repos/asf/camel.git


The following commit(s) were added to refs/heads/main by this push:
     new 20a2f6f7770 (ci): updated to use the branch labeling feature from the new Labeler
20a2f6f7770 is described below

commit 20a2f6f777082fd2884a397c1a4cd4bd2b5f7e39
Author: Otavio Rodolfo Piske <an...@gmail.com>
AuthorDate: Thu Jan 4 13:26:35 2024 +0100

    (ci): updated to use the branch labeling feature from the new Labeler
---
 .github/workflows/generic-pr.yaml                   | 16 +---------------
 .../workflows/generic-pr/label-config-camel-3.yml   | 21 ---------------------
 .github/workflows/generic-pr/label-config-main.yml  | 21 ---------------------
 .github/workflows/generic-pr/label-config.yml       |  9 +++++++++
 4 files changed, 10 insertions(+), 57 deletions(-)

diff --git a/.github/workflows/generic-pr.yaml b/.github/workflows/generic-pr.yaml
index b1bcc9b440b..1c54b3c8641 100644
--- a/.github/workflows/generic-pr.yaml
+++ b/.github/workflows/generic-pr.yaml
@@ -46,18 +46,4 @@ jobs:
         with:
           repo-token: ${{ secrets.GITHUB_TOKEN }}
           configuration-path: .github/workflows/generic-pr/label-config.yml
-          sync-labels: true
-      - name: Label changes scope (Camel 4)
-        if: github.ref == 'refs/heads/main'
-        uses: actions/labeler@v5.0.0
-        with:
-          repo-token: ${{ secrets.GITHUB_TOKEN }}
-          configuration-path: .github/workflows/generic-pr/label-config-main.yml
-          sync-labels: true
-      - name: Label changes scope (Camel 3)
-        if: github.ref == 'refs/heads/camel-3.x'
-        uses: actions/labeler@v5.0.0
-        with:
-          repo-token: ${{ secrets.GITHUB_TOKEN }}
-          configuration-path: .github/workflows/generic-pr/label-config-camel-3.yml
-          sync-labels: true
+          sync-labels: true
\ No newline at end of file
diff --git a/.github/workflows/generic-pr/label-config-camel-3.yml b/.github/workflows/generic-pr/label-config-camel-3.yml
deleted file mode 100644
index e9de5346af7..00000000000
--- a/.github/workflows/generic-pr/label-config-camel-3.yml
+++ /dev/null
@@ -1,21 +0,0 @@
-#
-# 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.
-#
-
-camel-3:
-  - changed-files:
-    - any-glob-to-any-file:
-      - '**/*'
diff --git a/.github/workflows/generic-pr/label-config-main.yml b/.github/workflows/generic-pr/label-config-main.yml
deleted file mode 100644
index 0ca2960f0e0..00000000000
--- a/.github/workflows/generic-pr/label-config-main.yml
+++ /dev/null
@@ -1,21 +0,0 @@
-#
-# 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.
-#
-
-camel-4:
-  - changed-files:
-      - any-glob-to-any-file:
-        - '**/*'
diff --git a/.github/workflows/generic-pr/label-config.yml b/.github/workflows/generic-pr/label-config.yml
index 6c469b28174..37cd751a81d 100644
--- a/.github/workflows/generic-pr/label-config.yml
+++ b/.github/workflows/generic-pr/label-config.yml
@@ -15,6 +15,15 @@
 # limitations under the License.
 #
 
+camel-3:
+  - base-branch:
+      - '^camel-3.x'
+
+camel-4:
+  - base-branch:
+      - 'main'
+      - '^camel-4.x'
+
 ci:
   - changed-files:
       - any-glob-to-any-file: