Skip to content

Commit 848859b

Browse files
authored
Merge pull request #9 from oadp-rebasebot/oadp-dev
Merge https://github.com/project-velero/kopia:v0.21.1-velero-patch (3ea24d2) into oadp-dev
2 parents 20bfabb + 27a6d68 commit 848859b

File tree

465 files changed

+8876
-10022
lines changed

Some content is hidden

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

465 files changed

+8876
-10022
lines changed

.chglog/CHANGELOG_HTMLUI.tpl.md

Lines changed: 9 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,9 @@
1+
{{ range .Versions }}
2+
### Graphical User Interface
3+
4+
{{ range .CommitGroups -}}
5+
{{ range .Commits -}}
6+
* {{ if eq .Type "feat" }}**New Feature** {{ end }}{{ .Subject }} by {{ .Author.Name}}
7+
{{ end -}}
8+
{{ end -}}
9+
{{ end -}}

.chglog/config-htmlui.yml

Lines changed: 64 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,64 @@
1+
style: github
2+
template: CHANGELOG_HTMLUI.tpl.md
3+
info:
4+
title: CHANGELOG
5+
repository_url: https://github.com/kopia/htmlui
6+
options:
7+
commits:
8+
filters:
9+
Scope:
10+
- cli
11+
- kopiaui
12+
- general
13+
- repository
14+
- server
15+
- providers
16+
- snapshots
17+
- testing
18+
- lint
19+
- infra
20+
- ci
21+
- notifications
22+
- ui
23+
commit_groups:
24+
sort_by: Custom
25+
group_by: "Scope"
26+
title_maps:
27+
# must match .github/workflows/check-pr-title.yml
28+
# app|cli|ui|repository|server|providers|deps|deps-dev|site|ci|infra|general
29+
kopiaui: KopiaUI App
30+
cli: Command-Line Interface
31+
ui: Graphical User Interface
32+
lint: Linter
33+
deps: Dependencies
34+
snapshots: Snapshots
35+
deps-dev: Development Dependencies
36+
infra: Infrastructure
37+
general: General Improvements
38+
providers: Storage Providers
39+
notifications: Notifications
40+
ci: CI/CD
41+
title_order:
42+
- cli
43+
- kopiaui
44+
- general
45+
- repository
46+
- server
47+
- snapshots
48+
- providers
49+
- notifications
50+
- deps
51+
- testing
52+
- lint
53+
- deps-dev
54+
- infra
55+
- ci
56+
header:
57+
pattern: "^(\\w*)(?:\\(([\\w\\$\\.\\-\\*\\s]*)\\))?\\:\\s(.*)$"
58+
pattern_maps:
59+
- Type
60+
- Scope
61+
- Subject
62+
notes:
63+
keywords:
64+
- BREAKING CHANGE

.chglog/config.yml

Lines changed: 0 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -16,12 +16,9 @@ options:
1616
- snapshots
1717
- testing
1818
- lint
19-
- deps
20-
- deps-dev
2119
- infra
2220
- ci
2321
- notifications
24-
- ui
2522
commit_groups:
2623
sort_by: Custom
2724
group_by: "Scope"

.github/workflows/auto-merge.yml

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -8,7 +8,7 @@ jobs:
88
runs-on: ubuntu-latest
99
steps:
1010
- uses: actions/checkout@11bd71901bbe5b1630ceea73d27597364c9af683 # v4.2.2
11-
- uses: ahmadnassri/action-dependabot-auto-merge@v2
11+
- uses: ahmadnassri/action-dependabot-auto-merge@45fc124d949b19b6b8bf6645b6c9d55f4f9ac61a #v2.6.6
1212
with:
1313
# auto-merge rules are in /.github/auto-merge.yml
14-
github-token: ${{ secrets.AUTO_MERGE_TOKEN }}
14+
github-token: ${{ secrets.AUTO_MERGE_TOKEN }}

.github/workflows/check-pr-title.yml

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -7,6 +7,6 @@ jobs:
77
name: Check PR Title
88
runs-on: ubuntu-latest
99
steps:
10-
- uses: deepakputhraya/action-pr-title@master
10+
- uses: deepakputhraya/action-pr-title@077bddd7bdabd0d2b1b25ed0754c7e62e184d7ee
1111
with:
1212
regex: '^(feat|fix|breaking|build|chore|docs|style|refactor|test)\((kopiaui|cli|ui|repository|snapshots|server|providers|deps|deps-dev|site|ci|infra|notifications|general)\)!{0,1}: .*$'

.github/workflows/code-coverage.yml

