From 2da40a529941d2f69b4ca714ea1496d3e3244150 Mon Sep 17 00:00:00 2001 From: Benjamin Reed Date: Thu, 22 Jun 2023 09:47:24 -0400 Subject: [PATCH 1/2] NMS-15784: add /usr/lib64/jvm to the search criteria --- core/cli/src/main/resources/bin/find-java.sh | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/core/cli/src/main/resources/bin/find-java.sh b/core/cli/src/main/resources/bin/find-java.sh index 5d2da6e7f1a0..89df819657a5 100755 --- a/core/cli/src/main/resources/bin/find-java.sh +++ b/core/cli/src/main/resources/bin/find-java.sh @@ -90,7 +90,7 @@ main() { fi if [ "$SKIP_DEFAULTS" -eq 0 ]; then - DEFAULTS=(/usr/lib/jvm /usr/java /System/Library/Java/JavaVirtualMachines /Library/Java/JavaVirtualMachines /Library/Java/Home /opt) + DEFAULTS=(/usr/lib/jvm /usr/java /System/Library/Java/JavaVirtualMachines /Library/Java/JavaVirtualMachines /Library/Java/Home /opt /usr/lib64/jvm) # this is massively inefficient, but bash sucks and there aren't *that* many entries so it doesn't really matter for default in "${DEFAULTS[@]}"; do found=false From 12b0e82b5160f604aff1d94795e04aa535e0c8c5 Mon Sep 17 00:00:00 2001 From: Benjamin Reed Date: Mon, 26 Jun 2023 09:42:23 -0400 Subject: [PATCH 2/2] backport github automation changes to 2020 --- .github/PULL_REQUEST_TEMPLATE.md | 9 +++++---- .github/assign-by-files.yml | 13 ++++++++++++ .github/dependabot.yml | 33 +++++++++++++++++++++++++++++-- .github/workflows/auto-assign.yml | 17 ++++++++++++++++ 4 files changed, 66 insertions(+), 6 deletions(-) create mode 100644 .github/assign-by-files.yml create mode 100644 .github/workflows/auto-assign.yml diff --git a/.github/PULL_REQUEST_TEMPLATE.md b/.github/PULL_REQUEST_TEMPLATE.md index 9d80d292c4d4..edb63c0aff0e 100644 --- a/.github/PULL_REQUEST_TEMPLATE.md +++ b/.github/PULL_REQUEST_TEMPLATE.md @@ -5,12 +5,13 @@ ### Contribution Checklist -* Please [make an issue in the OpenNMS issue tracker](https://issues.opennms.org) if there isn't one already.
Once there is an issue, please: +* Please [make an issue in the OpenNMS issue tracker](https://opennms.atlassian.net/) if there isn't one already.
Once there is an issue, please: 1. update the title of this PR to be in the format: `${JIRA-ISSUE-NUMBER}: subject of pull request` - 2. update the JIRA link at the bottom of this comment to refer to the real issue number + 2. update the Jira link at the bottom of this comment to refer to the real issue number 3. prefix your commit messages with the issue number, if possible - 4. once you've created this PR, please link to it in a comment in the JIRA issue + 4. once you've created this PR, please link to it in a comment in the Jira issue Don't worry if this sounds like a lot, we can help you get things set up properly. +* **If this code is likely to affect the UI, did you name your branch with `-smoke` in it to trigger smoke tests?** * If this is a new or updated feature, is there documentation for the new behavior? * If this is new code, are there unit and/or integration tests? * If this PR targets a `foundation-*` branch, does it try to avoid changing files in `$OPENNMS_HOME/etc/`? @@ -33,5 +34,5 @@ Thanks for taking time to contribute! ### External References -* JIRA (Issue Tracker): http://issues.opennms.org/browse/${JIRA-ISSUE-NUMBER} +* Jira (Issue Tracker): https://opennms.atlassian.net/browse/${JIRA-ISSUE-NUMBER} diff --git a/.github/assign-by-files.yml b/.github/assign-by-files.yml new file mode 100644 index 000000000000..c89d2cbd2c79 --- /dev/null +++ b/.github/assign-by-files.yml @@ -0,0 +1,13 @@ +--- +"**/*.adoc": + - Bonrob2 + +"opennms-doc/**/*": + - Bonrob2 + +"docs/**/*": + - Bonrob2 + +".circleci/**/*": + - RangerRick + - mershad-manesh diff --git a/.github/dependabot.yml b/.github/dependabot.yml index f6e7798fe1a7..d7b93ff58495 100644 --- a/.github/dependabot.yml +++ b/.github/dependabot.yml @@ -1,9 +1,24 @@ version: 2 updates: + + - package-ecosystem: "npm" + # Look for `package.json` and `lock` files in the `root` directory + directory: "/ui" + target-branch: "develop" + reviewers: + - "mikewrosey" + labels: + - "dependency update" + commit-message: + prefix: "build" + include: "scope" + schedule: + interval: "weekly" + - package-ecosystem: "npm" # Look for `package.json` and `lock` files in the `root` directory directory: "/core/web-assets/" - target-branch: "foundation-2022" + target-branch: "foundation-2023" versioning-strategy: "increase-if-necessary" reviewers: - "rangerrick" @@ -14,15 +29,29 @@ updates: include: "scope" schedule: interval: "daily" + # these will need to be dealt with in a more deliberate way ignore: + - dependency-name: "angular" + - dependency-name: "angular-animate" + - dependency-name: "angular-cookies" + - dependency-name: "angular-mocks" + - dependency-name: "angular-resource" + - dependency-name: "angular-route" + - dependency-name: "angular-sanitize" + - dependency-name: "c3" - dependency-name: "d3" + - dependency-name: "flot" - dependency-name: "ionicons" - dependency-name: "@types/lodash" - dependency-name: "@types/node" + # do these when we upgrade to webpack 5 + - dependency-name: "assets-webpack-plugin" + - dependency-name: "css-loader" + - dependency-name: "expose-loader" - package-ecosystem: "maven" directory: "/" - target-branch: "foundation-2022" + target-branch: "foundation-2023" reviewers: - "rangerrick" labels: diff --git a/.github/workflows/auto-assign.yml b/.github/workflows/auto-assign.yml new file mode 100644 index 000000000000..af920092e407 --- /dev/null +++ b/.github/workflows/auto-assign.yml @@ -0,0 +1,17 @@ +name: "Auto Assign Pull Request" +on: + pull_request_target: + # types: [review_requested, ready_for_review, opened, synchronize, reopened] + branches: + - develop + - 'foundation-**' + - 'release-**' +jobs: + assign_reviewer: + if: github.event.pull_request.draft == false + runs-on: ubuntu-latest + steps: + - uses: shufo/auto-assign-reviewer-by-files@v1.1.4 + with: + config: ".github/assign-by-files.yml" + token: ${{ secrets.GITHUB_TOKEN }}