Skip to content

Commit 52e0df2

Browse files
MarkoMinMarkoMin
authored
Merge branch 'maint' into fix/logger/get_handler_config
2 parents e9e342f + 9efd029 commit 52e0df2

File tree

7,431 files changed

+402085
-167320
lines changed

Some content is hidden

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

7,431 files changed

+402085
-167320
lines changed

‎.devcontainer/devcontainer.json‎

Lines changed: 20 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -1,3 +1,23 @@
1+
// %CopyrightBegin%
2+
//
3+
// SPDX-License-Identifier: Apache-2.0
4+
//
5+
// Copyright Ericsson AB 2021-2025. All Rights Reserved.
6+
//
7+
// Licensed under the Apache License, Version 2.0 (the "License");
8+
// you may not use this file except in compliance with the License.
9+
// You may obtain a copy of the License at
10+
//
11+
// http://www.apache.org/licenses/LICENSE-2.0
12+
//
13+
// Unless required by applicable law or agreed to in writing, software
14+
// distributed under the License is distributed on an "AS IS" BASIS,
15+
// WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
16+
// See the License for the specific language governing permissions and
17+
// limitations under the License.
18+
//
19+
// %CopyrightEnd%
20+
121
// For format details, see https://aka.ms/devcontainer.json. For config options, see the README at:
222
// https://github.com/microsoft/vscode-dev-containers/tree/v0.194.0/containers/cpp
323
{

‎.dir-locals.el‎

Lines changed: 20 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -1,3 +1,23 @@
1+
;; %CopyrightBegin%
2+
;;
3+
;; SPDX-License-Identifier: Apache-2.0
4+
;;
5+
;; Copyright Ericsson AB 2017-2025. All Rights Reserved.
6+
;;
7+
;; Licensed under the Apache License, Version 2.0 (the "License");
8+
;; you may not use this file except in compliance with the License.
9+
;; You may obtain a copy of the License at
10+
;;
11+
;; http://www.apache.org/licenses/LICENSE-2.0
12+
;;
13+
;; Unless required by applicable law or agreed to in writing, software
14+
;; distributed under the License is distributed on an "AS IS" BASIS,
15+
;; WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
16+
;; See the License for the specific language governing permissions and
17+
;; limitations under the License.
18+
;;
19+
;; %CopyrightEnd%
20+
121
;; Project-wide Emacs settings
222
(
323
(erlang-mode (indent-tabs-mode . nil))

‎.editorconfig‎

Lines changed: 20 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -1,3 +1,23 @@
1+
;; %CopyrightBegin%
2+
;;
3+
;; SPDX-License-Identifier: Apache-2.0
4+
;;
5+
;; Copyright Ericsson AB 2021-2025. All Rights Reserved.
6+
;;
7+
;; Licensed under the Apache License, Version 2.0 (the "License");
8+
;; you may not use this file except in compliance with the License.
9+
;; You may obtain a copy of the License at
10+
;;
11+
;; http://www.apache.org/licenses/LICENSE-2.0
12+
;;
13+
;; Unless required by applicable law or agreed to in writing, software
14+
;; distributed under the License is distributed on an "AS IS" BASIS,
15+
;; WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
16+
;; See the License for the specific language governing permissions and
17+
;; limitations under the License.
18+
;;
19+
;; %CopyrightEnd%
20+
121
; This file is for unifying the coding style for different editors and IDEs.
222
; More information at http://EditorConfig.org
323
;

‎.elp.toml‎

Lines changed: 31 additions & 7 deletions
Original file line numberDiff line numberDiff line change
@@ -1,16 +1,40 @@
1-
# SPDX-License-Identifier: Apache-2.0
2-
# SPDX-FileCopyrightText: 2025 Ericsson and the Erlang/OTP contributors
1+
## %CopyrightBegin%
2+
##
3+
## SPDX-License-Identifier: Apache-2.0
4+
##
5+
## Copyright Ericsson AB 2025. All Rights Reserved.
6+
##
7+
## Licensed under the Apache License, Version 2.0 (the "License");
8+
## you may not use this file except in compliance with the License.
9+
## You may obtain a copy of the License at
10+
##
11+
## http://www.apache.org/licenses/LICENSE-2.0
12+
##
13+
## Unless required by applicable law or agreed to in writing, software
14+
## distributed under the License is distributed on an "AS IS" BASIS,
15+
## WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
16+
## See the License for the specific language governing permissions and
17+
## limitations under the License.
18+
##
19+
## %CopyrightEnd%
320

421
[build_info]
522
apps = [
623
"lib/*",
7-
{"name" = "erts", "dir" = "erts/preloaded", "src_dirs" = ["src"]},
8-
{"name" = "wx", "dir" = "lib/wx", "src_dirs" = ["src", "gen"]},
9-
{"name" = "inets", "dir" = "lib/inets", "src_dirs" = ["src/http_client", "src/http_server", "src/http_lib", "src/inets_app"]},
10-
{"name" = "common_test", "dir" = "lib/common_test", "src_dirs" = ["src", "test_server"]},
24+
{"name" = "erts", "dir" = "erts/preloaded", "src_dirs" = ["src"], "include_dirs" = ["../../lib/kernel/src", "../../lib/kernel/include"]},
25+
{"name" = "wx", "dir" = "lib/wx", "src_dirs" = ["src", "gen"], "include_dirs" = ["include"]},
26+
{"name" = "inets", "dir" = "lib/inets", "src_dirs" = ["src"], "include_dirs" = ["include", "src/inets_app", "src/http_lib"]},
27+
{"name" = "common_test", "dir" = "lib/common_test", "src_dirs" = ["src", "test_server"], "include_dirs" = ["include", "../snmp/include", "../kernel/include"]},
1128
# Due to some Erlang/OTP bootstrapping issues, `stdlib` modules such as `gen_server` includes headers from the kernel application
1229
# using a simple `-include` directive, causing ELP to fail resolving those inclusions.
1330
# Include kernel as an `include_dir` for `stdlib` to solve the issue
14-
{"name" = "stdlib", "dir" = "lib/stdlib", "include_dirs" = ["include", "../kernel/include"]},
31+
{"name" = "stdlib", "dir" = "lib/stdlib", "src_dirs" = ["src"], "include_dirs" = ["include", "../kernel/include"]},
32+
{"name" = "dialyzer", "dir" = "lib/dialyzer", "src_dirs" = ["src"], "extra_src_dirs" = ["test"], "macros" = {"VSN" = "DEFAULT_VSN"}},
33+
{"name" = "snmp", "dir" = "lib/snmp", "src_dirs" = ["src"], "extra_src_dirs" = ["test"], "include_dirs" = ["include", "src/misc", "src/compile", "src/app"], "macros" = {"default_verbosity"="silence", "version"="version"}},
34+
{"name" = "sasl", "dir" = "lib/sasl", "src_dirs" = ["src"], "extra_src_dirs" = ["test"], "include_dirs" = ["../stdlib/include"]},
35+
{"name" = "compiler", "dir" = "lib/compiler", "src_dirs" = ["src"], "extra_src_dirs" = ["test"], "include_dirs" = [ "../stdlib/include"], "macros" = {"COMPILER_VSN"="COMPILER_VSN"}},
36+
{"name" = "parsetools", "dir" = "lib/parsetools", "src_dirs" = ["src"], "extra_src_dirs" = ["test"], "include_dirs" = ["../stdlib/include"]},
37+
{"name" = "eldap", "dir" = "lib/eldap", "src_dirs" = ["src"], "extra_src_dirs" = ["test"], "include_dirs" = ["include", "ebin"]},
38+
{"name" = "observer", "dir" = "lib/observer", "src_dirs" = ["src"], "extra_src_dirs" = ["test"], "include_dirs" = ["include", "../et/include"]},
1539
]
1640
deps = []

‎.formatter.exs‎

Lines changed: 10 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,10 @@
1+
# %CopyrightBegin%
2+
#
3+
# SPDX-License-Identifier: Apache-2.0
4+
#
5+
# Copyright Ericsson AB 2025. All Rights Reserved.
6+
#
7+
# %CopyrightEnd%
8+
[
9+
inputs: ["**/*.exs", "**/*.ex"]
10+
]

‎.github/ISSUE_TEMPLATE/bug_report.md‎

Lines changed: 12 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -21,3 +21,15 @@ The OTP versions that are affected by this bug.
2121

2222
**Additional context**
2323
Add any other context about the problem here. If you wish to attach Erlang code you can either write it directly in the post using [code tags](https://guides.github.com/features/mastering-markdown/), create a [gist](https://gist.github.com), or attach it as a zip file to this post.
24+
25+
<!--
26+
27+
%CopyrightBegin%
28+
29+
SPDX-License-Identifier: Apache-2.0
30+
31+
Copyright Ericsson AB 2021-2025. All Rights Reserved.
32+
33+
%CopyrightEnd%
34+
35+
-->

‎.github/ISSUE_TEMPLATE/feature_request.md‎

Lines changed: 12 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -17,3 +17,15 @@ A clear and concise description of any alternative solutions or features you've
1717

1818
**Additional context**
1919
Add any other context or screenshots about the feature request here.
20+
21+
<!--
22+
23+
%CopyrightBegin%
24+
25+
SPDX-License-Identifier: Apache-2.0
26+
27+
Copyright Ericsson AB 2021-2025. All Rights Reserved.
28+
29+
%CopyrightEnd%
30+
31+
-->

‎.github/actions/build-base-image/action.yaml‎

Lines changed: 41 additions & 5 deletions
Original file line numberDiff line numberDiff line change
@@ -1,3 +1,23 @@
1+
# %CopyrightBegin%
2+
#
3+
# SPDX-License-Identifier: Apache-2.0
4+
#
5+
# Copyright Ericsson AB 2023-2025. All Rights Reserved.
6+
#
7+
# Licensed under the Apache License, Version 2.0 (the "License");
8+
# you may not use this file except in compliance with the License.
9+
# You may obtain a copy of the License at
10+
#
11+
# http://www.apache.org/licenses/LICENSE-2.0
12+
#
13+
# Unless required by applicable law or agreed to in writing, software
14+
# distributed under the License is distributed on an "AS IS" BASIS,
15+
# WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
16+
# See the License for the specific language governing permissions and
17+
# limitations under the License.
18+
#
19+
# %CopyrightEnd%
20+
121
name: Build Base Image
222
description: 'Builds the base testing image (using cache if possible)'
323

@@ -27,14 +47,14 @@ runs:
2747
run: echo "date=$(date +'%Y-%m-%d')" >> $GITHUB_OUTPUT
2848

2949
- name: Cache BASE image
30-
uses: actions/cache@5a3ec84eff668545956fd18022155c47e93e2684 # ratchet:actions/cache@v4.2.3
50+
uses: actions/cache@0400d5f644dc74513175e3cd8d07132dd4860809 # v4.2.4
3151
if: inputs.TYPE == '64-bit' || inputs.TYPE == 'clang'
3252
with:
3353
path: otp_docker_base.tar
3454
key: ${{ runner.os }}-${{ hashFiles('.github/dockerfiles/Dockerfile.ubuntu-base', '.github/scripts/build-base-image.sh') }}-${{ steps.date.outputs.date }}-${{ hashFiles('OTP_VERSION') }}
3555

3656
- name: Docker login
37-
uses: docker/login-action@74a5d142397b4f367a81961eba4e8cd7edddf772 # ratchet:docker/login-action@v3.4.0
57+
uses: docker/login-action@184bdaa0721073962dff0199f1fb9940f07167d1 # v3.5.0
3858
with:
3959
registry: ghcr.io
4060
username: ${{ github.repository_owner }}
@@ -45,17 +65,33 @@ runs:
4565
run: .github/scripts/build-base-image.sh "${{ inputs.BASE_BRANCH }}" "${{ inputs.TYPE }}"
4666

4767
- name: Cache pre-built src
68+
id: cache-src
4869
if: inputs.BUILD_IMAGE == 'true'
49-
uses: actions/cache@5a3ec84eff668545956fd18022155c47e93e2684 # ratchet:actions/cache@v4.2.3
70+
uses: actions/cache@0400d5f644dc74513175e3cd8d07132dd4860809 # v4.2.4
5071
with:
5172
path: otp_src.tar.gz
5273
key: prebuilt-src-${{ github.ref_name }}-${{ github.sha }}
74+
75+
- name: Download pre-built src
76+
if: inputs.BUILD_IMAGE == 'true' && steps.cache-src.outputs.cache-hit != 'true'
77+
uses: actions/download-artifact@d3f86a106a0bac45b974a628896c90dbdf5c8093 # ratchet:actions/download-artifact@v4
78+
with:
79+
name: otp_prebuilt
80+
5381
- name: Cache pre-built binaries
54-
if: inputs.BUILD_IMAGE == 'true'
55-
uses: actions/cache@5a3ec84eff668545956fd18022155c47e93e2684 # ratchet:actions/[email protected]
82+
id: cache-binary
83+
if: inputs.BUILD_IMAGE == 'true' && steps.cache-src.outputs.cache-hit == 'true'
84+
uses: actions/cache@0400d5f644dc74513175e3cd8d07132dd4860809 # v4.2.4
5685
with:
5786
path: otp_cache.tar.gz
5887
key: prebuilt-cache-${{ inputs.TYPE }}-${{ github.ref_name }}-${{ github.sha }}
88+
89+
- name: Download pre-built binaries
90+
if: inputs.BUILD_IMAGE == 'true' && steps.cache-binary.outputs.cache-hit != 'true'
91+
uses: actions/download-artifact@d3f86a106a0bac45b974a628896c90dbdf5c8093 # ratchet:actions/download-artifact@v4
92+
with:
93+
name: otp_prebuilt
94+
5995
- name: Build image
6096
if: inputs.BUILD_IMAGE == 'true'
6197
shell: bash -eo pipefail {0}

‎.github/actions/ossf-compiler-flags-scanner/action.yaml‎

Lines changed: 62 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,62 @@
1+
# %CopyrightBegin%
2+
#
3+
# SPDX-License-Identifier: Apache-2.0
4+
#
5+
# Copyright Ericsson AB 2024-2025. All Rights Reserved.
6+
#
7+
# Licensed under the Apache License, Version 2.0 (the "License");
8+
# you may not use this file except in compliance with the License.
9+
# You may obtain a copy of the License at
10+
#
11+
# http://www.apache.org/licenses/LICENSE-2.0
12+
#
13+
# Unless required by applicable law or agreed to in writing, software
14+
# distributed under the License is distributed on an "AS IS" BASIS,
15+
# WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
16+
# See the License for the specific language governing permissions and
17+
# limitations under the License.
18+
#
19+
# %CopyrightEnd%
20+
21+
name: Open Source Security Foundation
22+
23+
inputs:
24+
upload:
25+
description: 'Upload sarif results using codeql'
26+
default: false
27+
28+
runs:
29+
using: composite
30+
steps:
31+
- uses: actions/checkout@11bd71901bbe5b1630ceea73d27597364c9af683 # ratchet:actions/[email protected]
32+
with:
33+
repository: ossf/wg-best-practices-os-developers
34+
sparse-checkout: docs/Compiler-Hardening-Guides/compiler-options-scraper
35+
path: ossf
36+
37+
- name: Setup compiler options scraper
38+
shell: bash -eo pipefail {0}
39+
run: |
40+
pip3 install -r ossf/docs/Compiler-Hardening-Guides/compiler-options-scraper/requirements.txt
41+
python3 ossf/docs/Compiler-Hardening-Guides/compiler-options-scraper/main.py
42+
cat compiler-options.json
43+
44+
- name: Run compiler flag comparison
45+
shell: bash -eo pipefail {0}
46+
run: |
47+
docker run -v `pwd`/.github/scripts:/github --entrypoint "" otp \
48+
bash -c "/github/ossf-sarif-generator.es '$(cat compiler-options.json)'" > results.sarif
49+
50+
- name: "Upload artifact"
51+
if: ${{ !cancelled() }}
52+
uses: actions/upload-artifact@ea165f8d65b6e75b540449e92b4886f43607fa02 # ratchet:actions/[email protected]
53+
with:
54+
name: SARIF file
55+
path: results.sarif
56+
57+
# Upload the results to GitHub's code scanning dashboard.
58+
- name: "Upload to code-scanning"
59+
if: ${{ !cancelled() && inputs.upload == 'true' }}
60+
uses: github/codeql-action/upload-sarif@ff0a06e83cb2de871e5a09832bc6a81e7276941f # ratchet:github/codeql-action/[email protected]
61+
with:
62+
sarif_file: results.sarif

‎.github/dockerfiles/init.sh‎ renamed to ‎.github/dockerfiles/.profile‎

Lines changed: 12 additions & 12 deletions
Original file line numberDiff line numberDiff line change
@@ -2,7 +2,9 @@
22

33
## %CopyrightBegin%
44
##
5-
## Copyright Ericsson AB 2024. All Rights Reserved.
5+
## SPDX-License-Identifier: Apache-2.0
6+
##
7+
## Copyright Ericsson AB 2024-2025. All Rights Reserved.
68
##
79
## Licensed under the Apache License, Version 2.0 (the "License");
810
## you may not use this file except in compliance with the License.
@@ -18,22 +20,20 @@
1820
##
1921
## %CopyrightEnd%
2022

21-
if [ -f "/buildroot/env.sh" ]; then
22-
. "/buildroot/env.sh"
23-
fi
23+
## Only run this initialization once
24+
if [ ! -d /var/run/sshd ]; then
25+
sudo mkdir -p -m0755 /var/run/sshd
2426

25-
sudo mkdir -p -m0755 /var/run/sshd
27+
sudo /usr/sbin/sshd
2628

27-
sudo /usr/sbin/sshd
29+
sudo service postgresql start
2830

29-
sudo service postgresql start
31+
sudo -E bash -c "apt-get update && apt-get install -y linux-tools-common linux-tools-generic"
32+
sudo -E bash -c "apt-get install -y linux-tools-$(uname -r)" || true
3033

31-
sudo -E bash -c "apt-get update && apt-get install -y linux-tools-common linux-tools-generic"
32-
sudo -E bash -c "apt-get install -y linux-tools-$(uname -r)" || true
34+
sudo bash -c "Xvfb :99 -ac -screen 0 1920x1080x24 -nolisten tcp" &
35+
fi
3336

34-
sudo bash -c "Xvfb :99 -ac -screen 0 1920x1080x24 -nolisten tcp" &
3537
export DISPLAY=:99
3638

3739
PATH="$PATH:$(ls -1d /usr/local/lib/erlang-*/bin | tr '\n' ':')"
38-
39-
exec /bin/bash -c "$1"

0 commit comments

Comments
 (0)