Upgrade linux tests

palaeoverse · Oct 10, 2023 · b08c81c · b08c81c
1 parent 820445e
commit b08c81c
Show file tree

Hide file tree

Showing 2 changed files with 4 additions and 30 deletions.
diff --git a/.github/workflows/R-CMD-check.yaml b/.github/workflows/R-CMD-check.yaml
@@ -20,9 +20,9 @@ jobs:
         config:
           - {os: macos-latest,   r: 'release'}
           - {os: windows-latest, r: 'release'}
-          - {os: ubuntu-20.04,   r: 'devel', http-user-agent: 'release'}
-          - {os: ubuntu-20.04,   r: 'release'}
-          - {os: ubuntu-20.04,   r: 'oldrel-1'}
+          - {os: ubuntu-22.04,   r: 'devel', http-user-agent: 'release'}
+          - {os: ubuntu-22.04,   r: 'release'}
+          - {os: ubuntu-22.04,   r: 'oldrel-1'}
 
     env:
       GITHUB_PAT: ${{ secrets.GITHUB_TOKEN }}
@@ -44,19 +44,6 @@ jobs:
           extra-packages: any::rcmdcheck
           needs: check
 
-      - name: Downgrade librsvg2 if needed
-        if: runner.os == 'Linux'
-        run: |
-          curl -O http://launchpadlibrarian.net/509454689/librsvg2-2_2.48.9-1ubuntu0.20.04.1_amd64.deb
-          sudo apt install --fix-broken --allow-downgrades ./librsvg2-2_2.48.9-1ubuntu0.20.04.1_amd64.deb
-          curl -O http://launchpadlibrarian.net/509454691/librsvg2-common_2.48.9-1ubuntu0.20.04.1_amd64.deb
-          sudo apt install --fix-broken --allow-downgrades ./librsvg2-common_2.48.9-1ubuntu0.20.04.1_amd64.deb
-          curl -O http://launchpadlibrarian.net/509454680/gir1.2-rsvg-2.0_2.48.9-1ubuntu0.20.04.1_amd64.deb
-          sudo apt install --fix-broken --allow-downgrades ./gir1.2-rsvg-2.0_2.48.9-1ubuntu0.20.04.1_amd64.deb
-          curl -O http://launchpadlibrarian.net/509454685/librsvg2-dev_2.48.9-1ubuntu0.20.04.1_amd64.deb
-          sudo apt install --fix-broken --allow-downgrades ./librsvg2-dev_2.48.9-1ubuntu0.20.04.1_amd64.deb
-        shell: bash
-
       - uses: r-lib/actions/check-r-package@v2
         with:
           upload-snapshots: true
diff --git a/.github/workflows/test-coverage.yaml b/.github/workflows/test-coverage.yaml
@@ -10,7 +10,7 @@ name: test-coverage
 
 jobs:
   test-coverage:
-    runs-on: ubuntu-20.04
+    runs-on: ubuntu-22.04
     env:
       GITHUB_PAT: ${{ secrets.GITHUB_TOKEN }}
 
@@ -26,19 +26,6 @@ jobs:
           extra-packages: any::covr
           needs: coverage
 
-      - name: Downgrade librsvg2 if needed
-        if: runner.os == 'Linux'
-        run: |
-          curl -O http://launchpadlibrarian.net/509454689/librsvg2-2_2.48.9-1ubuntu0.20.04.1_amd64.deb
-          sudo apt install --fix-broken --allow-downgrades ./librsvg2-2_2.48.9-1ubuntu0.20.04.1_amd64.deb
-          curl -O http://launchpadlibrarian.net/509454691/librsvg2-common_2.48.9-1ubuntu0.20.04.1_amd64.deb
-          sudo apt install --fix-broken --allow-downgrades ./librsvg2-common_2.48.9-1ubuntu0.20.04.1_amd64.deb
-          curl -O http://launchpadlibrarian.net/509454680/gir1.2-rsvg-2.0_2.48.9-1ubuntu0.20.04.1_amd64.deb
-          sudo apt install --fix-broken --allow-downgrades ./gir1.2-rsvg-2.0_2.48.9-1ubuntu0.20.04.1_amd64.deb
-          curl -O http://launchpadlibrarian.net/509454685/librsvg2-dev_2.48.9-1ubuntu0.20.04.1_amd64.deb
-          sudo apt install --fix-broken --allow-downgrades ./librsvg2-dev_2.48.9-1ubuntu0.20.04.1_amd64.deb
-        shell: bash
-
       - name: Test coverage
         env:
           CODECOV_TOKEN: ${{ secrets.CODECOV_TOKEN }}