Skip to content

Commit d40a5c5

Browse files
WhaileeeWhaileee
committed
update ort to 70.0.1, add REUSE-Ignore markers
1 parent 4dc0f3d commit d40a5c5

File tree

11 files changed

+67
-7
lines changed

11 files changed

+67
-7
lines changed

‎.github/workflows/main.yaml‎

Lines changed: 3 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -796,7 +796,7 @@ jobs:
796796
runs-on: ubuntu-latest
797797
needs: pack
798798
env:
799-
ORT_VERSION: 58.0.1
799+
ORT_VERSION: 70.0.1
800800
SCAN_RESULT_CACHE_PATH: .ort/scan-result.json
801801

802802
steps:
@@ -813,7 +813,7 @@ jobs:
813813
uses: actions/checkout@11bd71901bbe5b1630ceea73d27597364c9af683 # ratchet:actions/checkout@v4
814814
with:
815815
repository: oss-review-toolkit/ort-config
816-
ref: "d2978deb230beae095bb6cfec074b94f1a74fd34"
816+
ref: "0f33db761dc4775be51d0e59b31c18ad2401d56b"
817817
path: ".ort-config"
818818

819819
- name: Setup ORT Config
@@ -858,7 +858,7 @@ jobs:
858858
FROM otp
859859
RUN echo 'export PATH="\$HOME/.local/bin:\$PATH"' >> /home/otptest/.profile
860860
RUN sudo apt-get install -y libicu-dev pip && \
861-
pip install click==8.1.7 scancode-toolkit==${SCANCODE_VERSION} reuse && \
861+
pip install click==8.2 scancode-toolkit==${SCANCODE_VERSION} reuse && \
862862
pip install -U ntia-conformance-checker
863863
EOF
864864

‎.ort/config/config.yml‎

Lines changed: 3 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -23,6 +23,9 @@ ort:
2323
enableRepositoryPackageCurations: true
2424
forceOverwrite: true
2525

26+
licenseFactProviders:
27+
spdx: {}
28+
2629
advisor:
2730
osv:
2831
serverUrl: "https://api-staging.osv.dev"

‎.ort/config/license-classifications.yml‎

Lines changed: 3 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -117,3 +117,6 @@ categorizations:
117117
- id: "SGI-B-2.0"
118118
categories:
119119
- "review"
120+
- id: "LicenseRef-scancode-public-domain"
121+
categories:
122+
- "review"

‎erts/emulator/pcre/README.pcre_update.md‎

Lines changed: 5 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -21,6 +21,8 @@
2121
# %CopyrightEnd%
2222
-->
2323

24+
<!-- REUSE-IgnoreStart -->
25+
2426
# How to update the PCRE version used by Erlang
2527

2628
## The basic changes to the PCRE library
@@ -550,4 +552,6 @@ To avoid the work of a major upgrade, it is probably worth it to keep
550552
in pace with the changes to PCRE2. PCRE2 should probably be updated for
551553
each major release, instead of every five years. There seems to be an
552554
interest from the maintainers of PCRE2 to support yielding. Which
553-
would deprecates most of this file.
555+
would deprecates most of this file.
556+
557+
<!-- REUSE-IgnoreEnd -->

‎erts/emulator/test/nif_SUITE.erl‎

Lines changed: 4 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -2125,6 +2125,8 @@ make_new_atoms(Config) when is_list(Config) ->
21252125
0 = make_new_atom(TooLong4ByteUtf8AtomText, ?ERL_NIF_UTF8),
21262126
ok.
21272127

2128+
%% REUSE-IgnoreStart
2129+
21282130
%% Test enif_make_existing_atom_len
21292131
make_existing_atoms(Config) when is_list(Config) ->
21302132
ensure_lib_loaded(Config, 1),
@@ -2205,6 +2207,8 @@ make_existing_atoms(Config) when is_list(Config) ->
22052207
0 = make_existing_atom(TooLong4ByteUtf8AtomText, ?ERL_NIF_UTF8),
22062208
ok.
22072209

2210+
%% REUSE-IgnoreEnd
2211+
22082212
%% Test NIF maps handling.
22092213
maps(Config) when is_list(Config) ->
22102214
TmpMem = tmpmem(),

‎lib/compiler/src/cerl_inline.erl‎

Lines changed: 8 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -726,6 +726,8 @@ i_case_3(Vs, Env, E, S) ->
726726
i_clauses(Cs, Ctxt, Ren, Env, S) ->
727727
i_clauses([], Cs, Ctxt, Ren, Env, S).
728728

