Skip to content

Commit fbc5b29

Browse files
authored
Merge branch 'master' into MaxymVlasov-patch-2
2 parents 9bd1771 + 79085a6 commit fbc5b29

Some content is hidden

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

46 files changed

+675
-287
lines changed

.codecov.yml

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -4,8 +4,8 @@ codecov:
44
wait_for_ci: false
55

66
require_ci_to_pass: false
7-
8-
token: >- # notsecret # repo-scoped, upload-only, stability in fork PRs
7+
# notsecret # repo-scoped, upload-only, stability in fork PRs
8+
token: >-
99
7316089b-55fe-4646-b640-78d84b79d109
1010
1111
comment:

.git-blame-ignore-revs

Lines changed: 70 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,70 @@
1+
# `git blame` master ignore list.
2+
#
3+
# This file contains a list of git hashes of revisions to be ignored
4+
# by `git blame`. These revisions are considered "unimportant" in
5+
# that they are unlikely to be what you are interested in when blaming.
6+
# They are typically expected to be formatting-only changes.
7+
#
8+
# It can be used for `git blame` using `--ignore-revs-file` or by
9+
# setting `blame.ignoreRevsFile` in the `git config`[1].
10+
#
11+
# Ignore these commits when reporting with blame. Calling
12+
#
13+
# git blame --ignore-revs-file .git-blame-ignore-revs
14+
#
15+
# will tell `git blame` to ignore changes made by these revisions when
16+
# assigning blame, as if the change never happened.
17+
#
18+
# You can enable this as a default for your local repository by
19+
# running
20+
#
21+
# git config blame.ignoreRevsFile .git-blame-ignore-revs
22+
#
23+
# This will probably be automatically picked by your IDE
24+
# (VSCode+GitLens and JetBrains products are confirmed to do this).
25+
#
26+
# Important: if you are switching to a branch without this file,
27+
# `git blame` will fail with an error.
28+
#
29+
# GitHub also excludes the commits listed below from its "Blame"
30+
# views[2][3].
31+
#
32+
# [1]: https://git-scm.com/docs/git-blame#Documentation/git-blame.txt-blameignoreRevsFile
33+
# [2]: https://github.blog/changelog/2022-03-24-ignore-commits-in-the-blame-view-beta/
34+
# [3]: https://docs.github.com/en/repositories/working-with-files/using-files/viewing-a-file#ignore-commits-in-the-blame-view
35+
#
36+
# Guidelines:
37+
# - Only large (generally automated) reformatting or renaming PRs
38+
# should be added to this list. Do not put things here just because
39+
# you feel they are trivial or unimportant. If in doubt, do not put
40+
# it on this list.
41+
# - When adding a single revision, use inline comment to link relevant
42+
# issue/PR. Alternatively, paste the commit title instead.
43+
# Example:
44+
# d4a8b7307acc2dc8a8833ccfa65426ad28b3ffc9 # https://github.com/sanitizers/octomachinery/issues/1
45+
# - When adding multiple revisions (like a bulk of work over many
46+
# commits), organize them in blocks. Precede each such block with a
47+
# comment starting with the word "START", followed by a link to the
48+
# relevant issue or PR. Add a similar comment after the last block
49+
# line but use the word "END", followed by the same link.
50+
# Alternatively, add or augment the link with a text motivation and
51+
# description of work performed in each commit.
52+
# After each individual commit in the block, add an inline comment
53+
# with the commit title line.
54+
# Example:
55+
# # START https://github.com/sanitizers/octomachinery/issues/1
56+
# 6f0bd2d8a1e6cd2e794cd39976e9756e0c85ac66 # Bulk-replace smile emojis with unicorns
57+
# d53974df11dbc22cbea9dc7dcbc9896c25979a27 # Replace double with single quotes
58+
# ... <rest of the list>
59+
# # END https://github.com/sanitizers/octomachinery/issues/1
60+
# - Only put full 40-character hashes on this list (not short hashes
61+
# or any other revision reference).
62+
# - Append to the bottom of the file, regardless of the chronological
63+
# order of the revisions. Revisions within blocks should be in
64+
# chronological order from oldest to newest.
65+
# - Because you must use a hash, you need to append to this list in a
66+
# follow-up PR to the actual reformatting PR that you are trying to
67+
# ignore. This approach helps avoid issues with arbitrary rebases
68+
# and squashes while the pull request is in progress.
69+
70+
23928fbf8511697c915c3231977ee254bd3fa0c2 # chore(linters): Apply ruff-format

.github/CODEOWNERS

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -1 +1 @@
1-
* @maxymvlasov @yermulnik
1+
* @maxymvlasov @yermulnik @antonbabenko

.github/CONTRIBUTING.md

Lines changed: 14 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -1,5 +1,6 @@
11
# Notes for contributors
22

