Skip to content

Commit

Permalink
Merge branch 'vlang:master' into master
Browse files Browse the repository at this point in the history
  • Loading branch information
Bruno-Vdr authored Feb 17, 2025
2 parents 3427d7b + 6534616 commit 14b8a02
Show file tree
Hide file tree
Showing 59 changed files with 571 additions and 231 deletions.
2 changes: 1 addition & 1 deletion .github/workflows/bootstrapping_ci.yml
Original file line number Diff line number Diff line change
Expand Up @@ -24,7 +24,7 @@ on:
- '!**/bootstrapping_ci.yml'

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

jobs:
Expand Down
4 changes: 2 additions & 2 deletions .github/workflows/c2v_ci.yml
Original file line number Diff line number Diff line change
Expand Up @@ -23,7 +23,7 @@ on:
- '!cmd/tools/builders/**.v'

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

jobs:
Expand Down Expand Up @@ -71,7 +71,7 @@ jobs:
WAD_FILE=~/DOOM1.WAD ~/code/doom/build_whole_project.sh
test-regression:
runs-on: ubuntu-20.04
runs-on: ubuntu-24.04
timeout-minutes: 20
env:
VFLAGS: -cc tcc
Expand Down
20 changes: 9 additions & 11 deletions .github/workflows/cross_ci.yml
Original file line number Diff line number Diff line change
Expand Up @@ -17,7 +17,7 @@ on:
- '!cmd/tools/builders/**.v'

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

jobs:
Expand Down Expand Up @@ -52,7 +52,7 @@ jobs:
./v -os windows examples/2048/2048.v
linux-cross:
runs-on: ubuntu-20.04
runs-on: ubuntu-24.04
timeout-minutes: 25
env:
VFLAGS: -cc tcc -no-retry-compilation
Expand All @@ -65,14 +65,12 @@ jobs:

- name: Install dependencies
run: |
## sudo dpkg --add-architecture i386
./v retry -- sudo apt update
./v retry -- sudo apt install --quiet -y libssl-dev sqlite3 libsqlite3-dev
./v retry -- sudo apt install --quiet -y mingw-w64 wine-stable winetricks
## ./v retry -- sudo apt install --quiet -y wine32
./v retry -- sudo apt install --quiet -y mingw-w64 wine wine64 winetricks libssl-dev sqlite3 libsqlite3-dev
- name: Turn off the wine crash dialog
run: winetricks nocrashdialog
- name: Show diagnostics for wine
run: |
which wine
ls -la $(realpath $(which wine))
- name: v.c can be compiled and run with -os cross
run: |
Expand All @@ -86,13 +84,13 @@ jobs:
./v -cc msvc -os windows -o /tmp/v_win.c cmd/v
x86_64-w64-mingw32-gcc /tmp/v_win.c -std=c99 -w -municode -o v_from_vc.exe -lws2_32
ls -lart v_from_vc.exe
wine64 ./v_from_vc.exe version
wine ./v_from_vc.exe version
- name: hello_world.v can be cross compiled to hello_world.exe
run: |
./v -os windows examples/hello_world.v
ls -lart examples/hello_world.exe
wine64 examples/hello_world.exe
wine examples/hello_world.exe
- name: 2048.v can be cross compiled to 2048.exe
run: |
Expand Down
6 changes: 3 additions & 3 deletions .github/workflows/docker_ci.yml
Original file line number Diff line number Diff line change
Expand Up @@ -17,15 +17,15 @@ on:
- '!cmd/tools/builders/**.v'

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

env:
V_CI_MUSL: 1

jobs:
docker-alpine-musl-gcc:
runs-on: ubuntu-20.04
runs-on: ubuntu-24.04
timeout-minutes: 241
container:
image: thevlang/vlang:alpine-build
Expand Down Expand Up @@ -54,7 +54,7 @@ jobs:
run: VTEST_JUST_ESSENTIAL=1 ./v test-self

docker-ubuntu-musl:
runs-on: ubuntu-20.04
runs-on: ubuntu-24.04
timeout-minutes: 121
container:
image: thevlang/vlang:ubuntu-build
Expand Down
10 changes: 6 additions & 4 deletions .github/workflows/docs_ci.yml
Original file line number Diff line number Diff line change
Expand Up @@ -17,24 +17,26 @@ on:
- 'cmd/tools/vrepl.v'

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

