mirror of
https://github.com/vlang/v.git
synced 2025-08-03 17:57:59 -04:00
ci: use windows-2025 for the gcc-windows job (since it has gcc 14.2.0) (#24304)
This commit is contained in:
parent
87d3a1d272
commit
59909cde89
10
.github/workflows/find_openssl.bat
vendored
Normal file
10
.github/workflows/find_openssl.bat
vendored
Normal file
@ -0,0 +1,10 @@
|
|||||||
|
@echo off
|
||||||
|
setlocal EnableDelayedExpansion
|
||||||
|
REM Find every openssl.exe reachable through PATH:
|
||||||
|
for /f "delims=" %%F in ('where openssl 2^>nul') do (
|
||||||
|
set "OPENSSL_DIR=%%~dpF"
|
||||||
|
echo OpenSSL lives in: "!OPENSSL_DIR!"
|
||||||
|
goto :end
|
||||||
|
)
|
||||||
|
echo OpenSSL not found in: "!PATH!"
|
||||||
|
:end
|
24
.github/workflows/windows_ci.yml
vendored
24
.github/workflows/windows_ci.yml
vendored
@ -25,17 +25,35 @@ concurrency:
|
|||||||
|
|
||||||
jobs:
|
jobs:
|
||||||
gcc-windows:
|
gcc-windows:
|
||||||
runs-on: windows-2019
|
runs-on: windows-2025
|
||||||
timeout-minutes: 90
|
timeout-minutes: 90
|
||||||
env:
|
env:
|
||||||
VFLAGS: -cc gcc
|
VFLAGS: -cc gcc
|
||||||
steps:
|
steps:
|
||||||
- uses: actions/checkout@v4
|
- uses: actions/checkout@v4
|
||||||
- name: Build
|
- name: Show tool versions
|
||||||
run: |
|
run: |
|
||||||
gcc --version
|
gcc --version
|
||||||
|
pkg-config --version
|
||||||
|
openssl version
|
||||||
|
echo "Flags for openssl:"
|
||||||
|
pkg-config openssl --cflags
|
||||||
|
echo "Flags for openssl libs:"
|
||||||
|
pkg-config openssl --libs
|
||||||
|
.github/workflows/find_openssl.bat
|
||||||
|
echo "OpenSSL files:"
|
||||||
|
where.exe /R "C:\Program Files\OpenSSL" *.*
|
||||||
|
echo "Include files for openssl:"
|
||||||
|
dir "c:/Program Files/OpenSSL/include"
|
||||||
|
echo "Lib Include files for openssl:"
|
||||||
|
dir "c:/Program Files/OpenSSL/lib/VC/x64/"
|
||||||
|
- name: Build
|
||||||
|
run: |
|
||||||
.\make.bat -gcc
|
.\make.bat -gcc
|
||||||
.\v.exe symlink
|
.\v.exe symlink
|
||||||
|
.\v.exe -stats vlib/crypto/ecdsa/ecdsa_test.v
|
||||||
|
- name: Test v binaries
|
||||||
|
run: v -silent build-vbinaries
|
||||||
- name: All code is formatted
|
- name: All code is formatted
|
||||||
run: v -silent test-cleancode
|
run: v -silent test-cleancode
|
||||||
- name: Test new v.c
|
- name: Test new v.c
|
||||||
@ -64,8 +82,6 @@ jobs:
|
|||||||
run: v -autofree vlib/v/tests/options/option_test.c.v
|
run: v -autofree vlib/v/tests/options/option_test.c.v
|
||||||
- name: Test v->js
|
- name: Test v->js
|
||||||
run: v -o hi.js examples/js_hello_world.v && node hi.js
|
run: v -o hi.js examples/js_hello_world.v && node hi.js
|
||||||
- name: Test v binaries
|
|
||||||
run: v -silent build-vbinaries
|
|
||||||
- name: Build examples
|
- name: Build examples
|
||||||
run: v -silent build-examples
|
run: v -silent build-examples
|
||||||
- name: v2 self compilation
|
- name: v2 self compilation
|
||||||
|
@ -46,12 +46,16 @@ pub const is_node_present = os.execute('node --version').exit_code == 0
|
|||||||
pub const is_go_present = os.execute('go version').exit_code == 0
|
pub const is_go_present = os.execute('go version').exit_code == 0
|
||||||
|
|
||||||
pub const is_ruby_present = os.execute('ruby --version').exit_code == 0
|
pub const is_ruby_present = os.execute('ruby --version').exit_code == 0
|
||||||
|
&& os.execute('pkg-config ruby --libs').exit_code == 0
|
||||||
|
|
||||||
pub const is_python_present = os.execute('python --version').exit_code == 0
|
pub const is_python_present = os.execute('python --version').exit_code == 0
|
||||||
|
&& os.execute('pkg-config python3 --libs').exit_code == 0
|
||||||
|
|
||||||
pub const is_sqlite3_present = os.execute('sqlite3 --version').exit_code == 0
|
pub const is_sqlite3_present = os.execute('sqlite3 --version').exit_code == 0
|
||||||
|
&& os.execute('pkg-config sqlite3 --libs').exit_code == 0
|
||||||
|
|
||||||
pub const is_openssl_present = os.execute('openssl --version').exit_code == 0
|
pub const is_openssl_present = os.execute('openssl --version').exit_code == 0
|
||||||
|
&& os.execute('pkg-config openssl --libs').exit_code == 0
|
||||||
|
|
||||||
pub const all_processes = get_all_processes()
|
pub const all_processes = get_all_processes()
|
||||||
|
|
||||||
|
@ -15,6 +15,14 @@ module ecdsa
|
|||||||
#flag linux -I/usr/local/include/openssl
|
#flag linux -I/usr/local/include/openssl
|
||||||
#flag linux -L/usr/local/lib64/
|
#flag linux -L/usr/local/lib64/
|
||||||
|
|
||||||
|
// Installed through choco:
|
||||||
|
#flag windows -IC:/Program Files/OpenSSL-Win64/include
|
||||||
|
#flag windows -LC:/Program Files/OpenSSL-Win64/lib/VC/x64/MD
|
||||||
|
|
||||||
|
// Installed on the CI:
|
||||||
|
#flag windows -IC:/Program Files/OpenSSL/include
|
||||||
|
#flag windows -LC:/Program Files/OpenSSL/lib/VC/x64/MD
|
||||||
|
|
||||||
#flag -I/usr/include/openssl
|
#flag -I/usr/include/openssl
|
||||||
|
|
||||||
#flag -lcrypto
|
#flag -lcrypto
|
||||||
|
@ -14,11 +14,22 @@ module openssl
|
|||||||
// openssl.
|
// openssl.
|
||||||
#flag freebsd -I/usr/local/include
|
#flag freebsd -I/usr/local/include
|
||||||
#flag freebsd -L/usr/local/lib
|
#flag freebsd -L/usr/local/lib
|
||||||
|
|
||||||
|
// Installed through choco:
|
||||||
|
#flag windows -IC:/Program Files/OpenSSL-Win64/include
|
||||||
|
#flag windows -LC:/Program Files/OpenSSL-Win64/lib/VC/x64/MD
|
||||||
|
|
||||||
|
// Installed on the CI:
|
||||||
|
#flag windows -IC:/Program Files/OpenSSL/include
|
||||||
|
#flag windows -LC:/Program Files/OpenSSL/lib/VC/x64/MD
|
||||||
|
|
||||||
$if $pkgconfig('openssl') {
|
$if $pkgconfig('openssl') {
|
||||||
#pkgconfig --cflags --libs openssl
|
#pkgconfig --cflags --libs openssl
|
||||||
} $else {
|
} $else {
|
||||||
#flag windows -l libssl -l libcrypto
|
#flag windows -l libssl -l libcrypto
|
||||||
#flag -lssl -lcrypto
|
$if !windows {
|
||||||
|
#flag -lssl -lcrypto
|
||||||
|
}
|
||||||
#flag linux -ldl -lpthread
|
#flag linux -ldl -lpthread
|
||||||
// MacPorts
|
// MacPorts
|
||||||
#flag darwin -I/opt/local/include
|
#flag darwin -I/opt/local/include
|
||||||
|
@ -1,4 +1,4 @@
|
|||||||
// vtest build: (amd64 || arm64) && !self_sandboxed_packaging?
|
// vtest build: (amd64 || arm64) && !self_sandboxed_packaging? && !gcc-windows
|
||||||
import os
|
import os
|
||||||
import time
|
import time
|
||||||
import benchmark
|
import benchmark
|
||||||
|
Loading…
x
Reference in New Issue
Block a user