Skip to content

Commit 99ec6f0

Browse files
committed
Merge branch 'master' of https://github.com/apache/ozone into rocksdb-v10-upgrade
Conflicts: pom.xml
2 parents 7f3abff + a650a90 commit 99ec6f0

577 files changed

Lines changed: 27312 additions & 13096 deletions

File tree

Some content is hidden

Large Commits have some content hidden by default. Use the searchbox below for content that may be hidden.

.github/ci.md

Lines changed: 0 additions & 7 deletions
Original file line numberDiff line numberDiff line change
@@ -76,13 +76,6 @@ If they don't match, it describes how to make the updates to include the changes
7676
### close-stale-prs Workflow
7777
[This](./workflows/close-stale-prs.yml) workflow is scheduled each night at midnight and uses the [actions/stale](https://github.com/actions/stale) to automatically manage inactive PRs. It marks PRs as stale after 21 days of inactivity and closes them 7 days later. If a stale PR receives any updates or comments, the stale label is automatically removed.
7878

79-
### comment-commands Workflow
80-
[This](./workflows/comments.yaml) workflow is triggered each time a comment is added/edited to a PR. It checks to see if the body of the comment begins with one of the following strings and, if so, invokes the corresponding command.
81-
- /help : [Show](./comment-commands/help.sh) all the available comment commands
82-
- /label : [Add](./comment-commands/label.sh) new label to the issue: /label "label"
83-
- /retest : [Provide](./comment-commands/retest.sh) help on how to trigger new CI build
84-
85-
8679
## Old/Deprecated Workflows
8780
The following workflows no longer run but still exist on the [actions](https://github.com/apache/ozone/actions) page for historical reasons:
8881
- [Build](https://github.com/apache/ozone/actions/workflows/main.yml)

.github/comment-commands/debug.sh

Lines changed: 0 additions & 21 deletions
This file was deleted.

.github/comment-commands/help.sh

Lines changed: 0 additions & 27 deletions
This file was deleted.

.github/comment-commands/label.sh

Lines changed: 0 additions & 25 deletions
This file was deleted.

.github/comment-commands/retest.sh

Lines changed: 0 additions & 75 deletions
This file was deleted.

.github/dependabot.yml

Lines changed: 10 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -23,5 +23,15 @@ updates:
2323
interval: "weekly"
2424
day: "saturday"
2525
time: "07:00" # UTC
26+
cooldown:
27+
default-days: 7
2628
pull-request-branch-name:
2729
separator: "-"
30+
- package-ecosystem: "github-actions"
31+
directory: "/"
32+
schedule:
33+
# 'daily' only runs on weekdays
34+
interval: "cron"
35+
cronjob: "15 6 * * *"
36+
cooldown:
37+
default-days: 7

.github/process-comment.sh

Lines changed: 0 additions & 56 deletions
This file was deleted.

.github/pull_request_template.md

Lines changed: 3 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -22,6 +22,9 @@ Examples of well-written pull requests:
2222
Please create an issue in ASF JIRA before opening a pull request, and you need to set the title of the pull
2323
request which starts with the corresponding JIRA issue number. (e.g. HDDS-XXXX. Fix a typo in YYY.)
2424

25+
If you do not have an ASF Jira account yet, please follow the first-time contributor
26+
instructions in the [Jira guideline](../CONTRIBUTING.md#jira-guideline).
27+
2528
(Please replace this section with the link to the Apache JIRA)
2629

2730
## How was this patch tested?

.github/workflows/build-ratis.yml

Lines changed: 6 additions & 6 deletions
Original file line numberDiff line numberDiff line change
@@ -65,19 +65,19 @@ jobs:
6565
thirdparty-version: ${{ steps.versions.outputs.thirdparty }}
6666
steps:
6767
- name: Checkout project
68-
uses: actions/checkout@v4
68+
uses: actions/checkout@v6
6969
with:
7070
repository: ${{ inputs.repo }}
7171
ref: ${{ inputs.ref }}
7272
- name: Cache for maven dependencies
73-
uses: actions/cache@v4
73+
uses: actions/cache@v5
7474
with:
7575
path: |
7676
~/.m2/repository
7777
!~/.m2/repository/org/apache/ratis
7878
key: ratis-dependencies-${{ hashFiles('**/pom.xml') }}
7979
- name: Setup java
80-
uses: actions/setup-java@v4
80+
uses: actions/setup-java@v5
8181
with:
8282
distribution: 'temurin'
8383
java-version: 8
@@ -95,7 +95,7 @@ jobs:
9595
mvn -B --no-transfer-progress -Dscan=false versions:set -DnewVersion=${{ steps.versions.outputs.ratis }}
9696
dev-support/checks/build.sh
9797
- name: Store Maven repo for tests
98-
uses: actions/upload-artifact@v4
98+
uses: actions/upload-artifact@v7
9999
with:
100100
name: ratis-jars
101101
path: |
@@ -112,7 +112,7 @@ jobs:
112112
protobuf-version: ${{ steps.versions.outputs.protobuf }}
113113
steps:
114114
- name: Checkout project
115-
uses: actions/checkout@v4
115+
uses: actions/checkout@v6
116116
with:
117117
repository: apache/ratis-thirdparty
118118
ref: ${{ needs.ratis.outputs.thirdparty-version }}
@@ -123,7 +123,7 @@ jobs:
123123
echo "netty=$(mvn help:evaluate -N -q -DforceStdout -Dscan=false -Dexpression=shaded.netty.version)" >> $GITHUB_OUTPUT
124124
echo "protobuf=$(mvn help:evaluate -N -q -DforceStdout -Dscan=false -Dexpression=shaded.protobuf.version)" >> $GITHUB_OUTPUT
125125
debug:
126-
runs-on: ubuntu-24.04
126+
runs-on: ubuntu-slim
127127
needs:
128128
- ratis
129129
- ratis-thirdparty

0 commit comments

Comments
 (0)