Skip to content

Commit f6ebcf1

Browse files
committed
Merge remote-tracking branch 'origin/master' into fix_ref_to_non_ref
2 parents 1723ad7 + 56013a4 commit f6ebcf1

File tree

587 files changed

+1032
-13965
lines changed

Some content is hidden

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

587 files changed

+1032
-13965
lines changed
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,43 @@
1+
name: More extensive but slower tests
2+
3+
on:
4+
push:
5+
paths-ignore:
6+
- '**.md'
7+
- '**.yml'
8+
- '!**/more_extensive_but_slower_tests_ci.yml'
9+
- 'examples/**'
10+
- 'cmd/tools/**'
11+
pull_request:
12+
paths-ignore:
13+
- '**.md'
14+
- '**.yml'
15+
- '!**/more_extensive_but_slower_tests_ci.yml'
16+
- 'examples/**'
17+
- 'cmd/tools/**'
18+
19+
concurrency:
20+
group: ${{ github.workflow }}-${{ github.ref == 'refs/heads/master' && github.sha || github.ref }}
21+
cancel-in-progress: true
22+
23+
jobs:
24+
more-tests:
25+
strategy:
26+
matrix:
27+
os: [ubuntu-latest, macos-12, macos-14, windows-latest]
28+
runs-on: ${{ matrix.os }}
29+
timeout-minutes: 121
30+
steps:
31+
- uses: actions/checkout@v4
32+
33+
- name: Build V
34+
if: runner.os != 'Windows'
35+
run: make -j4 && ./v symlink
36+
- name: Build V (Windows)
37+
if: runner.os == 'Windows'
38+
run: ./make.bat && ./v symlink
39+
40+
- name: Run additional crypto tests
41+
run: |
42+
v retry -- git clone --depth 1 https://github.com/vlang/hash_validation_tests
43+
v test hash_validation_tests/

.github/workflows/release_ci.yml

+1-1
Original file line numberDiff line numberDiff line change
@@ -81,7 +81,7 @@ jobs:
8181
find . -type d -name ".git" -exec rm -rf {} +
8282
rm -rf vc/
8383
rm -rf v_old
84-
rm -rf vlib/v/tests/bench/gcboehm/*.svg
84+
rm -rf vlib/v/tests/bench/gcboehm/*.svg.xz
8585
- name: Create ZIP archive
8686
shell: bash
8787
run: |

.github/workflows/v_apps_and_modules_compile_ci.yml

+2
Original file line numberDiff line numberDiff line change
@@ -6,12 +6,14 @@ on:
66
- '**.md'
77
- '**.yml'
88
- '!**/v_apps_and_modules_compile_ci.yml'
9+
- 'examples/**'
910
- 'cmd/tools/vrepl.v'
1011
pull_request:
1112
paths-ignore:
1213
- '**.md'
1314
- '**.yml'
1415
- '!**/v_apps_and_modules_compile_ci.yml'
16+
- 'examples/**'
1517
- 'cmd/tools/vrepl.v'
1618

1719
concurrency:

.github/workflows/workflow_lint.yml

+7-1
Original file line numberDiff line numberDiff line change
@@ -1,5 +1,11 @@
11
name: Workflow Lint
22

3+
## Note: to install `prettier` locally, see https://prettier.io/docs/en/install,
4+
## or just: `npm install --save-dev --save-exact prettier`
5+
6+
## If you already have `prettier` installed, to run it locally,
7+
## just run: `npx prettier --check **.yml` .
8+
39
on:
410
push:
511
paths:
@@ -16,4 +22,4 @@ jobs:
1622
- name: Verify formatting
1723
uses: creyD/prettier_action@v4.3
1824
with:
19-
prettier_options: --check .github/**/**.yml
25+
prettier_options: --check **.yml

cmd/tools/vdoc/html.v

