Skip to content

Commit 342aad0

Browse files
authored
Merge pull request #1753 from stonebig/master
peach build #26,rectify order of actions
2 parents 6d41e48 + 61278c0 commit 342aad0

File tree

1 file changed

+14
-13
lines changed

1 file changed

+14
-13
lines changed

.github/workflows/github_workflows_build-dot.yml

Lines changed: 14 additions & 13 deletions
Original file line numberDiff line numberDiff line change
@@ -78,18 +78,6 @@ jobs:
7878
# would run with shell: pwsh
7979
#if (-not (Test-Path "dotpython")) { New-Item -ItemType Directory -Path "dotpython" | Out-Null }
8080
#Copy-Item -Path "winpython/portable/launchers_final/*" -Destination "dotpython/" -Recurse -Force
81-
82-
- name: Write env.ini file
83-
shell: pwsh
84-
run: |
85-
$destDir = "$env:build_location\python\scripts"
86-
echo "WINPYthon_exe=$env:WINPYthon_exe" > env.ini
87-
echo "WINPYthon_subdirectory_name=$env:WINPYthon_subdirectory_name" >> env.ini
88-
echo "WINPYVER=$env:WINPYVER" >> env.ini
89-
echo "WINPYVER2=$env:WINPYVER2" >> env.ini
90-
echo "WINPYFLAVOR=$env:WINPYFLAVOR" >> env.ini
91-
echo "WINPYARCH=$env:WINPYARCH" >> env.ini
92-
Copy-Item -Path "env.ini" -Destination "$destDir\env.ini"
9381
9482
- name: List dotpython contents (for debugging)
9583
shell: pwsh
@@ -103,11 +91,24 @@ jobs:
10391
Get-ChildItem -Path dotpython -Force | Move-Item -Destination $env:build_location -Force
10492
# Add more WinPython-specific folders/files here if needed
10593
106-
- name: upgrade pip to get icons launchers
94+
- name: upgrade pip to get structure and icons launchers
10795
shell: pwsh
10896
run: |
10997
& "$env:build_location\python\python.exe" -m pip install --upgrade pip
11098
99+
100+
- name: Write env.ini file
101+
shell: pwsh
102+
run: |
103+
$destDir = "$env:build_location\python\scripts"
104+
echo "WINPYthon_exe=$env:WINPYthon_exe" > env.ini
105+
echo "WINPYthon_subdirectory_name=$env:WINPYthon_subdirectory_name" >> env.ini
106+
echo "WINPYVER=$env:WINPYVER" >> env.ini
107+
echo "WINPYVER2=$env:WINPYVER2" >> env.ini
108+
echo "WINPYFLAVOR=$env:WINPYFLAVOR" >> env.ini
109+
echo "WINPYARCH=$env:WINPYARCH" >> env.ini
110+
Copy-Item -Path "env.ini" -Destination "$destDir\env.ini"
111+
111112
- name: download requirements as hashed-requirements in dotpython\wheelhouse
112113
shell: pwsh
113114
run: |

0 commit comments

Comments
 (0)