Skip to content

Commit 00ccab7

Browse files
DavidKorczynskiDavidKorczynski
authored
Merge branch 'master' into fix-ruby
2 parents 63fd43f + 33223ed commit 00ccab7

File tree

15 files changed

+107
-28
lines changed

15 files changed

+107
-28
lines changed

‎.github/workflows/ubuntu_version_sync.yml‎

Lines changed: 17 additions & 13 deletions
Original file line numberDiff line numberDiff line change
@@ -14,15 +14,19 @@
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'
2832
uses: actions/checkout@v4
@@ -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

‎infra/ci/check_base_os.py‎

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -28,7 +28,7 @@
2828
SUPPORTED_VERSIONS = [
2929
'legacy',
3030
# 'ubuntu-20-04',
31-
# 'ubuntu-24-04',
31+
'ubuntu-24-04',
3232
]
3333

3434
# A map from the base_os_version in project.yaml to the expected Dockerfile

‎infra/presubmit.py‎

Lines changed: 1 addition & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -104,6 +104,7 @@ class ProjectYamlChecker:
104104
'view_restrictions',
105105
'file_github_issue',
106106
'indexer', # Flags specific to infra/indexer.
107+
'base_os_version',
107108
]
108109

109110
REQUIRED_SECTIONS = ['main_repo']

‎projects/bind9/build.sh‎

Lines changed: 7 additions & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -20,10 +20,13 @@ export CXXFLAGS="${CXXFLAGS} -fPIC -Wl,--allow-multiple-definition"
2020

2121
git apply --ignore-space-change --ignore-whitespace $SRC/patch.diff
2222

23-
meson setup build -Dfuzzing=oss-fuzz -Dcmocka=enabled \
24-
-Dc_link_args="$CFLAGS" -Dcpp_link_args="$CXXFLAGS" \
25-
-Dc_args="$CFLAGS" -Dcpp_args="$CXXFLAGS" \
26-
-Ddefault_library=static -Dprefer_static=true
23+
# Use valid value for -Dfuzzing (enabled/disabled/auto)
24+
meson setup build -Dfuzzing=enabled -Dcmocka=enabled \
25+
-Dc_link_args="$CFLAGS" -Dcpp_link_args="$CXXFLAGS" \
26+
-Dc_args="$CFLAGS" -Dcpp_args="$CXXFLAGS" \
27+
-Ddefault_library=static -Dprefer_static=true \
28+
-Db_lto=false \
29+
-Dnamed-lto=off
2730
meson compile -C build fuzz_dns_master_load fuzz_dns_message_checksig fuzz_dns_message_parse fuzz_dns_name_fromtext_target fuzz_dns_name_fromwire fuzz_dns_qp fuzz_dns_qpkey_name fuzz_dns_rdata_fromtext fuzz_dns_rdata_fromwire_text fuzz_isc_lex_getmastertoken fuzz_isc_lex_gettoken --verbose
2831

2932
for fuzzname in fuzz_dns_master_load fuzz_dns_message_checksig fuzz_dns_message_parse fuzz_dns_name_fromtext_target fuzz_dns_name_fromwire fuzz_dns_qp fuzz_dns_qpkey_name fuzz_dns_rdata_fromtext fuzz_dns_rdata_fromwire_text fuzz_isc_lex_getmastertoken fuzz_isc_lex_gettoken; do

‎projects/bind9/project.yaml‎

Lines changed: 0 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -12,7 +12,6 @@ auto_ccs:
1212
- "pspacek@isc.org"
1313
sanitizers:
1414
- address
15-
- undefined
1615
main_repo: 'https://gitlab.isc.org/isc-projects/bind9.git'
1716

1817
fuzzing_engines:

‎projects/bios-bmc-smm-error-logger/Dockerfile‎

