Skip to content

Commit 8a2cefb

Browse files
committed
merge: sync with latest changes
2 parents 02fefa8 + 689329e commit 8a2cefb

1 file changed

Lines changed: 45 additions & 23 deletions

File tree

.github/workflows/windows_concurrency_test.yml

Lines changed: 45 additions & 23 deletions
Original file line numberDiff line numberDiff line change
@@ -1,4 +1,4 @@
1-
name: "🚀 Windows - Omnipkg Quantum Multiverse Warp"
1+
name: "🚀 Windows - Omnipkg Quantum Multiverse Warp (CI - No Redis)"
22

33
on:
44
push:
@@ -20,32 +20,24 @@ jobs:
2020
with:
2121
python-version: '3.11'
2222

23-
- name: Install and Start Redis
24-
run: |
25-
choco install redis-64 -y
26-
redis-server --service-install
27-
redis-server --service-start
28-
# Give Redis a moment to start
29-
Start-Sleep -Seconds 5
30-
# Verify Redis is running
31-
redis-cli ping
32-
shell: pwsh
23+
# STEP REMOVED: No longer installing or starting Redis.
3324

34-
- name: Install dependencies
25+
- name: Install dependencies (without Redis)
3526
run: |
3627
python -m pip install --upgrade pip
37-
pip install -e . redis rich
28+
# 'redis' package removed from installation
29+
pip install -e . rich
3830
shell: pwsh
3931

40-
- name: Configure omnipkg for non-interactive use
32+
- name: Configure omnipkg for non-interactive use (without Redis)
4133
run: |
4234
$configDir = "$HOME\.config\omnipkg"
4335
New-Item -ItemType Directory -Force -Path $configDir
4436
37+
# Configuration no longer includes the redis_url
4538
$config = @{
4639
"interactive" = $false;
47-
"auto_confirm" = $true;
48-
"redis_url" = "redis://localhost:6379"
40+
"auto_confirm" = $true
4941
}
5042
5143
$config | ConvertTo-Json -Depth 4 | Out-File -FilePath "$configDir\config.json" -Encoding utf8
@@ -57,7 +49,6 @@ jobs:
5749
- name: Adopt All Required Python Versions
5850
run: |
5951
Write-Host "--- Adopting Python Versions ---"
60-
# Use -ErrorAction SilentlyContinue as adopt may already have the version
6152
omnipkg python adopt 3.9 -ErrorAction SilentlyContinue
6253
omnipkg python adopt 3.10 -ErrorAction SilentlyContinue
6354
shell: pwsh
@@ -66,7 +57,6 @@ jobs:
6657
run: |
6758
Write-Host "--- Resetting and Priming Python environments ---"
6859
69-
# Get Python executables
7060
$PYTHON_INFO = omnipkg info python 2>&1
7161
$PYTHON_39_EXE = ($PYTHON_INFO -split '\r?\n' | Select-String -Pattern 'Python 3.9:' | ForEach-Object { ($_ -split '\s+')[3] })
7262
$PYTHON_310_EXE = ($PYTHON_INFO -split '\r?\n' | Select-String -Pattern 'Python 3.10:' | ForEach-Object { ($_ -split '\s+')[3] })
@@ -76,12 +66,10 @@ jobs:
7666
Write-Host "Priming Python 3.9 by forcing KB rebuild..."
7767
& $PYTHON_39_EXE -m omnipkg.cli reset --yes 2>$null
7868
}
79-
8069
if ($PYTHON_310_EXE) {
8170
Write-Host "Priming Python 3.10 by forcing KB rebuild..."
8271
& $PYTHON_310_EXE -m omnipkg.cli reset --yes 2>$null
8372
}
84-
8573
if ($PYTHON_311_EXE) {
8674
Write-Host "Priming Python 3.11 by forcing KB rebuild..."
8775
& $PYTHON_311_EXE -m omnipkg.cli reset --yes 2>$null
@@ -100,11 +88,45 @@ jobs:
10088
$PYTHON_311_EXE = ($PYTHON_INFO -split '\r?\n' | Select-String -Pattern 'Python 3.11:' | ForEach-Object { ($_ -split '\s+')[3] })
10189
10290
if ($PYTHON_39_EXE) {
103-
Write-Host "Installing rich==13.4.2 for Python 3.9 (expecting it to be bubbled)..."
91+
Write-Host "Installing rich==13.4.2 for Python 3.9..."
10492
& $PYTHON_39_EXE -m omnipkg.cli install rich==13.4.2 2>$null
10593
}
106-
10794
if ($PYTHON_310_EXE) {
108-
Write-Host "Installing rich==13.6.0 for Python 3.10 (expecting it to be bubbled)..."
95+
Write-Host "Installing rich==13.6.0 for Python 3.10..."
10996
& $PYTHON_310_EXE -m omnipkg.cli install rich==13.6.0 2>$null
11097
}
98+
if ($PYTHON_311_EXE) {
99+
Write-Host "Installing rich==13.7.1 for Python 3.11..."
100+
& $PYTHON_311_EXE -m omnipkg.cli install rich==13.7.1 2>$null
101+
}
102+
shell: pwsh
103+
104+
- name: Verify Correct State (Bubbles are Present)
105+
run: |
106+
Write-Host "--- Verifying Package State ---"
107+
108+
$PYTHON_INFO = omnipkg info python 2>&1
109+
$PYTHON_39_EXE = ($PYTHON_INFO -split '\r?\n' | Select-String -Pattern 'Python 3.9:' | ForEach-Object { ($_ -split '\s+')[3] })
110+
$PYTHON_310_EXE = ($PYTHON_INFO -split '\r?\n' | Select-String -Pattern 'Python 3.10:' | ForEach-Object { ($_ -split '\s+')[3] })
111+
$PYTHON_311_EXE = ($PYTHON_INFO -split '\r?\n' | Select-String -Pattern 'Python 3.11:' | ForEach-Object { ($_ -split '\s+')[3] })
112+
113+
function Check-PackageBubble {
114+
param(
115+
[string]$python_exe,
116+
[string]$version,
117+
[string]$python_ver
118+
)
119+
if ($python_exe) {
120+
Write-Host "Verifying state for Python $python_ver..."
121+
$rich_info = & $python_exe -m omnipkg.cli info rich 2>&1
122+
if ($rich_info | Select-String -Pattern "$version \(bubble\)" -Quiet) {
123+
Write-Host "✅ Correct: rich $version is available in a bubble."
124+
return 0
125+
} else {
126+
Write-Host "❌ FAILED: rich $version was not found in a bubble."
127+
Write-Host "Rich info output:"
128+
$rich_info
129+
return 1
130+
}
131+
} else {
132+
Write-Host "⚠️ Python $python_ver executable not found, skipping verifica

0 commit comments

Comments
 (0)