jobs:
check-markdown:
runs-on: ubuntu-20.04
timeout-minutes: 5
runs-on: ubuntu-24.04
timeout-minutes: 10
steps:
- uses: actions/checkout@v4
- name: Build V
run: make
- name: Install dependencies (some examples show how to use sqlite and the x11 clipboard)
run: ./v retry -- sudo apt install --quiet -y libx11-dev libssl-dev sqlite3 libsqlite3-dev
- name: Check markdown line length & code examples
run: ./v check-md -hide-warnings .
## NB: -hide-warnings is used here, so that the output is less noisy,
## thus real errors are easier to spot.

report-missing-fn-doc:
runs-on: ubuntu-20.04
runs-on: ubuntu-24.04
timeout-minutes: 5
env:
MOPTIONS: --diff --deprecated --relative-paths --exclude /vlib/v/ --exclude /builtin/linux_bare/ --exclude /testdata/ --exclude /tests/
Expand Down
2 changes: 1 addition & 1 deletion .github/workflows/gen_vc_ci.yml
Original file line number Diff line number Diff line change
Expand Up @@ -24,7 +24,7 @@ on:
# Allow only one concurrent deployment, skipping runs queued between the run in-progress and latest queued.
# However, do NOT cancel in-progress runs as we want to allow these production deployments to complete.
concurrency:
group: ${{ github.workflow }}-${{ github.ref }}
group: gen_vc-${{ github.workflow }}-${{ github.ref }}
cancel-in-progress: ${{ !contains(github.ref, 'master')}}

jobs:
Expand Down
4 changes: 2 additions & 2 deletions .github/workflows/gg_regressions_ci.yml
Original file line number Diff line number Diff line change
Expand Up @@ -17,12 +17,12 @@ on:
- '!**.md'

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

jobs:
gg-regressions:
runs-on: ubuntu-20.04
runs-on: ubuntu-24.04
timeout-minutes: 20
env:
VFLAGS: -cc tcc
Expand Down
8 changes: 4 additions & 4 deletions .github/workflows/linux_ci.yml
Original file line number Diff line number Diff line change
Expand Up @@ -18,12 +18,12 @@ on:
- '!cmd/tools/builders/**.v'

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

jobs:
tcc:
runs-on: ubuntu-20.04
runs-on: ubuntu-24.04
timeout-minutes: 121
env:
VFLAGS: -cc tcc -no-retry-compilation
Expand Down Expand Up @@ -81,7 +81,7 @@ jobs:
run: v run ci/linux_ci.vsh test_leak_detector_not_active_tcc

gcc:
runs-on: ubuntu-20.04
runs-on: ubuntu-24.04
timeout-minutes: 121
steps:
- uses: actions/checkout@v4
Expand Down Expand Up @@ -135,7 +135,7 @@ jobs:
run: v run ci/linux_ci.vsh test_vlib_skip_unused_gcc

clang:
runs-on: ubuntu-20.04
runs-on: ubuntu-24.04
timeout-minutes: 121
env:
VFLAGS: -cc clang
Expand Down
2 changes: 1 addition & 1 deletion .github/workflows/macos_ci.yml
Original file line number Diff line number Diff line change
Expand Up @@ -17,7 +17,7 @@ on:
- '!cmd/tools/builders/**.v'

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

jobs:
Expand Down
4 changes: 2 additions & 2 deletions .github/workflows/module_docs_ci.yml
Original file line number Diff line number Diff line change
Expand Up @@ -17,12 +17,12 @@ on:
# Allow only one concurrent deployment, skipping runs queued between the run in-progress and latest queued.
# However, do NOT cancel in-progress runs as we want to allow these production deployments to complete.
concurrency:
group: ${{ github.workflow }}-${{ github.ref }}
group: module_docs-${{ github.workflow }}-${{ github.ref }}
cancel-in-progress: ${{ !contains(github.ref, 'master')}}