Lines changed: 27 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,27 @@
1+
# Copyright 2016 Google Inc.
2+
#
3+
# Licensed under the Apache License, Version 2.0 (the "License");
4+
# you may not use this file except in compliance with the License.
5+
# You may obtain a copy of the License at
6+
#
7+
# http://www.apache.org/licenses/LICENSE-2.0
8+
#
9+
# Unless required by applicable law or agreed to in writing, software
10+
# distributed under the License is distributed on an "AS IS" BASIS,
11+
# WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
12+
# See the License for the specific language governing permissions and
13+
# limitations under the License.
14+
#
15+
################################################################################
16+
17+
FROM gcr.io/oss-fuzz-base/base-builder:ubuntu-24-04
18+
19+
RUN apt-get update && apt-get install --reinstall -y patchelf libboost-all-dev git python3-pip python3-venv libmount-dev libcap-dev gperf vim clang-18 libc++-18-dev lsb-release wget software-properties-common gnupg systemd make pkg-config libsystemd-dev libfmt-dev cmake ninja-build
20+
RUN python3 -m venv /env && . /env/bin/activate && pip install meson mako inflection pyyaml jinja2 jsonschema
21+
22+
ENV CC=clang-18
23+
ENV CXX=clang++-18
24+
25+
RUN git clone --branch fuzzing https://github.com/javanlacerda/bios-bmc-smm-error-logger
26+
COPY build.sh $SRC/
27+
WORKDIR $SRC/bios-bmc-smm-error-logger

‎projects/bios-bmc-smm-error-logger/build.sh‎

Lines changed: 28 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,28 @@
1+
#!/bin/bash -eu
2+
# Copyright 2025 Google LLC
3+
#
4+
# Licensed under the Apache License, Version 2.0 (the "License");
5+
# you may not use this file except in compliance with the License.
6+
# You may obtain a copy of the License at
7+
#
8+
# http://www.apache.org/licenses/LICENSE-2.0
9+
#
10+
# Unless required by applicable law or agreed to in writing, software
11+
# distributed under the License is distributed on an "AS IS" BASIS,
12+
# WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
13+
# See the License for the specific language governing permissions and
14+
# limitations under the License.
15+
#
16+
################################################################################
17+
18+
unset CFLAGS
19+
unset CXXFLAGS
20+
unset RUSTFLAGS
21+
22+
rm -rf $OUT/*
23+
24+
source /env/bin/activate
25+
meson setup build -Ddefault_library=static -Dtests=disabled -Dcpp_std=c++23 -Dread-interval-ms=10000 -Dmemory-region-size=1048576 -Dmemory-region-offset=3220176896 -Dbmc-interface-version=3 -Dqueue-region-size=16384 -Due-region-size=768 -Dmagic-number-byte1=2319403398 -Dmagic-number-byte2=1343703436 -Dmagic-number-byte3=2173375339 -Dmagic-number-byte4=3360702380 --buildtype=debug -Dfuzzing=true -Dcpp_args="-stdlib=libstdc++"
26+
ninja -C build
27+
28+
cp build/src/bios-bmc-smm-error-logger_fuzzer $OUT

‎projects/bios-bmc-smm-error-logger/project.yaml‎

Lines changed: 13 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,13 @@
1+
homepage: "https://github.com/openbmc/docs/blob/master/designs/bios-bmc-smm-error-logging.md"
2+
language: c++
3+
primary_contact: "javanlacerda@google.com"
4+
auto_ccs:
5+
- pedroysb@google.com
6+
7+
main_repo: "https://github.com/javanlacerda/bios-bmc-smm-error-logger"
8+
fuzzing_engines:
9+
- libfuzzer
10+
sanitizers:
11+
- address
12+
13+
base_os_version: ubuntu-24-04

‎projects/graphicsfuzz-spirv/Dockerfile‎

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -14,7 +14,7 @@
1414
#
1515
################################################################################
1616

17-
FROM gcr.io/oss-fuzz-base/base-builder
17+
FROM gcr.io/oss-fuzz-base/base-builder:ubuntu-24-04
1818
RUN apt-get update && apt-get install -y cmake ninja-build
1919

2020
RUN mkdir -p graphicsfuzz-spirv

‎projects/graphicsfuzz-spirv/project.yaml‎

Lines changed: 1 addition & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -1,4 +1,5 @@
11
homepage: "https://www.graphicsfuzz.com"
2+
base_os_version: ubuntu-24-04
23
language: c++
34
main_repo: "https://github.com/google/graphicsfuzz"
45
primary_contact: "afdx@google.com"

0 commit comments

Comments
 (0)