Skip to content

Commit 46676f4

Browse files
authored
Revert "Ensure bootstrap has been run before install.py" (#24741)
This reverts commit da51007. (#24723) The test_install test is failing on Chromium CI on all platforms, failing to import the bootstrap module (but only when run from the test runner, not when running standalone). https://logs.chromium.org/logs/emscripten-releases/buildbucket/cr-buildbucket/8709018559637274817/+/u/Emscripten_testsuite__other_/stdout I'm not sure why, but given that we do actually run bootstrap in the right places, it should be safe to revert this to unblock the autoroller until we figure it out.
1 parent 382a4cb commit 46676f4

File tree

2 files changed

+0
-10
lines changed

2 files changed

+0
-10
lines changed

.github/workflows/ci.yml

Lines changed: 0 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -17,7 +17,6 @@ jobs:
1717
runs-on: ubuntu-latest
1818
steps:
1919
- uses: actions/checkout@8ade135a41bc03ea155e62e844d188df1ea18608 # v4.1.0
20-
- run: ./bootstrap
2120
- name: make dist
2221
run: |
2322
make dist

tools/install.py

Lines changed: 0 additions & 9 deletions
Original file line numberDiff line numberDiff line change
@@ -17,15 +17,6 @@
1717
import subprocess
1818
import sys
1919

20-
__scriptdir__ = os.path.dirname(os.path.abspath(__file__))
21-
__rootdir__ = os.path.dirname(__scriptdir__)
22-
sys.path.insert(0, __rootdir__)
23-
24-
# Before we can install emscripten we need to at least have bootstrapped
25-
# this checkout
26-
import bootstrap
27-
bootstrap.check()
28-
2920
EXCLUDES = [os.path.normpath(x) for x in '''
3021
test/third_party
3122
tools/maint

0 commit comments

Comments
 (0)