jobs:
build-module-docs:
runs-on: ubuntu-20.04
runs-on: ubuntu-24.04
steps:
- uses: actions/checkout@v4
- name: Build V
Expand Down
2 changes: 1 addition & 1 deletion .github/workflows/more_extensive_but_slower_tests_ci.yml
Original file line number Diff line number Diff line change
Expand Up @@ -17,7 +17,7 @@ on:
- 'cmd/tools/**'

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

jobs:
Expand Down
2 changes: 1 addition & 1 deletion .github/workflows/native_backend_ci.yml
Original file line number Diff line number Diff line change
Expand Up @@ -45,7 +45,7 @@ on:
- '.github/workflows/native_backend_ci.yml'

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

jobs:
Expand Down
12 changes: 6 additions & 6 deletions .github/workflows/other_ci.yml
Original file line number Diff line number Diff line change
Expand Up @@ -18,12 +18,12 @@ on:
- '!cmd/tools/builders/**.v'

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

jobs:
prevent-gpl-licenses:
runs-on: ubuntu-20.04
runs-on: ubuntu-24.04
timeout-minutes: 15
steps:
- name: Checkout V ${{ github.head_ref }}
Expand All @@ -46,7 +46,7 @@ jobs:
diff -d -a -U 2 --color=always gpl_res_vmaster gpl_res_vnew
code-formatting:
runs-on: ubuntu-20.04
runs-on: ubuntu-24.04
timeout-minutes: 30
env:
VFLAGS: -cc gcc
Expand All @@ -62,7 +62,7 @@ jobs:
run: ./v test-fmt

performance-regressions:
runs-on: ubuntu-20.04
runs-on: ubuntu-24.04
timeout-minutes: 30
env:
VFLAGS: -cc gcc
Expand All @@ -86,7 +86,7 @@ jobs:
run: ./v repeat --max_time 1731 --series 3 --runs 20 --nmins 2 --nmaxs 5 --warmup 3 --fail_percent 10 -t 'cd {T} ; ./v -o v.c cmd/v' . ./vmaster

misc-tooling:
runs-on: ubuntu-20.04
runs-on: ubuntu-24.04
timeout-minutes: 121
env:
VFLAGS: -cc tcc -no-retry-compilation
Expand Down Expand Up @@ -124,7 +124,7 @@ jobs:
./v should-compile-all examples/sokol/*.v examples/sokol/0?*/*.v
parser-silent:
runs-on: ubuntu-20.04
runs-on: ubuntu-24.04
timeout-minutes: 121
steps:
- uses: actions/checkout@v4
Expand Down
4 changes: 2 additions & 2 deletions .github/workflows/paths_ci.yml
Original file line number Diff line number Diff line change
Expand Up @@ -11,12 +11,12 @@ on:
- '!**/paths_ci.yml'

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

jobs:
space-paths-linux:
runs-on: ubuntu-20.04
runs-on: ubuntu-24.04
timeout-minutes: 30
steps:
- uses: actions/checkout@v4
Expand Down
2 changes: 1 addition & 1 deletion .github/workflows/prebuilt.yml
Original file line number Diff line number Diff line change
Expand Up @@ -7,7 +7,7 @@ on:

jobs:
ubuntu:
runs-on: ubuntu-20.04
runs-on: ubuntu-24.04
timeout-minutes: 5
steps:
- name: Download V
Expand Down
6 changes: 3 additions & 3 deletions .github/workflows/puzzle_vibes_ci.yml
Original file line number Diff line number Diff line change
Expand Up @@ -20,13 +20,13 @@ on:
- '!**.md'

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

jobs:
v-compiles-puzzle-vibes:
runs-on: ubuntu-20.04
timeout-minutes: 10
runs-on: ubuntu-24.04
timeout-minutes: 30
steps:
- uses: actions/checkout@v4
- name: Build V
Expand Down
2 changes: 1 addition & 1 deletion .github/workflows/release_ci.yml
Original file line number Diff line number Diff line change
Expand Up @@ -13,7 +13,7 @@ on:
- 0.**

concurrency:
group: ${{ github.workflow }}-${{ github.ref }}
group: release-${{ github.workflow }}-${{ github.ref }}
cancel-in-progress: ${{ github.ref_type != 'tag' }}

permissions:
Expand Down
Loading

0 comments on commit 14b8a02

Please sign in to comment.