Skip to content

Commit

Permalink
Merge remote-tracking branch 'origin/master' into fix_ref_to_non_ref
Browse files Browse the repository at this point in the history
  • Loading branch information
felipensp committed Sep 14, 2024
2 parents 1723ad7 + 56013a4 commit f6ebcf1
Show file tree
Hide file tree
Showing 587 changed files with 1,032 additions and 13,965 deletions.
43 changes: 43 additions & 0 deletions .github/workflows/more_extensive_but_slower_tests_ci.yml
Original file line number Diff line number Diff line change
@@ -0,0 +1,43 @@
name: More extensive but slower tests

on:
push:
paths-ignore:
- '**.md'
- '**.yml'
- '!**/more_extensive_but_slower_tests_ci.yml'
- 'examples/**'
- 'cmd/tools/**'
pull_request:
paths-ignore:
- '**.md'
- '**.yml'
- '!**/more_extensive_but_slower_tests_ci.yml'
- 'examples/**'
- 'cmd/tools/**'

concurrency:
group: ${{ github.workflow }}-${{ github.ref == 'refs/heads/master' && github.sha || github.ref }}
cancel-in-progress: true

jobs:
more-tests:
strategy:
matrix:
os: [ubuntu-latest, macos-12, macos-14, windows-latest]
runs-on: ${{ matrix.os }}
timeout-minutes: 121
steps:
- uses: actions/checkout@v4

- name: Build V
if: runner.os != 'Windows'
run: make -j4 && ./v symlink
- name: Build V (Windows)
if: runner.os == 'Windows'
run: ./make.bat && ./v symlink

- name: Run additional crypto tests
run: |
v retry -- git clone --depth 1 https://github.com/vlang/hash_validation_tests
v test hash_validation_tests/
2 changes: 1 addition & 1 deletion .github/workflows/release_ci.yml
Original file line number Diff line number Diff line change
Expand Up @@ -81,7 +81,7 @@ jobs:
find . -type d -name ".git" -exec rm -rf {} +
rm -rf vc/
rm -rf v_old
rm -rf vlib/v/tests/bench/gcboehm/*.svg
rm -rf vlib/v/tests/bench/gcboehm/*.svg.xz
- name: Create ZIP archive
shell: bash
run: |
Expand Down
2 changes: 2 additions & 0 deletions .github/workflows/v_apps_and_modules_compile_ci.yml
Original file line number Diff line number Diff line change
Expand Up @@ -6,12 +6,14 @@ on:
- '**.md'
- '**.yml'
- '!**/v_apps_and_modules_compile_ci.yml'
- 'examples/**'
- 'cmd/tools/vrepl.v'
pull_request:
paths-ignore:
- '**.md'
- '**.yml'
- '!**/v_apps_and_modules_compile_ci.yml'
- 'examples/**'
- 'cmd/tools/vrepl.v'

concurrency:
Expand Down
8 changes: 7 additions & 1 deletion .github/workflows/workflow_lint.yml
Original file line number Diff line number Diff line change
@@ -1,5 +1,11 @@
name: Workflow Lint

## Note: to install `prettier` locally, see https://prettier.io/docs/en/install,
## or just: `npm install --save-dev --save-exact prettier`

## If you already have `prettier` installed, to run it locally,
## just run: `npx prettier --check **.yml` .

on:
push:
paths:
Expand All @@ -16,4 +22,4 @@ jobs:
- name: Verify formatting
uses: creyD/prettier_action@v4.3
with:
prettier_options: --check .github/**/**.yml
prettier_options: --check **.yml
2 changes: 1 addition & 1 deletion cmd/tools/vdoc/html.v
Original file line number Diff line number Diff line change
Expand Up @@ -617,7 +617,7 @@ fn (f &MdHtmlCodeHighlighter) transform_attribute(p markdown.ParentType, name st
fn (f &MdHtmlCodeHighlighter) transform_content(parent markdown.ParentType, text string) string {
if parent is markdown.MD_BLOCKTYPE && parent == .md_block_code {
if f.language == '' {
return text
return html.escape(text)
}
output := html_highlight(text, f.table)
// Reset the language, so that it will not persist between blocks,
Expand Down
10 changes: 10 additions & 0 deletions cmd/tools/vdoc/testdata/output_formats/README.md
Original file line number Diff line number Diff line change
Expand Up @@ -150,4 +150,14 @@ A code block without a specific language should be rendered verbatim:
└── main.v
```

The s tags here in the code block, should be rendered verbatim, not interpreted as HTML ones:
```
h:m:s // 5:02:33
m:s.mi<s> // 2:33.015
s.mi<s> // 33.015s
mi.mc<ms> // 15.007ms
mc.ns<ns> // 7.234us
ns<ns> // 234ns
```

The End.
18 changes: 18 additions & 0 deletions cmd/tools/vdoc/testdata/output_formats/main.ansi
Original file line number Diff line number Diff line change
Expand Up @@ -128,6 +128,14 @@ A code block without a specific language should be rendered verbatim:
│ └── main.js
└── main.v

The s tags here in the code block, should be rendered verbatim, not interpreted as HTML ones:
h:m:s // 5:02:33
m:s.mi<s> // 2:33.015
s.mi<s> // 33.015s
mi.mc<ms> // 15.007ms
mc.ns<ns> // 7.234us
ns<ns> // 234ns

The End.
module main
## Description
Expand Down Expand Up @@ -281,6 +289,16 @@ The End.
└── main.v
```

The s tags here in the code block, should be rendered verbatim, not interpreted as HTML ones:
```
h:m:s // 5:02:33
m:s.mi<s> // 2:33.015
s.mi<s> // 33.015s
mi.mc<ms> // 15.007ms
mc.ns<ns> // 7.234us
ns<ns> // 234ns
```

The End.

const omega = 3 // should be first
Expand Down
6 changes: 6 additions & 0 deletions cmd/tools/vdoc/testdata/output_formats/main.html
Original file line number Diff line number Diff line change
Expand Up @@ -97,6 +97,12 @@ <h2>Description</h2><p>This is an example of a an .md file, used for adding more
│ └── js/
│ └── main.js
└── main.v
</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
m:s.mi&lt;s&gt; // 2:33.015
s.mi&lt;s&gt; // 33.015s
mi.mc&lt;ms&gt; // 15.007ms
mc.ns&lt;ns&gt; // 7.234us
ns&lt;ns&gt; // 234ns
</code></pre><p>The End.</p>

</section>
Expand Down
10 changes: 10 additions & 0 deletions cmd/tools/vdoc/testdata/output_formats/main.text
Original file line number Diff line number Diff line change
Expand Up @@ -150,6 +150,16 @@ module main
└── main.v
```

The s tags here in the code block, should be rendered verbatim, not interpreted as HTML ones:
```
h:m:s // 5:02:33
m:s.mi<s> // 2:33.015
s.mi<s> // 33.015s
mi.mc<ms> // 15.007ms
mc.ns<ns> // 7.234us
ns<ns> // 234ns
```

The End.

const omega = 3 // should be first
Expand Down
39 changes: 17 additions & 22 deletions thirdparty/zip/README.md
Original file line number Diff line number Diff line change
Expand Up @@ -2,31 +2,26 @@

A portable, simple zip library written in C.

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

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

0 comments on commit f6ebcf1

Please sign in to comment.