You are viewing a plain text version of this content. The canonical link for it is here.
Posted to commits@camel.apache.org by ja...@apache.org on 2023/06/19 14:01:37 UTC
[camel-quarkus] branch main updated (22eda964e8 -> faafa0b1ae)
This is an automated email from the ASF dual-hosted git repository.
jamesnetherton pushed a change to branch main
in repository https://gitbox.apache.org/repos/asf/camel-quarkus.git
from 22eda964e8 Updated CHANGELOG.md
new 4e782075d5 Restore issue auto milestone workflow
new faafa0b1ae Fix SBOM path exclusions
The 2 revisions listed above as "new" are entirely new to this
repository and will be described in separate emails. The revisions
listed as "add" were already present in the repository and have only
been added to this reference.
Summary of changes:
.github/workflows/assign-issue-milestone.yaml | 96 +++++-----------------
.../workflows/assign-wontfix-issue-milestone.yaml | 46 +++++++++++
.github/workflows/ci-build.yaml | 2 +-
3 files changed, 69 insertions(+), 75 deletions(-)
create mode 100644 .github/workflows/assign-wontfix-issue-milestone.yaml
[camel-quarkus] 01/02: Restore issue auto milestone workflow
Posted by ja...@apache.org.
This is an automated email from the ASF dual-hosted git repository.
jamesnetherton pushed a commit to branch main
in repository https://gitbox.apache.org/repos/asf/camel-quarkus.git
commit 4e782075d5fc9d016b6e06b3a6b32f600e5ccdcb
Author: James Netherton <ja...@gmail.com>
AuthorDate: Mon Jun 19 06:43:51 2023 +0100
Restore issue auto milestone workflow
---
.github/workflows/assign-issue-milestone.yaml | 96 +++++-----------------
.../workflows/assign-wontfix-issue-milestone.yaml | 46 +++++++++++
2 files changed, 68 insertions(+), 74 deletions(-)
diff --git a/.github/workflows/assign-issue-milestone.yaml b/.github/workflows/assign-issue-milestone.yaml
index fc78f61061..c15e7bb152 100644
--- a/.github/workflows/assign-issue-milestone.yaml
+++ b/.github/workflows/assign-issue-milestone.yaml
@@ -16,26 +16,20 @@
#
on:
- # pull_request:
- # branches:
- # - main
- # types:
- # - closed
-
- issues:
- types:
- - closed
+ push:
+ branches:
+ - main
+ paths-ignore:
+ - 'CHANGELOG.md'
+ - 'camel-quarkus-sbom/**'
permissions:
contents: read
issues: write
- pull-requests: read
jobs:
assign-issue-milestone:
- if: github.repository == 'apache/camel-quarkus' &&
- github.event_name == 'pull_request' &&
- github.event.pull_request.merged
+ if: github.repository == 'apache/camel-quarkus'
runs-on: ubuntu-latest
concurrency:
group: assign-issue-milestone-${{ github.event.pull_request.number }}
@@ -46,50 +40,25 @@ jobs:
with:
script: |
const issueNumberFromCommitCommentRegex = new RegExp(`.*(?:fix(?:e[sd])?|(?:(?:resolve|close)[sd]?)):?\\s(?:https?:\\/\\/github\\.com\\/${context.repo.owner}\\/${context.repo.repo}\\/issues\\/|#)(\\d+)`, 'igm');
- const prNumber = context.payload.number;
- const prIssueReferencesQuery = `{
- repository(owner: "${context.repo.owner}", name: "${context.repo.repo}") {
- pullRequest(number: ${prNumber}) {
- commits(last: 50) {
- nodes {
- commit {
- message
- }
- }
- }
- closingIssuesReferences(last: 50) {
- nodes {
- number
- }
- }
- }
- }
- }`;
-
const issueNumbers = new Set();
- prIssueReferences = await github.graphql(prIssueReferencesQuery);
- if (prIssueReferences) {
- // Parse issue number references from commit comments
- if (prIssueReferences.repository.pullRequest.commits) {
- prIssueReferences.repository.pullRequest.commits.nodes.forEach(node => {
- for (const match of node.commit.message.matchAll(issueNumberFromCommitCommentRegex)) {
- let issueNumber = parseInt(match[1]);
- if (!isNaN(issueNumber)) {
- issueNumbers.add(issueNumber);
- }
- }
- });
- }
+ // Get the commits that triggered this push event
+ const commitComparison = await github.rest.repos.compareCommitsWithBasehead({
+ owner: context.repo.owner,
+ repo: context.repo.repo,
+ basehead: `${context.payload.before}...${context.payload.after}`,
+ });
- // Get any issue references GitHub associated with the PR
- if (prIssueReferences.repository.pullRequest.closingIssuesReferences) {
- prIssueReferences.repository.pullRequest.closingIssuesReferences.nodes.forEach(node => {
- if (node.number) {
- issueNumbers.add(node.number);
+ if (commitComparison && commitComparison.data) {
+ // Parse issue number references from commit comments
+ commitComparison.data.commits.forEach(commitData => {
+ for (const match of commitData.commit.message.matchAll(issueNumberFromCommitCommentRegex)) {
+ let issueNumber = parseInt(match[1]);
+ if (!isNaN(issueNumber)) {
+ issueNumbers.add(issueNumber);
}
- });
- }
+ }
+ });
}
// No issues associated with the merged PR so we can exit
@@ -120,24 +89,3 @@ jobs:
});
}
}
-
- assign-wont-fix-issue-milestone:
- if: github.repository == 'apache/camel-quarkus' &&
- github.event_name == 'issues' &&
- github.event.issue.milestone.number != 4 && (contains(github.event.issue.labels.*.name, 'wontfix') || github.event.issue.state_reason == 'not_planned')
- runs-on: ubuntu-latest
- concurrency:
- group: assign-wont-fix-issue-milestone-${{ github.event.issue.number }}
- cancel-in-progress: true
- steps:
- - name: Assign Closed Issue To Wont Fix Milestone
- uses: actions/github-script@v6
- with:
- script: |
- await github.rest.issues.update({
- owner: context.repo.owner,
- repo: context.repo.repo,
- issue_number: context.payload.issue.number,
- // https://github.com/apache/camel-quarkus/milestone/4
- milestone: 4,
- });
diff --git a/.github/workflows/assign-wontfix-issue-milestone.yaml b/.github/workflows/assign-wontfix-issue-milestone.yaml
new file mode 100644
index 0000000000..c223174a43
--- /dev/null
+++ b/.github/workflows/assign-wontfix-issue-milestone.yaml
@@ -0,0 +1,46 @@
+#
+# 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.
+#
+
+on:
+ issues:
+ types:
+ - closed
+
+permissions:
+ issues: write
+
+jobs:
+ assign-wont-fix-issue-milestone:
+ if: github.repository == 'apache/camel-quarkus' &&
+ github.event_name == 'issues' &&
+ github.event.issue.milestone.number != 4 && (contains(github.event.issue.labels.*.name, 'wontfix') || github.event.issue.state_reason == 'not_planned')
+ runs-on: ubuntu-latest
+ concurrency:
+ group: assign-wont-fix-issue-milestone-${{ github.event.issue.number }}
+ cancel-in-progress: true
+ steps:
+ - name: Assign Closed Issue To Wont Fix Milestone
+ uses: actions/github-script@v6
+ with:
+ script: |
+ await github.rest.issues.update({
+ owner: context.repo.owner,
+ repo: context.repo.repo,
+ issue_number: context.payload.issue.number,
+ // https://github.com/apache/camel-quarkus/milestone/4
+ milestone: 4,
+ });
[camel-quarkus] 02/02: Fix SBOM path exclusions
Posted by ja...@apache.org.
This is an automated email from the ASF dual-hosted git repository.
jamesnetherton pushed a commit to branch main
in repository https://gitbox.apache.org/repos/asf/camel-quarkus.git
commit faafa0b1aea23b37340b001a3ead093a2bfe2764
Author: James Netherton <ja...@gmail.com>
AuthorDate: Mon Jun 19 06:47:33 2023 +0100
Fix SBOM path exclusions
---
.github/workflows/ci-build.yaml | 2 +-
1 file changed, 1 insertion(+), 1 deletion(-)
diff --git a/.github/workflows/ci-build.yaml b/.github/workflows/ci-build.yaml
index cdae7f887a..26c6bfb493 100644
--- a/.github/workflows/ci-build.yaml
+++ b/.github/workflows/ci-build.yaml
@@ -31,7 +31,7 @@ on:
- 'KEYS'
- 'LICENSE.txt'
- 'NOTICE.txt'
- - 'camel-quarkus-sbom.*'
+ - 'camel-quarkus-sbom/**'
pull_request:
branches:
- main