Skip to content

Commit

Permalink
chore: update ci tests to Inkscape 1.1
Browse files Browse the repository at this point in the history
Signed-off-by: t0b3 <thomas.bettler@gmail.com>
  • Loading branch information
t0b3 committed Jun 6, 2021
1 parent f03a214 commit a654f73
Show file tree
Hide file tree
Showing 2 changed files with 11 additions and 11 deletions.
12 changes: 6 additions & 6 deletions .github/workflows/run-tests.yml
Original file line number Diff line number Diff line change
Expand Up @@ -17,7 +17,7 @@ jobs:
matrix:
os: [ubuntu-latest, macos-latest, windows-latest]
python-version: ['3.9']
inkscape-version: ['1.0']
inkscape-version: ['1.1']
continue-on-error: [false]
include:
- { os: 'ubuntu-latest', python-version: '2.7', inkscape-version: '0.92.5', continue-on-error: false }
Expand All @@ -33,15 +33,15 @@ jobs:
uses: actions/setup-python@v2
with:
python-version: ${{ matrix.python-version }}
- name: 🐧 add Inkscape 1.0 repo
if: ${{ matrix.os == 'ubuntu-latest' && matrix.inkscape-version == '1.0' }}
- name: 🐧 add Inkscape 1.1 repo
if: ${{ matrix.os == 'ubuntu-latest' && matrix.inkscape-version == '1.1' }}
run: |
sudo add-apt-repository ppa:inkscape.dev/stable -y # inkscape 1.0 from https://launchpad.net/~inkscape.dev/+archive/ubuntu/stable
sudo add-apt-repository ppa:inkscape.dev/stable -y # inkscape 1.1 from https://launchpad.net/~inkscape.dev/+archive/ubuntu/stable
sudo apt-get update
- name: 🐧 add Inkscape TRUNK repo
if: ${{ matrix.os == 'ubuntu-latest' && matrix.inkscape-version == 'TRUNK' }}
run: |
sudo add-apt-repository ppa:inkscape.dev/trunk -y # inkscape 1.0 from https://launchpad.net/~inkscape.dev/+archive/ubuntu/trunk
sudo add-apt-repository ppa:inkscape.dev/trunk -y # inkscape DEV from https://launchpad.net/~inkscape.dev/+archive/ubuntu/trunk
sudo apt-get update
- name: 🐧 install Inkscape & umockdev
if: ${{ matrix.os == 'ubuntu-latest' }}
Expand All @@ -57,7 +57,7 @@ jobs:
run: |
choco install -y inkscape --version ${{ matrix.inkscape-version }}
- name: 🗖 install Inkscape
if: ${{ matrix.os == 'windows-latest' && matrix.inkscape-version == '1.0' }}
if: ${{ matrix.os == 'windows-latest' && matrix.inkscape-version == '1.1' }}
run: |
choco install -y inkscape
- name: 🗖 patch Inkscape (0.92.5) simpletransform
Expand Down
10 changes: 5 additions & 5 deletions .travis.yml
Original file line number Diff line number Diff line change
Expand Up @@ -31,11 +31,11 @@ jobs:
- sudo sed -i 's:result=re.match("(:result=re.match(r"(:' "/usr/share/inkscape/extensions/simpletransform.py" # fix bug in inkscape extension: regex should use raw string
- sudo apt-get -y install umockdev

- name: "Python: 3.9 -- Inkscape 1.0"
- name: "Python: 3.9 -- Inkscape 1.1"
dist: focal
python: 3.9
before_install:
- sudo add-apt-repository ppa:inkscape.dev/stable -y # inkscape 1.0 from https://launchpad.net/~inkscape.dev/+archive/ubuntu/stable
- sudo add-apt-repository ppa:inkscape.dev/stable -y # inkscape 1.1 from https://launchpad.net/~inkscape.dev/+archive/ubuntu/stable
- sudo apt-get update
install:
- sudo apt-get -y install inkscape
Expand All @@ -46,13 +46,13 @@ jobs:
python: 3.9
env: INKSCAPE_VERSION=9999
before_install:
- sudo add-apt-repository ppa:inkscape.dev/trunk -y # inkscape 1.0 from https://launchpad.net/~inkscape.dev/+archive/ubuntu/trunk
- sudo add-apt-repository ppa:inkscape.dev/trunk -y # inkscape DEV from https://launchpad.net/~inkscape.dev/+archive/ubuntu/trunk
- sudo apt-get update
install:
- sudo apt-get -y install inkscape-trunk
- sudo apt-get -y install umockdev

- name: "Python: 3.9 -- Inkscape 1.0"
- name: "Python: 3.9 -- Inkscape 1.1"
os: osx
osx_image: xcode12.3
language: shell
Expand Down Expand Up @@ -88,7 +88,7 @@ jobs:
- python -m pip install --upgrade pip
- echo $PATH

- name: "Python: 3.9 -- Inkscape 1.0"
- name: "Python: 3.9 -- Inkscape 1.1"
os: windows
language: shell
env: PATH=/c/Python39:/c/Python39/Scripts:$PATH
Expand Down

0 comments on commit a654f73

Please sign in to comment.