3+
* [Configure `git blame` to ignore formatting commits](#configure-git-blame-to-ignore-formatting-commits)
34
* [Run and debug hooks locally](#run-and-debug-hooks-locally)
45
* [Run hook performance test](#run-hook-performance-test)
56
* [Run via BASH](#run-via-bash)
@@ -13,6 +14,11 @@
1314
* [Add code](#add-code)
1415
* [Finish with the documentation](#finish-with-the-documentation)
1516
* [Contributing to Python code](#contributing-to-python-code)
17+
* [Run tests in your fork](#run-tests-in-your-fork)
18+
19+
## Configure `git blame` to ignore formatting commits
20+
21+
This project uses `.git-blame-ignore-revs` to exclude formatting-related commits from `git blame` history. To configure your local `git blame` to ignore these commits, refer to the [.git-blame-ignore-revs](/.git-blame-ignore-revs) file for details.
1622

1723
## Run and debug hooks locally
1824

@@ -182,3 +188,11 @@ You can use [this PR](https://github.com/antonbabenko/pre-commit-terraform/pull/
182188
```bash
183189
tox list
184190
```
191+
192+
## Run tests in your fork
193+
194+
Go to your fork's `Actions` tab and click the big green button.
195+
196+
![Enable workflows](/assets/contributing/enable_actions_in_fork.png)
197+
198+
Now you can verify that the tests pass before submitting your PR.

.github/SECURITY.md

Lines changed: 22 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,22 @@
1+
# Reporting a Vulnerability
2+
3+
If you believe you have discovered a potential security vulnerability in this project, please report it securely. **Do not create a public GitHub issue for any security concerns.**
4+
5+
## How to Report
6+
7+
Send an email with a detailed description of the vulnerability, including any evidence of the disclosure, the impact, and any timelines related to the issue to: [[email protected]](mailto:[email protected])
8+
9+
## Vulnerability Disclosure Process
10+
11+
- **Confidential Disclosure:** All vulnerability reports will be kept confidential until a fix is developed and verified.
12+
- **Assessment and Response:** We aim to acknowledge any valid report within 15 business days.
13+
- **Timelines:** After verification, we plan to have a coordinated disclosure within 60 days, though this may vary depending on the complexity of the fix.
14+
- **Communication:** We will work directly with the vulnerability reporter to clarify details, answer questions, and discuss potential mitigations.
15+
- **Updates:** We may provide periodic updates on the progress of the remediation of the reported vulnerability.
16+
17+
## Guidelines
18+
19+
- **Vulnerability Definition:** A vulnerability is any flaw or weakness in this project that can be exploited to compromise system security.
20+
- **Disclosure Expectations:** When you report a vulnerability, please include as much detail as possible to allow us to assess its validity and scope without exposing sensitive information publicly.
21+
22+
By following this process, you help us improve the security of our project while protecting users and maintainers. We appreciate your efforts to responsibly disclose vulnerabilities.

.github/renovate.json5

Lines changed: 11 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -1,6 +1,16 @@
11
{
22
$schema: "https://docs.renovatebot.com/renovate-schema.json",
3-
extends: ["local>SpotOnInc/renovate-config"],
3+
extends: [
4+
"local>SpotOnInc/renovate-config",
5+
// Automerge patch and minor upgrades if they pass tests. | https://docs.renovatebot.com/presets-default/#automergeminor
6+
":automergeMinor",
7+
// Require all status checks to pass before any automerging. | https://docs.renovatebot.com/presets-default/#automergerequireallstatuschecks
8+
":automergeRequireAllStatusChecks",
9+
// Automerge digest upgrades if they pass tests. | https://docs.renovatebot.com/presets-default/#automergedigest
10+
":automergeDigest",
11+
// Raise a PR first before any automerging. | https://docs.renovatebot.com/presets-default/#automergepr
12+
":automergePr",
13+
],
414
// To make happy 'Validate PR title' GHA
515
commitMessageLowerCase: "never",
616
// Disable auto-rebase on every commit to avoid reaching Github limits on macos runners

.github/workflows/build-image-test.yaml

Lines changed: 9 additions & 8 deletions
Original file line numberDiff line numberDiff line change
@@ -1,6 +1,7 @@
11
name: Build Dockerfile if changed and run smoke tests
22

33
on:
4+
merge_group:
45
pull_request:
56

67
permissions:
@@ -38,14 +39,14 @@ jobs:
3839

3940
- name: Get changed Docker related files
4041
id: changed-files-specific
41-
uses: tj-actions/changed-files@dcc7a0cba800f454d79fff4b993e8c3555bcc0a8 # v45.0.7
42+
uses: tj-actions/changed-files@ed68ef82c095e0d48ec87eccea555d944a631a4c # v46.0.5
4243
with:
4344
files: |
44-
Dockerfile
4545
.dockerignore
46-
tools/entrypoint.sh
4746
.github/workflows/build-image-test.yaml
48-
tools/*.sh
47+
Dockerfile
48+
tools/entrypoint.sh
49+
tools/install/*.sh
4950
5051
- name: Set IMAGE environment variable
5152
if: steps.changed-files-specific.outputs.any_changed == 'true'
@@ -56,12 +57,12 @@ jobs:
5657
>> $GITHUB_ENV
5758
5859
- name: Set up Docker Buildx
59-
uses: docker/setup-buildx-action@f7ce87c1d6bead3e36075b2ce75da1f6cc28aaca # v3.9.0
60+
uses: docker/setup-buildx-action@b5ca514318bd6ebac0fb2aedd5d36ec1b5c232a2 # v3.10.0
6061
if: steps.changed-files-specific.outputs.any_changed == 'true'
6162

6263
- name: Build if Dockerfile changed
6364
if: steps.changed-files-specific.outputs.any_changed == 'true'
64-
uses: docker/build-push-action@ca877d9245402d1537745e0e356eab47c3520991 # v6.13.0
65+
uses: docker/build-push-action@263435318d21b8e681c14492fe198d362a7d2c83 # v6.18.0
6566
with:
6667
context: .
6768
build-args: |
@@ -100,7 +101,7 @@ jobs:
100101
101102
- name: Dive - check image for waste files
102103
if: steps.changed-files-specific.outputs.any_changed == 'true'
103-
uses: MaxymVlasov/dive-action@b6a02b38f0f309e8817199658eab090d4f0f93ce # v1.1.0
104+
uses: MaxymVlasov/dive-action@43dafd0015826beaca5110157c9262c5dc10672a # v1.4.0
104105
with:
105106
image: ${{ env.IMAGE }}
106107
config-file: ${{ github.workspace }}/.github/.dive-ci.yaml
@@ -112,7 +113,7 @@ jobs:
112113
if: >-
113114
steps.changed-files-specific.outputs.any_changed == 'true'
114115
&& matrix.os == 'ubuntu-latest'
115-
uses: docker/build-push-action@ca877d9245402d1537745e0e356eab47c3520991 # v6.13.0
116+
uses: docker/build-push-action@263435318d21b8e681c14492fe198d362a7d2c83 # v6.18.0
116117
with:
117118
context: .
118119
build-args: |

.github/workflows/build-image.yaml

Lines changed: 5 additions & 5 deletions
Original file line numberDiff line numberDiff line change
@@ -22,9 +22,9 @@ jobs:
2222
- name: Checkout code
2323
uses: actions/checkout@11bd71901bbe5b1630ceea73d27597364c9af683 # v4.2.2
2424
- name: Set up Docker Buildx
25-
uses: docker/setup-buildx-action@f7ce87c1d6bead3e36075b2ce75da1f6cc28aaca # v3.9.0
25+
uses: docker/setup-buildx-action@b5ca514318bd6ebac0fb2aedd5d36ec1b5c232a2 # v3.10.0
2626
- name: Login to GitHub Container Registry
27-
uses: docker/login-action@9780b0c442fbb1117ed29e0efdff1e18412f7567 # v3.3.0
27+
uses: docker/login-action@74a5d142397b4f367a81961eba4e8cd7edddf772 # v3.4.0
2828
with:
2929
registry: ghcr.io
3030
username: ${{ github.repository_owner }}
@@ -43,11 +43,11 @@ jobs:
4343
run: >-
4444
echo "IMAGE_REPO=ghcr.io/${GITHUB_REPOSITORY@L}" >> $GITHUB_ENV
4545
- name: Set up Docker Buildx
46-
uses: docker/setup-buildx-action@f7ce87c1d6bead3e36075b2ce75da1f6cc28aaca # v3.9.0
46+
uses: docker/setup-buildx-action@b5ca514318bd6ebac0fb2aedd5d36ec1b5c232a2 # v3.10.0
4747

4848
- name: Build and Push release
4949
if: github.event_name != 'schedule'
50-
uses: docker/build-push-action@ca877d9245402d1537745e0e356eab47c3520991 # v6.13.0
50+
uses: docker/build-push-action@263435318d21b8e681c14492fe198d362a7d2c83 # v6.18.0
5151
with:
5252
context: .
5353
build-args: |
@@ -64,7 +64,7 @@ jobs:
6464
6565
- name: Build and Push nightly
6666
if: github.event_name == 'schedule'
67-
uses: docker/build-push-action@ca877d9245402d1537745e0e356eab47c3520991 # v6.13.0
67+
uses: docker/build-push-action@263435318d21b8e681c14492fe198d362a7d2c83 # v6.18.0
6868
with:
6969
context: .
7070
build-args: |

0 commit comments

Comments
 (0)