From ce6895343f46d44e8030affae092bdfa77f8b9c8 Mon Sep 17 00:00:00 2001 From: Poruri Sai Rahul Date: Mon, 8 Nov 2021 13:59:36 +0000 Subject: [PATCH 1/5] FIX : Test on ubuntu-18.04, not 16.04 ubuntu-16.04 is no longer available on GitHub Actions CI --- .github/workflows/test-with-edm.yml | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/.github/workflows/test-with-edm.yml b/.github/workflows/test-with-edm.yml index 48940c975..5e3d17cb1 100644 --- a/.github/workflows/test-with-edm.yml +++ b/.github/workflows/test-with-edm.yml @@ -16,7 +16,7 @@ jobs: strategy: matrix: toolkit: ['null', 'pyqt5', 'pyside2', 'wx'] - runs-on: ubuntu-16.04 + runs-on: ubuntu-18.04 steps: - uses: actions/checkout@v2 - name: Install Qt dependencies for Linux From 9c0b1070fefa426401933ed1af2967e052dadfcb Mon Sep 17 00:00:00 2001 From: Poruri Sai Rahul Date: Mon, 8 Nov 2021 14:11:20 +0000 Subject: [PATCH 2/5] FIX : Use ubuntu-latest instead of ubuntu-18.04 --- .github/workflows/test-with-edm.yml | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/.github/workflows/test-with-edm.yml b/.github/workflows/test-with-edm.yml index 5e3d17cb1..77e67f234 100644 --- a/.github/workflows/test-with-edm.yml +++ b/.github/workflows/test-with-edm.yml @@ -16,7 +16,7 @@ jobs: strategy: matrix: toolkit: ['null', 'pyqt5', 'pyside2', 'wx'] - runs-on: ubuntu-18.04 + runs-on: ubuntu-latest steps: - uses: actions/checkout@v2 - name: Install Qt dependencies for Linux From 40026534ba3c06cade67fa0f0456485d62441877 Mon Sep 17 00:00:00 2001 From: Poruri Sai Rahul Date: Mon, 8 Nov 2021 14:16:26 +0000 Subject: [PATCH 3/5] FIX : Use ubuntu-18.04 with the right package repository modified: .github/workflows/test-with-edm.yml modified: ci/edmtool.py --- .github/workflows/test-with-edm.yml | 2 +- ci/edmtool.py | 2 +- 2 files changed, 2 insertions(+), 2 deletions(-) diff --git a/.github/workflows/test-with-edm.yml b/.github/workflows/test-with-edm.yml index 77e67f234..5e3d17cb1 100644 --- a/.github/workflows/test-with-edm.yml +++ b/.github/workflows/test-with-edm.yml @@ -16,7 +16,7 @@ jobs: strategy: matrix: toolkit: ['null', 'pyqt5', 'pyside2', 'wx'] - runs-on: ubuntu-latest + runs-on: ubuntu-18.04 steps: - uses: actions/checkout@v2 - name: Install Qt dependencies for Linux diff --git a/ci/edmtool.py b/ci/edmtool.py index dad3bab48..c27afb8ef 100644 --- a/ci/edmtool.py +++ b/ci/edmtool.py @@ -188,7 +188,7 @@ def install(runtime, toolkit, environment, source): elif sys.platform == "linux": # XXX this is mainly for TravisCI workers; need a generic solution commands.append( - "edm run -e {environment} -- pip install -f https://extras.wxpython.org/wxPython4/extras/linux/gtk3/ubuntu-16.04/ wxPython<4.1" # noqa: E501 + "edm run -e {environment} -- pip install -f https://extras.wxpython.org/wxPython4/extras/linux/gtk3/ubuntu-18.04/ wxPython<4.1" # noqa: E501 ) else: commands.append( From bbb8eef9ed82a82389eb6e0ef5fe98a6622d6d2d Mon Sep 17 00:00:00 2001 From: Poruri Sai Rahul Date: Mon, 8 Nov 2021 14:24:33 +0000 Subject: [PATCH 4/5] FIX : Install libsdl2-dev using the ubuntu package manager modified: .github/workflows/test-with-edm.yml --- .github/workflows/test-with-edm.yml | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/.github/workflows/test-with-edm.yml b/.github/workflows/test-with-edm.yml index 5e3d17cb1..241cbbd80 100644 --- a/.github/workflows/test-with-edm.yml +++ b/.github/workflows/test-with-edm.yml @@ -27,7 +27,7 @@ jobs: - name: Install Wx dependencies for Linux run: | sudo apt-get update - sudo apt-get install libsdl2-2.0-0 + sudo apt-get install libsdl2-dev if: matrix.toolkit == 'wx' - name: Install GL dependencies for Linux run: sudo apt-get install libglu1-mesa-dev From c2b24205a20d00182a11983eb294fa4c9ac56b51 Mon Sep 17 00:00:00 2001 From: Poruri Sai Rahul Date: Mon, 8 Nov 2021 14:30:36 +0000 Subject: [PATCH 5/5] FIX : Use libsdl1.2, not libsdl2 modified: .github/workflows/test-with-edm.yml --- .github/workflows/test-with-edm.yml | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/.github/workflows/test-with-edm.yml b/.github/workflows/test-with-edm.yml index 241cbbd80..7dc6bb236 100644 --- a/.github/workflows/test-with-edm.yml +++ b/.github/workflows/test-with-edm.yml @@ -27,7 +27,7 @@ jobs: - name: Install Wx dependencies for Linux run: | sudo apt-get update - sudo apt-get install libsdl2-dev + sudo apt-get install libsdl1.2-dev if: matrix.toolkit == 'wx' - name: Install GL dependencies for Linux run: sudo apt-get install libglu1-mesa-dev