Skip to content

Commit 4f4d747

Browse files
committed
Clean debug changes
1 parent 6d9bef7 commit 4f4d747

File tree

1 file changed

+21
-40
lines changed

1 file changed

+21
-40
lines changed

.github/workflows/build-windows.yml

Lines changed: 21 additions & 40 deletions
Original file line numberDiff line numberDiff line change
@@ -97,25 +97,25 @@ jobs:
9797
with:
9898
platform: ${{ inputs.platform }}
9999

100-
- name: 'Test platform'
101-
id: test-platform
102-
run: |
103-
echo "=== Environment ==="
104-
echo "PROCESSOR_IDENTIFIER: ${PROCESSOR_IDENTIFIER}"
105-
echo "uname -s: $(uname -s)"
106-
echo "uname -m: $(uname -m)"
107-
echo "uname -ar: $(uname -ar)"
108-
echo ""
109-
echo "=== Testing config.guess ==="
110-
cd make/autoconf/build-aux
111-
echo "Direct autoconf-config.guess:"
112-
./autoconf-config.guess || echo "autoconf-config.guess failed"
113-
echo ""
114-
echo "Custom config.guess:"
115-
bash -x ./config.guess
116-
echo "config.site"
117-
cat /etc/config.site
118-
shell: env /usr/bin/bash --login -eo pipefail {0}
100+
# - name: 'Test platform'
101+
# id: test-platform
102+
# run: |
103+
# echo "=== Environment ==="
104+
# echo "PROCESSOR_IDENTIFIER: ${PROCESSOR_IDENTIFIER}"
105+
# echo "uname -s: $(uname -s)"
106+
# echo "uname -m: $(uname -m)"
107+
# echo "uname -ar: $(uname -ar)"
108+
# echo ""
109+
# echo "=== Testing config.guess ==="
110+
# cd make/autoconf/build-aux
111+
# echo "Direct autoconf-config.guess:"
112+
# ./autoconf-config.guess || echo "autoconf-config.guess failed"
113+
# echo ""
114+
# echo "Custom config.guess:"
115+
# bash -x ./config.guess
116+
# echo "config.site"
117+
# cat /etc/config.site
118+
# shell: env /usr/bin/bash --login -eo pipefail {0}
119119

120120
- name: 'Get JTReg'
121121
id: jtreg
@@ -153,18 +153,7 @@ jobs:
153153

154154
- name: 'Configure'
155155
run: >
156-
echo "=== Platform Detection During Configure ===" &&
157-
echo "Before configure - PROCESSOR_IDENTIFIER: ${PROCESSOR_IDENTIFIER}" &&
158-
echo "Before configure - config.guess output:" &&
159-
make/autoconf/build-aux/config.guess &&
160-
echo "=== Environment Check ===" &&
161-
echo "BUILD_PLATFORM: ${BUILD_PLATFORM:-not set}" &&
162-
echo "HOST_PLATFORM: ${HOST_PLATFORM:-not set}" &&
163-
echo "TARGET_PLATFORM: ${TARGET_PLATFORM:-not set}" &&
164-
echo "Remove /etc/config.site" &&
165-
rm -f /etc/config.site &&
166-
echo "=== Running Configure ===" &&
167-
bash -x configure
156+
bash configure
168157
--with-conf-name=${{ inputs.platform }}
169158
${{ matrix.flags }}
170159
--with-version-opt=${GITHUB_ACTOR}-${GITHUB_SHA}
@@ -173,11 +162,9 @@ jobs:
173162
--with-gtest=${{ steps.gtest.outputs.path }}
174163
--with-msvc-toolset-version=${{ inputs.msvc-toolset-version }}
175164
--with-jmod-compress=zip-1
176-
${{ inputs.extra-conf-options }} ${{ inputs.configure-arguments }} 2>&1 | tee configure.log || (
165+
${{ inputs.extra-conf-options }} ${{ inputs.configure-arguments }} || (
177166
echo "Dumping config.log:" &&
178167
cat config.log &&
179-
echo "Dumping configure.log:" &&
180-
cat configure.log &&
181168
exit 1)
182169
env:
183170
# We need a minimal PATH on Windows
@@ -186,12 +173,6 @@ jobs:
186173
shell: env /usr/bin/bash --login -eo pipefail {0}
187174
if: ${{ inputs.dry-run == false }}
188175

189-
- name: 'Upload configure log'
190-
uses: actions/upload-artifact@v4
191-
with:
192-
name: configure-log-${{ inputs.platform }}${{ matrix.suffix }}
193-
path: configure.log
194-
195176
- name: 'Build'
196177
id: build
197178
uses: ./.github/actions/do-build

0 commit comments

Comments
 (0)