Skip to content
New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

chore(otterdog): adding / updating file(s) due to blueprint require-dependabot-auto-merge #4033

Merged
merged 3 commits into from
Dec 4, 2024
Merged

chore(otterdog): adding / updating file(s) due to blueprint require-dependabot-auto-merge #4033

Changes from 1 commit
Commits
Show all changes
3 commits
Select commit Hold shift + click to select a range
a90ac12
Updating file .github/workflows/dependabot-auto-merge.yml
eclipse-otterdog[bot] Nov 11, 2024
42b2f20
Updating file .github/workflows/dependabot-auto-merge.yml
eclipse-otterdog[bot] Nov 12, 2024
e76d002
Merge branch 'master' into otterdog/blueprint/require-dependabot-auto…
gdams Dec 4, 2024
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
21 changes: 5 additions & 16 deletions .github/workflows/dependabot-auto-merge.yml
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -1,23 +1,12 @@
# ********************************************************************************
# Copyright (c) 2022 Contributors to the Eclipse Foundation
#
# See the NOTICE file(s) with this work for additional
# information regarding copyright ownership.
#
# This program and the accompanying materials are made
# available under the terms of the Apache Software License 2.0
# which is available at https://www.apache.org/licenses/LICENSE-2.0.
#
# SPDX-License-Identifier: Apache-2.0
# ********************************************************************************

# This is a templated file from https://github.com/adoptium/.eclipsefdn/tree/main/otterdog/policies/require_dependabot_auto_merge.yml
name: Dependabot auto-merge
Copy link

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

Suggested change
# This is a templated file from https://github.com/adoptium/.eclipsefdn/tree/main/otterdog/policies/require_dependabot_auto_merge.yml
# ********************************************************************************
# Copyright (c) 2024 Contributors to the Eclipse Foundation
#
# See the NOTICE file(s) with this work for additional
# information regarding copyright ownership.
#
# This program and the accompanying materials are made
# available under the terms of the Apache Software License 2.0
# which is available at https://www.apache.org/licenses/LICENSE-2.0.
#
# SPDX-License-Identifier: Apache-2.0
# ********************************************************************************
# This is a templated file from https://github.com/adoptium/.eclipsefdn/tree/main/otterdog/policies/require_dependabot_auto_merge.yml

Copy link
Contributor

@karianna karianna Nov 11, 2024 •
edited
Loading

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

As the original file is not Apache v2 licensed I'm not sure we have the rights to apply this license without permission from the EF.

Copy link
Contributor

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

Suggested change
# This is a templated file from https://github.com/adoptium/.eclipsefdn/tree/main/otterdog/policies/require_dependabot_auto_merge.yml
# This is a templated file from https://github.com/adoptium/.eclipsefdn/tree/main/otterdog/blueprints/require_dependabot_auto_merge.yml

on: pull_request_target

permissions:
contents: write
pull-requests: write
permissions: read-all

jobs:
dependabot:
permissions:
contents: write
pull-requests: write
uses: adoptium/.github/.github/workflows/dependabot-auto-merge.yml@main
Loading