ci: use windows-2025 for the gcc-windows job (since it has gcc 14.2.0) (#24304)

This commit is contained in:
Delyan Angelov 2025-04-24 13:03:25 +03:00 committed by GitHub
parent 87d3a1d272
commit 59909cde89
No known key found for this signature in database
GPG Key ID: B5690EEEBB952194
6 changed files with 55 additions and 6 deletions

10
.github/workflows/find_openssl.bat vendored Normal file
View 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

View File

@ -25,17 +25,35 @@ concurrency:
jobs:
gcc-windows:
runs-on: windows-2019
runs-on: windows-2025
timeout-minutes: 90
env:
VFLAGS: -cc gcc
steps:
- uses: actions/checkout@v4
- name: Build
- name: Show tool versions
run: |
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
.\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
run: v -silent test-cleancode
- name: Test new v.c
@ -64,8 +82,6 @@ jobs:
run: v -autofree vlib/v/tests/options/option_test.c.v
- name: Test v->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
run: v -silent build-examples
- name: v2 self compilation

View File

@ -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_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
&& os.execute('pkg-config python3 --libs').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
&& os.execute('pkg-config openssl --libs').exit_code == 0
pub const all_processes = get_all_processes()

View File

@ -15,6 +15,14 @@ module ecdsa
#flag linux -I/usr/local/include/openssl
#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 -lcrypto

View File

@ -14,11 +14,22 @@ module openssl
// openssl.
#flag freebsd -I/usr/local/include
#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') {
#pkgconfig --cflags --libs openssl
} $else {
#flag windows -l libssl -l libcrypto
#flag -lssl -lcrypto
$if !windows {
#flag -lssl -lcrypto
}
#flag linux -ldl -lpthread
// MacPorts
#flag darwin -I/opt/local/include

View File

@ -1,4 +1,4 @@
// vtest build: (amd64 || arm64) && !self_sandboxed_packaging?
// vtest build: (amd64 || arm64) && !self_sandboxed_packaging? && !gcc-windows
import os
import time
import benchmark