Lines changed: 3 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -16,19 +16,19 @@ jobs:
1616
with:
1717
fetch-depth: 0
1818
- name: Set up Go
19-
uses: actions/setup-go@3041bf56c941b39c61721a86cd11f3bb1338122a # v5.2.0
19+
uses: actions/setup-go@d35c59abb061a4a6fb18e82ac0862c26744d6ab5 # v5.5.0
2020
with:
2121
go-version-file: 'go.mod'
2222
check-latest: true
2323
id: go
2424
- name: Run Tests
2525
run: make test-with-coverage
2626
- name: Upload Coverage
27-
uses: codecov/codecov-action@5a605bd92782ce0810fa3b8acc235c921b497052 # v5.2.0
27+
uses: codecov/codecov-action@18283e04ce6e62d37312384ff67231eb8fd56d24 # v5.4.3
2828
with:
2929
files: coverage.txt
3030
- name: Upload Logs
31-
uses: actions/upload-artifact@6f51ac03b9356f520e9adb1b1b7802705f340c2b # v4.5.0
31+
uses: actions/upload-artifact@ea165f8d65b6e75b540449e92b4886f43607fa02 # v4.6.2
3232
with:
3333
name: logs
3434
path: .logs/**/*.log

.github/workflows/compat-test.yml

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -18,15 +18,15 @@ jobs:
1818
with:
1919
fetch-depth: 0
2020
- name: Set up Go
21-
uses: actions/setup-go@3041bf56c941b39c61721a86cd11f3bb1338122a # v5.2.0
21+
uses: actions/setup-go@d35c59abb061a4a6fb18e82ac0862c26744d6ab5 # v5.5.0
2222
with:
2323
go-version-file: 'go.mod'
2424
check-latest: true
2525
id: go
2626
- name: Compat Test
2727
run: make compat-tests
2828
- name: Upload Logs
29-
uses: actions/upload-artifact@6f51ac03b9356f520e9adb1b1b7802705f340c2b # v4.5.0
29+
uses: actions/upload-artifact@ea165f8d65b6e75b540449e92b4886f43607fa02 # v4.6.2
3030
with:
3131
name: logs
3232
path: .logs/**/*.log

.github/workflows/dependency-review.yml

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -17,4 +17,4 @@ jobs:
1717
- name: 'Checkout Repository'
1818
uses: actions/checkout@11bd71901bbe5b1630ceea73d27597364c9af683 # v4.2.2
1919
- name: 'Dependency Review'
20-
uses: actions/dependency-review-action@v4
20+
uses: actions/dependency-review-action@da24556b548a50705dd671f47852072ea4c105d9 #v4.7.1

.github/workflows/endurance-test.yml

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -23,15 +23,15 @@ jobs:
2323
with:
2424
fetch-depth: 0
2525
- name: Set up Go
26-
uses: actions/setup-go@3041bf56c941b39c61721a86cd11f3bb1338122a # v5.2.0
26+
uses: actions/setup-go@d35c59abb061a4a6fb18e82ac0862c26744d6ab5 # v5.5.0
2727
with:
2828
go-version-file: 'go.mod'
2929
check-latest: true
3030
id: go
3131
- name: Endurance Tests
3232
run: make endurance-tests
3333
- name: Upload Logs
34-
uses: actions/upload-artifact@6f51ac03b9356f520e9adb1b1b7802705f340c2b # v4.5.0
34+
uses: actions/upload-artifact@ea165f8d65b6e75b540449e92b4886f43607fa02 # v4.6.2
3535
with:
3636
name: logs
3737
path: .logs/**/*.log

.github/workflows/htmlui-tests.yml

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -31,15 +31,15 @@ jobs:
3131
with:
3232
fetch-depth: 0
3333
- name: Set up Go
34-
uses: actions/setup-go@3041bf56c941b39c61721a86cd11f3bb1338122a # v5.2.0
34+
uses: actions/setup-go@d35c59abb061a4a6fb18e82ac0862c26744d6ab5 # v5.5.0
3535
with:
3636
go-version-file: 'go.mod'
3737
check-latest: true
3838
id: go
3939
- name: Run Tests
4040
run: make htmlui-e2e-test
4141
- name: Upload Screenshots
42-
uses: actions/upload-artifact@6f51ac03b9356f520e9adb1b1b7802705f340c2b # v4.5.0
42+
uses: actions/upload-artifact@ea165f8d65b6e75b540449e92b4886f43607fa02 # v4.6.2
4343
with:
4444
path: .screenshots/**/*.png
4545
if-no-files-found: ignore

0 commit comments

Comments
 (0)