Skip to content

Commit f03b025

Browse files
attempting to correct paths
1 parent 9bd23a2 commit f03b025

File tree

1 file changed

+3
-15
lines changed

1 file changed

+3
-15
lines changed

.github/workflows/build_wheels.yml

Lines changed: 3 additions & 15 deletions
Original file line numberDiff line numberDiff line change
@@ -132,6 +132,7 @@ jobs:
132132
if: ${{ matrix.os == 'windows-latest'}}
133133
run: |
134134
git clone --depth 1 https://github.com/flang-compiler/flang.git ${{ github.workspace }}
135+
mv ${{ github.workspace }}/* ${{ github.workspace }}/..
135136
136137
- name: Install Windows Dependencies (Part 0b - Setup LLVM Build Env)
137138
if: ${{ matrix.os == 'windows-latest'}}
@@ -153,12 +154,7 @@ jobs:
153154
if: ${{ matrix.os == 'windows-latest'}}
154155
run: pip install sphinx
155156

156-
- name: Install Windows Dependencies (Part 0f - Prepare Flang source)
157-
if : ${{ matrix.os == 'windows-latest'}}
158-
run: |
159-
git clone --depth 1 https://github.com/flang-compiler/flang.git /flang_build
160-
161-
- name: Install Windows Dependencies (Part 0g - Download pre-built "cmade" LLVM)
157+
- name: Install Windows Dependencies (Part 0f - Download pre-built "cmade" LLVM)
162158
run: |
163159
cd ../..
164160
# Search backwards in the workflow history for the specified branch
@@ -198,18 +194,10 @@ jobs:
198194
shell: powershell
199195
run: |
200196
$pcount = $($(Get-WmiObject -class Win32_ComputerSystem).numberoflogicalprocessors)
201-
python .\scripts\build_flang.py -b "Release" -d build -t X86 -p "$(pwd)\..\..\classic-flang-llvm-project\classic-flang-llvm-project\build\" -j $pcount -v
197+
python ..\scripts\build_flang.py -b "Release" -d build -t X86 -p "$(pwd)\..\..\classic-flang-llvm-project\classic-flang-llvm-project\build\" -j $pcount -v
202198
$resolved = Resolve-Path "$(pwd)\..\..\classic-flang-llvm-project\classic-flang-llvm-project\build\"
203199
$resolved.Path | Set-Content -Path $env:GITHUB_PATH
204200
205-
- name: Install Windows Dependencies (Part 1b - Confirm Neccessary LLVM Tools are Installed)
206-
if: matrix.os == 'windows-latest'
207-
run: |
208-
clang --version
209-
clang++ --version
210-
flang --version
211-
which flang
212-
213201
- name: Install Windows Dependencies (Part 2a - Reclean Windows Workspace)
214202
if: ${{ matrix.os == 'windows-latest'}}
215203
run: Remove-Item * -Recurse -Force

0 commit comments

Comments
 (0)