ci: [refactor] Move pyzmq install and get_previous_releases into ci-windows-cross.py
This commit is contained in:
2 files changed
+13
-6
No files matched your search
@@ -4,6 +4,7 @@
|
|||||||
# file COPYING or https://opensource.org/license/mit/.
|
# file COPYING or https://opensource.org/license/mit/.
|
||||||
|
|
||||||
import argparse
|
import argparse
|
||||||
|
import os
|
||||||
import shlex
|
import shlex
|
||||||
import subprocess
|
import subprocess
|
||||||
import sys
|
import sys
|
||||||
@@ -70,6 +71,15 @@ def prepare_tests():
|
|||||||
content = "\n".join(lines) + "\n"
|
content = "\n".join(lines) + "\n"
|
||||||
config_path.write_text(content)
|
config_path.write_text(content)
|
||||||
print(content)
|
print(content)
|
||||||
|
previous_releases_dir = Path(os.environ["PREVIOUS_RELEASES_DIR"])
|
||||||
|
cmd_download_prev_rel = [
|
||||||
|
sys.executable,
|
||||||
|
str(workspace / "test" / "get_previous_releases.py"),
|
||||||
|
"--target-dir",
|
||||||
|
str(previous_releases_dir),
|
||||||
|
]
|
||||||
|
run(cmd_download_prev_rel)
|
||||||
|
run([sys.executable, "-m", "pip", "install", "pyzmq"])
|
||||||
|
|
||||||
|
|
||||||
def main():
|
def main():
|
||||||
|
|||||||
@@ -425,21 +425,18 @@ jobs:
|
|||||||
./src/univalue/object.exe
|
./src/univalue/object.exe
|
||||||
./src/univalue/unitester.exe
|
./src/univalue/unitester.exe
|
||||||
|
|
||||||
- name: Adjust paths in test/config.ini
|
|
||||||
run: py -3 .github/ci-windows-cross.py prepare_tests
|
|
||||||
|
|
||||||
- name: Set previous release directory
|
- name: Set previous release directory
|
||||||
run: |
|
run: |
|
||||||
echo "PREVIOUS_RELEASES_DIR=${{ runner.temp }}/previous_releases" >> "$GITHUB_ENV"
|
echo "PREVIOUS_RELEASES_DIR=${{ runner.temp }}/previous_releases" >> "$GITHUB_ENV"
|
||||||
|
|
||||||
- name: Get previous releases
|
- name: Prepare Windows test environment
|
||||||
run: ./test/get_previous_releases.py --target-dir $PREVIOUS_RELEASES_DIR
|
run: |
|
||||||
|
py -3 .github/ci-windows-cross.py prepare_tests
|
||||||
|
|
||||||
- name: Run functional tests
|
- name: Run functional tests
|
||||||
env:
|
env:
|
||||||
TEST_RUNNER_EXTRA: ${{ github.event_name != 'pull_request' && '--extended' || '' }}
|
TEST_RUNNER_EXTRA: ${{ github.event_name != 'pull_request' && '--extended' || '' }}
|
||||||
run: |
|
run: |
|
||||||
py -3 -m pip install pyzmq
|
|
||||||
py -3 test/functional/test_runner.py --jobs $NUMBER_OF_PROCESSORS --quiet --tmpdirprefix="$RUNNER_TEMP" --combinedlogslen=99999999 --timeout-factor=$TEST_RUNNER_TIMEOUT_FACTOR $TEST_RUNNER_EXTRA \
|
py -3 test/functional/test_runner.py --jobs $NUMBER_OF_PROCESSORS --quiet --tmpdirprefix="$RUNNER_TEMP" --combinedlogslen=99999999 --timeout-factor=$TEST_RUNNER_TIMEOUT_FACTOR $TEST_RUNNER_EXTRA \
|
||||||
`# feature_unsupported_utxo_db.py fails on Windows because of emojis in the test data directory.` \
|
`# feature_unsupported_utxo_db.py fails on Windows because of emojis in the test data directory.` \
|
||||||
--exclude feature_unsupported_utxo_db.py \
|
--exclude feature_unsupported_utxo_db.py \
|
||||||
|
|||||||
Reference in new issue
Block a user