Skip to content

Commit 0ea0467

Browse files
roidelapluieroidelapluie
authored
Merge branch 'master' into prometheus_native_fuzz
2 parents c3f3ab7 + 583430e commit 0ea0467

File tree

1,032 files changed

+17140
-7391
lines changed

Some content is hidden

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

1,032 files changed

+17140
-7391
lines changed

‎.github/workflows/check_base_os.yml‎

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -26,7 +26,7 @@ jobs:
2626
runs-on: ubuntu-latest
2727
steps:
2828
- name: Checkout repository
29-
uses: actions/checkout@v4
29+
uses: actions/checkout@v6
3030
with:
3131
fetch-depth: 0 # Fetch all history to compare with main
3232

@@ -42,7 +42,7 @@ jobs:
4242
echo "changed_dirs=${CHANGED_DIRS}" >> $GITHUB_OUTPUT
4343
4444
- name: Set up Python
45-
uses: actions/setup-python@v5
45+
uses: actions/setup-python@v6
4646
with:
4747
python-version: '3.x'
4848

‎.github/workflows/codeql-analysis.yml‎

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -23,7 +23,7 @@ jobs:
2323

2424
steps:
2525
- name: Checkout repository
26-
uses: actions/checkout@v4
26+
uses: actions/checkout@v6
2727

2828
# Initializes the CodeQL tools for scanning.
2929
- name: Initialize CodeQL

‎.github/workflows/index_build_tests.yml‎

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -18,14 +18,14 @@ jobs:
1818
group: ${{ github.workflow }}-${{ github.ref }}
1919
cancel-in-progress: true
2020
steps:
21-
- uses: actions/checkout@v4
21+
- uses: actions/checkout@v6
2222
with: # Needed for git diff to work. (get_changed_files)
2323
fetch-depth: 0
2424
- run: |
2525
git symbolic-ref refs/remotes/origin/HEAD refs/remotes/origin/master
2626
2727
- name: Setup python environment
28-
uses: actions/setup-python@v5
28+
uses: actions/setup-python@v6
2929
with:
3030
python-version: 3.11
3131

‎.github/workflows/indexer_build.yml‎

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -18,7 +18,7 @@ jobs:
1818
group: ${{ github.workflow }}-${{ github.ref }}
1919
cancel-in-progress: true
2020
steps:
21-
- uses: actions/checkout@v4
21+
- uses: actions/checkout@v6
2222
with: # Needed for git diff to work. (get_changed_files)
2323
fetch-depth: 0
2424
- run: |

‎.github/workflows/infra_tests.yml‎

Lines changed: 4 additions & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -18,20 +18,20 @@ jobs:
1818
group: ${{ github.workflow }}-${{ github.ref }}
1919
cancel-in-progress: true
2020
steps:
21-
- uses: actions/checkout@v4
21+
- uses: actions/checkout@v6
2222
with: # Needed for git diff to work. (get_changed_files)
2323
fetch-depth: 0
2424
- run: |
2525
git symbolic-ref refs/remotes/origin/HEAD refs/remotes/origin/master
2626
2727
- name: Setup python environment
28-
uses: actions/setup-python@v5
28+
uses: actions/setup-python@v6
2929
with:
3030
python-version: 3.11
3131

3232
# For gcloud emulators.
3333
- name: Setup Java environment
34-
uses: actions/setup-java@v4
34+
uses: actions/setup-java@v5
3535
with:
3636
java-version: '21'
3737
distribution: 'temurin'
@@ -43,7 +43,7 @@ jobs:
4343
sudo env "PATH=$PATH" pip install -r infra/build/functions/requirements.txt
4444
sudo env "PATH=$PATH" pip install -r infra/cifuzz/requirements.txt
4545
46-
- uses: google-github-actions/setup-gcloud@v2
46+
- uses: google-github-actions/setup-gcloud@v3
4747
with:
4848
version: '523.0.0'
4949
- run: |

‎.github/workflows/pr_helper.yml‎

