aboutsummaryrefslogtreecommitdiff
diff options
context:
space:
mode:
-rw-r--r--.github/workflows/ci.yml26
-rwxr-xr-xdevscripts/install_jython.sh5
2 files changed, 25 insertions, 6 deletions
diff --git a/.github/workflows/ci.yml b/.github/workflows/ci.yml
index 99944e848..ac34196cb 100644
--- a/.github/workflows/ci.yml
+++ b/.github/workflows/ci.yml
@@ -10,28 +10,52 @@ jobs:
os: [ubuntu-latest]
# TODO: python 2.6
python-version: [2.7, 3.3, 3.4, 3.5, 3.6, 3.7, 3.8, 3.9, pypy-2.7, pypy-3.6, pypy-3.7]
+ python-impl: [cpython]
ytdl-test-set: [core, download]
run-tests-ext: [sh]
include:
# python 3.2 is only available on windows via setup-python
- os: windows-latest
python-version: 3.2
+ python-impl: cpython
ytdl-test-set: core
run-tests-ext: bat
- os: windows-latest
python-version: 3.2
+ python-impl: cpython
ytdl-test-set: download
run-tests-ext: bat
+ # jython
+ - os: ubuntu-latest
+ python-impl: jython
+ ytdl-test-set: core
+ run-tests-ext: sh
+ - os: ubuntu-latest
+ python-impl: jython
+ ytdl-test-set: download
+ run-tests-ext: sh
steps:
- uses: actions/checkout@v2
- name: Set up Python ${{ matrix.python-version }}
uses: actions/setup-python@v2
+ if: ${{ matrix.python-impl == 'cpython' }}
with:
python-version: ${{ matrix.python-version }}
+ - name: Set up Java 8
+ if: ${{ matrix.python-impl == 'jython' }}
+ uses: actions/setup-java@v1
+ with:
+ java-version: 8
+ - name: Install Jython
+ if: ${{ matrix.python-impl == 'jython' }}
+ run: |
+ wget http://search.maven.org/remotecontent?filepath=org/python/jython-installer/2.7.1/jython-installer-2.7.1.jar -O jython-installer.jar
+ java -jar jython-installer.jar -s -d "$HOME/jython"
+ echo "$HOME/jython/bin" >> $GITHUB_PATH
- name: Install nose
run: pip install nose
- name: Run tests
- continue-on-error: ${{ matrix.ytdl-test-set == 'download' }}
+ continue-on-error: ${{ matrix.ytdl-test-set == 'download' || matrix.python-impl == 'jython' }}
env:
YTDL_TEST_SET: ${{ matrix.ytdl-test-set }}
run: ./devscripts/run_tests.${{ matrix.run-tests-ext }}
diff --git a/devscripts/install_jython.sh b/devscripts/install_jython.sh
deleted file mode 100755
index bafca4da4..000000000
--- a/devscripts/install_jython.sh
+++ /dev/null
@@ -1,5 +0,0 @@
-#!/bin/bash
-
-wget http://central.maven.org/maven2/org/python/jython-installer/2.7.1/jython-installer-2.7.1.jar
-java -jar jython-installer-2.7.1.jar -s -d "$HOME/jython"
-$HOME/jython/bin/jython -m pip install nose