729+
%% REUSE-IgnoreStart
730+
729731
i_clauses(Es, Cs, Ctxt, Ren, Env, S) ->
730732
%% Create templates for the switch expressions.
731733
{Ts, {Vs, Env0}} = mapfoldl(fun (E, {Vs, Env_i}) ->
@@ -837,6 +839,8 @@ i_clause_head(C, Ts, Ren, Env, S) ->
837839
C1 = update_c_clause(C, Ps1, G1, B),
838840
{set_clause_extras(C1, Ren1, Env1, Size), revert_size(S, S5)}.
839841

842+
%% REUSE-IgnoreEnd
843+
840844
add_match_bindings(Bs, E) ->
841845
%% Don't waste time if the variables definitely cannot be used.
842846
%% (Most guards are simply `true'.)
@@ -849,13 +853,17 @@ add_match_bindings(Bs, E) ->
849853
c_let(Vs, c_values(Es), E)
850854
end.
851855

856+
%% REUSE-IgnoreStart
857+
852858
i_clause_body(C0, Ctxt, S) ->
853859
{C, Ren, Env, Size} = get_clause_extras(C0),
854860
S1 = count_size(Size, S),
855861
{B, S2} = i(clause_body(C), Ctxt, Ren, Env, S1),
856862
C1 = update_c_clause(C, clause_pats(C), clause_guard(C), B),
857863
{C1, S2}.
858864

865+
%% REUSE-IgnoreEnd
866+
859867
get_clause_extras(C) ->
860868
[{Ren, Env, Size} | As] = get_ann(C),
861869
{set_ann(C, As), Ren, Env, Size}.

‎lib/dialyzer/test/file_utils.erl‎

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

325
-export([list_dir/3, file_type/1, diff/2]).
@@ -146,7 +168,7 @@ file_to_lines({file, File}) ->
146168
{error, _} = Error -> Error;
147169
Lines -> lists:reverse(Lines)
148170
end.
149-
171+
%% REUSE-IgnoreStart
150172
file_to_lines(File, Acc) ->
151173
case io:get_line(File, "") of
152174
{error, _}=Error -> Error;
@@ -161,3 +183,4 @@ file_to_lines(File, Acc) ->
161183
file_to_lines(File, [A|Acc])
162184
end
163185
end.
186+
%% REUSE-IgnoreEnd

‎lib/stdlib/test/re_SUITE_data/testoutput2‎

Lines changed: 3 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -16016,7 +16016,7 @@ Failed: error 157 at offset 6: \g is not followed by a braced, angle-bracketed,
1601616016
/.>*?\g'0/
1601716017
Failed: error 157 at offset 6: \g is not followed by a braced, angle-bracketed, or quoted name/number or by a plain number
1601816018

16019-
/{�̈́�̈́�{'{22{2{{2{'{22{{22{2{'{22{2{{2{{222{{2{'{22{2{22{2{'{22{2{{2{'{22{2{22{2{'{'{22{2{22{2{'{22{2{{2{'{22{2{22{2{'{222{2Ą̈́�̈́�{'{22{2{{2{'{22{{11{2{'{22{2{{2{{'{22{2{{2{'{22{{22{1{'{22{2{{2{{222{{2{'{22{2{22{2{'{/auto_callout
16019+
/{�̈́�̈́�{'{22{2{{2{'{22{{22{2{'{22{2{{2{{222{{2{'{22{2{22{2{'{22{2{{2{'{22{2{22{2{'{'{22{2{22{2{'{22{2{{2{'{22{2{22{2{'{222{2Ą̈́�̈́�{'{22{2{{2{'{22{{11{2{'{22{2{{2{{'{22{2{{2{'{22{{22{1{'{22{2{{2{{222{{2{'{22{2{22{2{'{/auto_callout
1602016020

1602116021
//
1602216022
\=get=i00000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000
@@ -16118,7 +16118,7 @@ Failed: error 161 at offset 11: subpattern number is too big
1611816118
/()(\g+65533)/
1611916119
Failed: error 115 at offset 10: reference to non-existent subpattern
1612016120

16121-
/�\x00\x00\x00�(\2*\2*\2*\2*\2*\2*\2*\2*\2*\2*\2*\2*\2*\2*\2*\2*\2*\2*\2*\2*\2*\2*\2*\2*\2*\2*\2*\2*\2*\2*\2*\2*\2*\2*\2*\2*\2*\2*\2*\2*\2*\2*\2*\2*\2*\2*\2*\2*\2*\2*\2*\2*\2*\2*\2*\2*\2*\2*\2*\2*\2*\2*\2*\2*\2*\2*\2*\2*\2*\2*\2*\2*\2*\2*\2*\2*\2*\2*\2*\2*\2*\2*\2*\2*\2*\2*\2*\2*\2*\2*\2*\2*\2*\2*\2*\2*\2*\2*\2*\2*\2*\2*\2*\2*\2*\2*\2*\2*\2*\2*\2*\2*\2*\2*\2*\2*\2*\2*\2*\2*\2*\2*\2*\2*\2*\2*\2*\2*\2*\2*\2*\2*\2*\2*\2*\2*\2*\2*\2*\2*\2*\2*\2*\2*\2*\2*\2*\2*\2*\2*\2*\2*\2*\2*\2*\2*\2*\2*\2*\2*\2*\2*\2*\2*\2*\2*\2*\2*\2*\2*\2*\2*\2*\2*\2*\2*\2*\2*\2*\2*\2*\2*\2*\2*\2*\2*\2*\2*\2*\2*\2*\2*\2*\2*\2*\2*\2*\2*\x00k\d+\x00‎\x00\x00\x00\x00\x00\2*\x00\x00\1*.){36}int^\x00\x00��\x00�(\1{50779}?)J\w2/I
16121+
/�\x00\x00\x00�(\2*\2*\2*\2*\2*\2*\2*\2*\2*\2*\2*\2*\2*\2*\2*\2*\2*\2*\2*\2*\2*\2*\2*\2*\2*\2*\2*\2*\2*\2*\2*\2*\2*\2*\2*\2*\2*\2*\2*\2*\2*\2*\2*\2*\2*\2*\2*\2*\2*\2*\2*\2*\2*\2*\2*\2*\2*\2*\2*\2*\2*\2*\2*\2*\2*\2*\2*\2*\2*\2*\2*\2*\2*\2*\2*\2*\2*\2*\2*\2*\2*\2*\2*\2*\2*\2*\2*\2*\2*\2*\2*\2*\2*\2*\2*\2*\2*\2*\2*\2*\2*\2*\2*\2*\2*\2*\2*\2*\2*\2*\2*\2*\2*\2*\2*\2*\2*\2*\2*\2*\2*\2*\2*\2*\2*\2*\2*\2*\2*\2*\2*\2*\2*\2*\2*\2*\2*\2*\2*\2*\2*\2*\2*\2*\2*\2*\2*\2*\2*\2*\2*\2*\2*\2*\2*\2*\2*\2*\2*\2*\2*\2*\2*\2*\2*\2*\2*\2*\2*\2*\2*\2*\2*\2*\2*\2*\2*\2*\2*\2*\2*\2*\2*\2*\2*\2*\2*\2*\2*\2*\2*\2*\2*\2*\2*\2*\2*\2*\x00k\d+\x00‎\x00\x00\x00\x00\x00\2*\x00\x00\1*.){36}int^\x00\x00��\x00�(\1{50779}?)J\w2/I
1612216122
Capture group count = 2
1612316123
Max back reference = 2
1612416124
First code unit = \xc1
@@ -21840,3 +21840,4 @@ Error 100: no error
2184021840
Error 101: \ at end of pattern
2184121841
Error 191: PCRE2_EXTRA_ALLOW_SURROGATE_ESCAPES is not allowed in UTF-16 mode
2184221842
Error 300: PCRE2_ERROR_BADDATA (unknown error number)
21843+

‎lib/stdlib/uc_spec/emoji-data.txt‎

Lines changed: 3 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -16,6 +16,7 @@
1616
# Characters and sequences are listed in code point order. Users should be shown a more natural order.
1717
# See the CLDR collation order for Emoji.
1818

19+
# REUSE-IgnoreStart
1920

2021
# ================================================
2122

@@ -1337,4 +1338,6 @@ E0020..E007F ; Emoji_Component # E0.0 [96] (󠀠..󠁿) tag space..c
13371338

13381339
# Total elements: 3537
13391340

1341+
# REUSE-IgnoreEnd
1342+
13401343
#EOF

‎lib/wx/api_gen/gen_util.erl‎

Lines changed: 7 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -230,6 +230,8 @@ erl_copyright() ->
230230
erl_wx_copyright() ->
231231
erl_copyright_template("Apache-2.0 AND LicenseRef-scancode-wxwindows-free-doc-3").
232232

233+
%% REUSE-IgnoreStart
234+
233235
erl_copyright_template(License) ->
234236
StartYear = start_year(get(current_class)),
235237
{CurrentYear,_,_} = erlang:date(),
@@ -256,6 +258,8 @@ erl_copyright_template(License) ->
256258
append_license(License),
257259
w("%% %CopyrightEnd%~n",[]).
258260

261+
%% REUSE-IgnoreEnd
262+
259263
append_license("Apache-2.0 AND LicenseRef-scancode-wxwindows-free-doc-3") ->
260264
w("%% For documentation, wxWindow Free Documentation License, Version 3 applies.~n",[]),
261265
w("%% wxWindows Free Documentation Licence, Version 3, as follows.~n",[]),
@@ -295,6 +299,7 @@ append_license("Apache-2.0 AND LicenseRef-scancode-wxwindows-free-doc-3") ->
295299
append_license(_) ->
296300
ok.
297301

302+
%% REUSE-IgnoreStart
298303

299304
c_copyright() ->
300305
{CurrentYear,_,_} = erlang:date(),
@@ -320,6 +325,8 @@ c_copyright() ->
320325
w(" * %CopyrightEnd%~n",[]),
321326
w("*/~n",[]).
322327

328+
%% REUSE-IgnoreEnd
329+
323330
start_year("wxAuiManagerEvent") -> 2009;
324331
start_year("wxAuiNotebookEvent") -> 2009;
325332
start_year("wxChoicebook") -> 2009;

0 commit comments

Comments
 (0)