Lines changed: 5 additions & 5 deletions
Original file line numberDiff line numberDiff line change
@@ -16,9 +16,9 @@ jobs:
1616
pull-requests: write
1717

1818
steps:
19-
- uses: actions/checkout@v4
19+
- uses: actions/checkout@v6
2020
- name: Setup python environment
21-
uses: actions/setup-python@v5
21+
uses: actions/setup-python@v6
2222
with:
2323
python-version: 3.11
2424
cache: pip
@@ -31,7 +31,7 @@ jobs:
3131
pip install -r infra/ci/requirements.txt
3232
3333
- name: setup go environment
34-
uses: actions/setup-go@v5
34+
uses: actions/setup-go@v6
3535
with:
3636
go-version: 'stable'
3737
- run: go install github.com/ossf/criticality_score/cmd/criticality_score@latest
@@ -46,7 +46,7 @@ jobs:
4646

4747
- name: Leave comments
4848
if: env.IS_INTERNAL == 'FALSE'
49-
uses: actions/github-script@v7
49+
uses: actions/github-script@v8
5050
with:
5151
github-token: ${{secrets.GITHUB_TOKEN}}
5252
script: |
@@ -59,7 +59,7 @@ jobs:
5959
6060
- name: Add labels for valid PR
6161
if: env.IS_READY_FOR_MERGE == 'True'
62-
uses: actions/github-script@v7
62+
uses: actions/github-script@v8
6363
with:
6464
script: |
6565
github.rest.issues.addLabels({

‎.github/workflows/presubmit.yml‎

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -18,14 +18,14 @@ jobs:
1818
cancel-in-progress: true
1919
steps:
2020

21-
- uses: actions/checkout@v4
21+
- uses: actions/checkout@v6
2222
with: # Needed for git diff to work. (get_changed_files)
2323
fetch-depth: 0
2424
- run: |
2525
git symbolic-ref refs/remotes/origin/HEAD refs/remotes/origin/master
2626
2727
- name: Setup python environment
28-
uses: actions/setup-python@v5
28+
uses: actions/setup-python@v6
2929
with:
3030
python-version: 3.11
3131
cache: pip

‎.github/workflows/project_tests.yml‎

Lines changed: 2 additions & 5 deletions
Original file line numberDiff line numberDiff line change
@@ -41,9 +41,6 @@ jobs:
4141
- engine: none
4242
sanitizer: address
4343
architecture: x86_64
44-
- engine: wycheproof
45-
sanitizer: none
46-
architecture: x86_64
4744
- engine: centipede
4845
sanitizer: address
4946
architecture: x86_64
@@ -56,7 +53,7 @@ jobs:
5653
ARCHITECTURE: ${{ matrix.architecture }}
5754

5855
steps:
59-
- uses: actions/checkout@v4
56+
- uses: actions/checkout@v6
6057
with: # Needed for git diff to work. (get_changed_files)
6158
fetch-depth: 0
6259
- run: |
@@ -74,7 +71,7 @@ jobs:
7471
sudo bash -c '(ionice -c 3 nice -n 19 rm -rf /usr/share/dotnet/ /usr/local/graalvm/ /usr/local/.ghcup/ /usr/local/share/powershell /usr/local/share/chromium /usr/local/lib/android /usr/local/lib/node_modules)&'
7572
7673
- name: Setup python environment
77-
uses: actions/setup-python@v5
74+
uses: actions/setup-python@v6
7875
with:
7976
python-version: 3.11
8077
cache: pip

‎.github/workflows/ubuntu_version_sync.yml‎

Lines changed: 18 additions & 14 deletions
Original file line numberDiff line numberDiff line change
@@ -14,18 +14,22 @@
1414
#
1515
################################################################################
1616

17-
name: 'Ubuntu Version Sync'
17+
name: 'Ubuntu Version Sync Check'
1818

1919
on:
2020
pull_request:
2121
types: [opened, synchronize, reopened]
2222

2323
jobs:
2424
check-sync:
25+
name: Ubuntu File Synchronization Check
2526
runs-on: ubuntu-latest
27+
env:
28+
BASE_SHA: ${{ github.event.pull_request.base.sha }}
29+
HEAD_SHA: ${{ github.event.pull_request.head.sha }}
2630
steps:
2731
- name: 'Checkout code'
28-
uses: actions/checkout@v4
32+
uses: actions/checkout@v6
2933
with:
3034
# Fetch all history so we can diff against the base branch.
3135
fetch-depth: 0
@@ -34,7 +38,7 @@ jobs:
3438
run: |
3539
set -e
3640
37-
MODIFIED_FILES=$(git diff --name-only ${{ github.event.pull_request.base.sha }}...${{ github.event.pull_request.head.sha }})
41+
MODIFIED_FILES=$(git diff --name-only $BASE_SHA...$HEAD_SHA)
3842
echo "Checking for synchronized file changes..."
3943
echo "Modified files in this PR:"
4044
echo "$MODIFIED_FILES"
@@ -63,27 +67,27 @@ jobs:
6367
VERSIONS=("ubuntu-20-04" "ubuntu-24-04")
6468
6569
# Check Dockerfiles
66-
for legacy_file in "${{!LEGACY_DOCKERFILES[@]}}"; do
67-
if echo "$MODIFIED_FILES" | grep -q "^${legacy_file}$"; then
70+
for legacy_file in "${!LEGACY_DOCKERFILES[@]}"; do
71+
if [[ "${legacy_file}" == infra/* ]] && echo "$MODIFIED_FILES" | grep -q "^${legacy_file}$"; then
6872
echo "Legacy file changed: $legacy_file. Verifying counterparts..."
69-
for version in "${{VERSIONS[@]}}"; do
70-
pattern=${{LEGACY_DOCKERFILES[$legacy_file]}}
71-
versioned_file="${{pattern/{{version}}/$version}}"
72-
if ! echo "$MODIFIED_FILES" | grep -q "^${{versioned_file}}$"; then
73+
for version in "${VERSIONS[@]}"; do
74+
pattern="${LEGACY_DOCKERFILES[$legacy_file]}"
75+
versioned_file="${pattern/\{version\}/$version}"
76+
if ! echo "$MODIFIED_FILES" | grep -q "^${versioned_file}$"; then
7377
ERRORS+="\n- Legacy file '${legacy_file}' was changed, but its counterpart '${versioned_file}' was not."
7478
fi
7579
done
7680
fi
7781
done
7882
7983
# Check Scripts
80-
for legacy_file in "${{!LEGACY_SCRIPTS[@]}}"; do
84+
for legacy_file in "${!LEGACY_SCRIPTS[@]}"; do
8185
if echo "$MODIFIED_FILES" | grep -q "^${legacy_file}$"; then
8286
echo "Legacy script changed: $legacy_file. Verifying counterparts..."
83-
for version in "${{VERSIONS[@]}}"; do
84-
pattern=${{LEGACY_SCRIPTS[$legacy_file]}}
85-
versioned_file="${{pattern/{{version}}/$version}}"
86-
if ! echo "$MODIFIED_FILES" | grep -q "^${{versioned_file}}$"; then
87+
for version in "${VERSIONS[@]}"; do
88+
pattern="${LEGACY_SCRIPTS[$legacy_file]}"
89+
versioned_file="${pattern/\{version\}/$version}"
90+
if ! echo "$MODIFIED_FILES" | grep -q "^${versioned_file}$"; then
8791
ERRORS+="\n- Legacy script '${legacy_file}' was changed, but its counterpart '${versioned_file}' was not."
8892
fi
8993
done

‎.gitignore‎

Lines changed: 3 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -12,3 +12,6 @@ infra/base-images/base-builder/indexer/fuzzing_engine.a
1212
# IntelliJ IDEA
1313
/.idea
1414
**/*.iml
15+
16+
# Chronos
17+
ccaches/

0 commit comments

Comments
 (0)