+1-1
Original file line numberDiff line numberDiff line change
@@ -617,7 +617,7 @@ fn (f &MdHtmlCodeHighlighter) transform_attribute(p markdown.ParentType, name st
617617
fn (f &MdHtmlCodeHighlighter) transform_content(parent markdown.ParentType, text string) string {
618618
if parent is markdown.MD_BLOCKTYPE && parent == .md_block_code {
619619
if f.language == '' {
620-
return text
620+
return html.escape(text)
621621
}
622622
output := html_highlight(text, f.table)
623623
// Reset the language, so that it will not persist between blocks,

cmd/tools/vdoc/testdata/output_formats/README.md

+10
Original file line numberDiff line numberDiff line change
@@ -150,4 +150,14 @@ A code block without a specific language should be rendered verbatim:
150150
└── main.v
151151
```
152152

153+
The s tags here in the code block, should be rendered verbatim, not interpreted as HTML ones:
154+
```
155+
h:m:s // 5:02:33
156+
m:s.mi<s> // 2:33.015
157+
s.mi<s> // 33.015s
158+
mi.mc<ms> // 15.007ms
159+
mc.ns<ns> // 7.234us
160+
ns<ns> // 234ns
161+
```
162+
153163
The End.

cmd/tools/vdoc/testdata/output_formats/main.ansi

+18
Original file line numberDiff line numberDiff line change
@@ -128,6 +128,14 @@ A code block without a specific language should be rendered verbatim:
128128
│ └── main.js
129129
└── main.v
130130

131+
The s tags here in the code block, should be rendered verbatim, not interpreted as HTML ones:
132+
h:m:s // 5:02:33
133+
m:s.mi<s> // 2:33.015
134+
s.mi<s> // 33.015s
135+
mi.mc<ms> // 15.007ms
136+
mc.ns<ns> // 7.234us
137+
ns<ns> // 234ns
138+
131139
The End.
132140
module main
133141
## Description
@@ -281,6 +289,16 @@ The End.
281289
└── main.v
282290
```
283291

292+
The s tags here in the code block, should be rendered verbatim, not interpreted as HTML ones:
293+
```
294+
h:m:s // 5:02:33
295+
m:s.mi<s> // 2:33.015
296+
s.mi<s> // 33.015s
297+
mi.mc<ms> // 15.007ms
298+
mc.ns<ns> // 7.234us
299+
ns<ns> // 234ns
300+
```
301+
284302
The End.
285303

286304
const omega = 3 // should be first

cmd/tools/vdoc/testdata/output_formats/main.html

+6
Original file line numberDiff line numberDiff line change
@@ -97,6 +97,12 @@ <h2>Description</h2><p>This is an example of a an .md file, used for adding more
9797
│ └── js/
9898
│ └── main.js
9999
└── main.v
100+
</code></pre><p>The s tags here in the code block, should be rendered verbatim, not interpreted as HTML ones:</p><pre><code>h:m:s // 5:02:33
101+
m:s.mi&lt;s&gt; // 2:33.015
102+
s.mi&lt;s&gt; // 33.015s
103+
mi.mc&lt;ms&gt; // 15.007ms
104+
mc.ns&lt;ns&gt; // 7.234us
105+
ns&lt;ns&gt; // 234ns
100106
</code></pre><p>The End.</p>
101107

102108
</section>

cmd/tools/vdoc/testdata/output_formats/main.text

+10
Original file line numberDiff line numberDiff line change
@@ -150,6 +150,16 @@ module main
150150
└── main.v
151151
```
152152

153+
The s tags here in the code block, should be rendered verbatim, not interpreted as HTML ones:
154+
```
155+
h:m:s // 5:02:33
156+
m:s.mi<s> // 2:33.015
157+
s.mi<s> // 33.015s
158+
mi.mc<ms> // 15.007ms
159+
mc.ns<ns> // 7.234us
160+
ns<ns> // 234ns
161+
```
162+
153163
The End.
154164

155165
const omega = 3 // should be first

thirdparty/zip/README.md

+17-22
Original file line numberDiff line numberDiff line change
@@ -2,31 +2,26 @@
22

33
A portable, simple zip library written in C.
44

5-
## Unlicense license
5+
## MIT License (changed from Unlicense in https://github.com/kuba--/zip/commit/d3983cc34c5af8354408c49786df254055fad35a)
66

77
```
8-
This is free and unencumbered software released into the public domain.
8+
All Rights Reserved.
99
10-
Anyone is free to copy, modify, publish, use, compile, sell, or
11-
distribute this software, either in source code form or as a compiled
12-
binary, for any purpose, commercial or non-commercial, and by any
13-
means.
10+
Permission is hereby granted, free of charge, to any person obtaining a copy
11+
of this software and associated documentation files (the "Software"), to deal
12+
in the Software without restriction, including without limitation the rights
13+
to use, copy, modify, merge, publish, distribute, sublicense, and/or sell
14+
copies of the Software, and to permit persons to whom the Software is
15+
furnished to do so, subject to the following conditions:
1416
15-
In jurisdictions that recognize copyright laws, the author or authors
16-
of this software dedicate any and all copyright interest in the
17-
software to the public domain. We make this dedication for the benefit
18-
of the public at large and to the detriment of our heirs and
19-
successors. We intend this dedication to be an overt act of
20-
relinquishment in perpetuity of all present and future rights to this
21-
software under copyright law.
17+
The above copyright notice and this permission notice shall be included in
18+
all copies or substantial portions of the Software.
2219
23-
THE SOFTWARE IS PROVIDED "AS IS", WITHOUT WARRANTY OF ANY KIND,
24-
EXPRESS OR IMPLIED, INCLUDING BUT NOT LIMITED TO THE WARRANTIES OF
25-
MERCHANTABILITY, FITNESS FOR A PARTICULAR PURPOSE AND NONINFRINGEMENT.
26-
IN NO EVENT SHALL THE AUTHORS BE LIABLE FOR ANY CLAIM, DAMAGES OR
27-
OTHER LIABILITY, WHETHER IN AN ACTION OF CONTRACT, TORT OR OTHERWISE,
28-
ARISING FROM, OUT OF OR IN CONNECTION WITH THE SOFTWARE OR THE USE OR
29-
OTHER DEALINGS IN THE SOFTWARE.
30-
31-
For more information, please refer to <http://unlicense.org/>
20+
THE SOFTWARE IS PROVIDED "AS IS", WITHOUT WARRANTY OF ANY KIND, EXPRESS OR
21+
IMPLIED, INCLUDING BUT NOT LIMITED TO THE WARRANTIES OF MERCHANTABILITY,
22+
FITNESS FOR A PARTICULAR PURPOSE AND NONINFRINGEMENT. IN NO EVENT SHALL THE
23+
AUTHORS OR COPYRIGHT HOLDERS BE LIABLE FOR ANY CLAIM, DAMAGES OR OTHER
24+
LIABILITY, WHETHER IN AN ACTION OF CONTRACT, TORT OR OTHERWISE, ARISING FROM,
25+
OUT OF OR IN CONNECTION WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN
26+
THE SOFTWARE.
3227
```

0 commit comments

Comments
 (0)