From 93cadc41075ac34c0163277e6346f98d95e54bfb Mon Sep 17 00:00:00 2001 From: Chris Mead Date: Tue, 17 Dec 2024 08:35:37 -0700 Subject: [PATCH 01/24] Try fixing unit tests with libasound2 --- .github/actions/setup-build-env/action.yml | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/.github/actions/setup-build-env/action.yml b/.github/actions/setup-build-env/action.yml index df699d574ac..3cb7a6c0a24 100644 --- a/.github/actions/setup-build-env/action.yml +++ b/.github/actions/setup-build-env/action.yml @@ -11,7 +11,7 @@ runs: vim curl build-essential clang make cmake git \ libsodium-dev libxkbfile-dev pkg-config libsecret-1-dev libxss1 dbus xvfb \ libgtk-3-0 libgbm1 libnss3 libnspr4 libasound2 libkrb5-dev libcairo-dev \ - libsdl-pango-dev libjpeg-dev libgif-dev pandoc + libsdl-pango-dev libjpeg-dev libgif-dev pandoc libasound2 - name: Install Node packages shell: bash From 88f0b1a6d83e852fcd662c0c21a4d44eafe8401a Mon Sep 17 00:00:00 2001 From: Chris Mead Date: Tue, 17 Dec 2024 08:37:53 -0700 Subject: [PATCH 02/24] try liboss4-salsa-asound2 --- .github/actions/setup-build-env/action.yml | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/.github/actions/setup-build-env/action.yml b/.github/actions/setup-build-env/action.yml index 3cb7a6c0a24..31dd0c54fe3 100644 --- a/.github/actions/setup-build-env/action.yml +++ b/.github/actions/setup-build-env/action.yml @@ -11,7 +11,7 @@ runs: vim curl build-essential clang make cmake git \ libsodium-dev libxkbfile-dev pkg-config libsecret-1-dev libxss1 dbus xvfb \ libgtk-3-0 libgbm1 libnss3 libnspr4 libasound2 libkrb5-dev libcairo-dev \ - libsdl-pango-dev libjpeg-dev libgif-dev pandoc libasound2 + libsdl-pango-dev libjpeg-dev libgif-dev pandoc liboss4-salsa-asound2 - name: Install Node packages shell: bash From 05e930d0ae17cb0537ee27cb5dd1965c207d714d Mon Sep 17 00:00:00 2001 From: Chris Mead Date: Tue, 17 Dec 2024 08:45:24 -0700 Subject: [PATCH 03/24] try add-apt-repository --- .github/actions/setup-build-env/action.yml | 6 +++++- 1 file changed, 5 insertions(+), 1 deletion(-) diff --git a/.github/actions/setup-build-env/action.yml b/.github/actions/setup-build-env/action.yml index 31dd0c54fe3..98ad33d9a57 100644 --- a/.github/actions/setup-build-env/action.yml +++ b/.github/actions/setup-build-env/action.yml @@ -6,12 +6,16 @@ runs: - name: Install Build Dependencies shell: bash run: | + sudo add-apt-repository main + sudo add-apt-repository universe + sudo add-apt-repository restricted + sudo add-apt-repository multiverse sudo apt-get update sudo apt-get install -y \ vim curl build-essential clang make cmake git \ libsodium-dev libxkbfile-dev pkg-config libsecret-1-dev libxss1 dbus xvfb \ libgtk-3-0 libgbm1 libnss3 libnspr4 libasound2 libkrb5-dev libcairo-dev \ - libsdl-pango-dev libjpeg-dev libgif-dev pandoc liboss4-salsa-asound2 + libsdl-pango-dev libjpeg-dev libgif-dev pandoc - name: Install Node packages shell: bash From 5b2f6e85a610688e0f404f0ec25cf9b791b3a847 Mon Sep 17 00:00:00 2001 From: Chris Mead Date: Tue, 17 Dec 2024 08:50:36 -0700 Subject: [PATCH 04/24] another try --- .github/actions/setup-build-env/action.yml | 5 +---- 1 file changed, 1 insertion(+), 4 deletions(-) diff --git a/.github/actions/setup-build-env/action.yml b/.github/actions/setup-build-env/action.yml index 98ad33d9a57..f291e90d258 100644 --- a/.github/actions/setup-build-env/action.yml +++ b/.github/actions/setup-build-env/action.yml @@ -6,16 +6,13 @@ runs: - name: Install Build Dependencies shell: bash run: | - sudo add-apt-repository main - sudo add-apt-repository universe - sudo add-apt-repository restricted - sudo add-apt-repository multiverse sudo apt-get update sudo apt-get install -y \ vim curl build-essential clang make cmake git \ libsodium-dev libxkbfile-dev pkg-config libsecret-1-dev libxss1 dbus xvfb \ libgtk-3-0 libgbm1 libnss3 libnspr4 libasound2 libkrb5-dev libcairo-dev \ libsdl-pango-dev libjpeg-dev libgif-dev pandoc + sudo apt-get install libasound2 -t noble - name: Install Node packages shell: bash From bb34435f103202e233cd5ecda9b78c9a459b8bdd Mon Sep 17 00:00:00 2001 From: Chris Mead Date: Tue, 17 Dec 2024 08:51:56 -0700 Subject: [PATCH 05/24] change order --- .github/actions/setup-build-env/action.yml | 3 ++- 1 file changed, 2 insertions(+), 1 deletion(-) diff --git a/.github/actions/setup-build-env/action.yml b/.github/actions/setup-build-env/action.yml index f291e90d258..521f3eab5a4 100644 --- a/.github/actions/setup-build-env/action.yml +++ b/.github/actions/setup-build-env/action.yml @@ -7,12 +7,13 @@ runs: shell: bash run: | sudo apt-get update + sudo apt-get install libasound2 -t noble sudo apt-get install -y \ vim curl build-essential clang make cmake git \ libsodium-dev libxkbfile-dev pkg-config libsecret-1-dev libxss1 dbus xvfb \ libgtk-3-0 libgbm1 libnss3 libnspr4 libasound2 libkrb5-dev libcairo-dev \ libsdl-pango-dev libjpeg-dev libgif-dev pandoc - sudo apt-get install libasound2 -t noble + - name: Install Node packages shell: bash From 23e5ea9606c4306e21fc631d69dfcf6f44d14a5e Mon Sep 17 00:00:00 2001 From: Chris Mead Date: Tue, 17 Dec 2024 09:02:27 -0700 Subject: [PATCH 06/24] debug --- .github/actions/setup-build-env/action.yml | 3 ++- 1 file changed, 2 insertions(+), 1 deletion(-) diff --git a/.github/actions/setup-build-env/action.yml b/.github/actions/setup-build-env/action.yml index 521f3eab5a4..92e5f09bcbd 100644 --- a/.github/actions/setup-build-env/action.yml +++ b/.github/actions/setup-build-env/action.yml @@ -6,8 +6,9 @@ runs: - name: Install Build Dependencies shell: bash run: | + cat /etc/apt/sources.list + apt-cache policy libasound2 sudo apt-get update - sudo apt-get install libasound2 -t noble sudo apt-get install -y \ vim curl build-essential clang make cmake git \ libsodium-dev libxkbfile-dev pkg-config libsecret-1-dev libxss1 dbus xvfb \ From eaf01473426f9578a69b861749e43cd4999bd65f Mon Sep 17 00:00:00 2001 From: Chris Mead Date: Tue, 17 Dec 2024 09:09:00 -0700 Subject: [PATCH 07/24] try dpkg install --- .github/actions/setup-build-env/action.yml | 5 +++-- 1 file changed, 3 insertions(+), 2 deletions(-) diff --git a/.github/actions/setup-build-env/action.yml b/.github/actions/setup-build-env/action.yml index 92e5f09bcbd..48ae286ae8e 100644 --- a/.github/actions/setup-build-env/action.yml +++ b/.github/actions/setup-build-env/action.yml @@ -6,8 +6,9 @@ runs: - name: Install Build Dependencies shell: bash run: | - cat /etc/apt/sources.list - apt-cache policy libasound2 + wget http://archive.ubuntu.com/ubuntu/pool/main/a/alsa-lib/libasound2_1.2.8-1_amd64.deb + sudo dpkg -i libasound2_1.2.8-1_amd64.deb + sudo apt-get install -f sudo apt-get update sudo apt-get install -y \ vim curl build-essential clang make cmake git \ From b93b4144ee4a64a8381dad8ea5254ac5336dfc9e Mon Sep 17 00:00:00 2001 From: Chris Mead Date: Tue, 17 Dec 2024 09:13:55 -0700 Subject: [PATCH 08/24] another approach --- .github/actions/setup-build-env/action.yml | 5 ++--- 1 file changed, 2 insertions(+), 3 deletions(-) diff --git a/.github/actions/setup-build-env/action.yml b/.github/actions/setup-build-env/action.yml index 48ae286ae8e..cb7c76e4029 100644 --- a/.github/actions/setup-build-env/action.yml +++ b/.github/actions/setup-build-env/action.yml @@ -6,10 +6,9 @@ runs: - name: Install Build Dependencies shell: bash run: | - wget http://archive.ubuntu.com/ubuntu/pool/main/a/alsa-lib/libasound2_1.2.8-1_amd64.deb - sudo dpkg -i libasound2_1.2.8-1_amd64.deb - sudo apt-get install -f + sudo add-apt-repository "deb http://archive.ubuntu.com/ubuntu noble-proposed main universe" sudo apt-get update + sudo apt-get install libasound2 sudo apt-get install -y \ vim curl build-essential clang make cmake git \ libsodium-dev libxkbfile-dev pkg-config libsecret-1-dev libxss1 dbus xvfb \ From 90e6f4dcba68503c83568ecac7cb6086a8eef4e2 Mon Sep 17 00:00:00 2001 From: Chris Mead Date: Tue, 17 Dec 2024 09:17:00 -0700 Subject: [PATCH 09/24] check for os update --- .github/actions/setup-build-env/action.yml | 3 +-- 1 file changed, 1 insertion(+), 2 deletions(-) diff --git a/.github/actions/setup-build-env/action.yml b/.github/actions/setup-build-env/action.yml index cb7c76e4029..93cc11110d7 100644 --- a/.github/actions/setup-build-env/action.yml +++ b/.github/actions/setup-build-env/action.yml @@ -6,9 +6,8 @@ runs: - name: Install Build Dependencies shell: bash run: | - sudo add-apt-repository "deb http://archive.ubuntu.com/ubuntu noble-proposed main universe" + cat /etc/os-release sudo apt-get update - sudo apt-get install libasound2 sudo apt-get install -y \ vim curl build-essential clang make cmake git \ libsodium-dev libxkbfile-dev pkg-config libsecret-1-dev libxss1 dbus xvfb \ From b84b9f88d15c80dc818e53b226a116361c61950d Mon Sep 17 00:00:00 2001 From: Chris Mead Date: Tue, 17 Dec 2024 09:21:01 -0700 Subject: [PATCH 10/24] dpkg again --- .github/actions/setup-build-env/action.yml | 4 +++- 1 file changed, 3 insertions(+), 1 deletion(-) diff --git a/.github/actions/setup-build-env/action.yml b/.github/actions/setup-build-env/action.yml index 93cc11110d7..b225dc0efbe 100644 --- a/.github/actions/setup-build-env/action.yml +++ b/.github/actions/setup-build-env/action.yml @@ -6,7 +6,9 @@ runs: - name: Install Build Dependencies shell: bash run: | - cat /etc/os-release + wget http://archive.ubuntu.com/ubuntu/pool/main/a/alsa-lib/libasound2_1.2.6.1-1ubuntu1_amd64.deb + sudo dpkg -i libasound2_1.2.6.1-1ubuntu1_amd64.deb + sudo apt-get install -f sudo apt-get update sudo apt-get install -y \ vim curl build-essential clang make cmake git \ From 51ee7daacb0b4ad77ea2a16a9464e7c9ab999548 Mon Sep 17 00:00:00 2001 From: Chris Mead Date: Tue, 17 Dec 2024 09:24:06 -0700 Subject: [PATCH 11/24] jammy fallback --- .github/actions/setup-build-env/action.yml | 7 ++++--- 1 file changed, 4 insertions(+), 3 deletions(-) diff --git a/.github/actions/setup-build-env/action.yml b/.github/actions/setup-build-env/action.yml index b225dc0efbe..1f1bb96eab2 100644 --- a/.github/actions/setup-build-env/action.yml +++ b/.github/actions/setup-build-env/action.yml @@ -6,10 +6,11 @@ runs: - name: Install Build Dependencies shell: bash run: | - wget http://archive.ubuntu.com/ubuntu/pool/main/a/alsa-lib/libasound2_1.2.6.1-1ubuntu1_amd64.deb - sudo dpkg -i libasound2_1.2.6.1-1ubuntu1_amd64.deb - sudo apt-get install -f + sudo add-apt-repository "deb http://archive.ubuntu.com/ubuntu jammy main universe" sudo apt-get update + sudo apt-get install libasound2 + sudo add-apt-repository --remove "deb http://archive.ubuntu.com/ubuntu jammy main universe" +sudo apt-get update sudo apt-get install -y \ vim curl build-essential clang make cmake git \ libsodium-dev libxkbfile-dev pkg-config libsecret-1-dev libxss1 dbus xvfb \ From 0d0a2980bbbb9b97b3afc82ca5adfaac304ed165 Mon Sep 17 00:00:00 2001 From: Chris Mead Date: Tue, 17 Dec 2024 09:25:32 -0700 Subject: [PATCH 12/24] typo --- .github/actions/setup-build-env/action.yml | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/.github/actions/setup-build-env/action.yml b/.github/actions/setup-build-env/action.yml index 1f1bb96eab2..d811910d8c0 100644 --- a/.github/actions/setup-build-env/action.yml +++ b/.github/actions/setup-build-env/action.yml @@ -10,7 +10,7 @@ runs: sudo apt-get update sudo apt-get install libasound2 sudo add-apt-repository --remove "deb http://archive.ubuntu.com/ubuntu jammy main universe" -sudo apt-get update + sudo apt-get update sudo apt-get install -y \ vim curl build-essential clang make cmake git \ libsodium-dev libxkbfile-dev pkg-config libsecret-1-dev libxss1 dbus xvfb \ From f0a8e408edc02f3ea458e1a6d8ae16dfcbb5bdf5 Mon Sep 17 00:00:00 2001 From: Chris Mead Date: Tue, 17 Dec 2024 09:29:07 -0700 Subject: [PATCH 13/24] sudo apt-get install libasound2t64 --- .github/actions/setup-build-env/action.yml | 1 + 1 file changed, 1 insertion(+) diff --git a/.github/actions/setup-build-env/action.yml b/.github/actions/setup-build-env/action.yml index d811910d8c0..6521c9e185f 100644 --- a/.github/actions/setup-build-env/action.yml +++ b/.github/actions/setup-build-env/action.yml @@ -11,6 +11,7 @@ runs: sudo apt-get install libasound2 sudo add-apt-repository --remove "deb http://archive.ubuntu.com/ubuntu jammy main universe" sudo apt-get update + sudo apt-get install libasound2t64 sudo apt-get install -y \ vim curl build-essential clang make cmake git \ libsodium-dev libxkbfile-dev pkg-config libsecret-1-dev libxss1 dbus xvfb \ From ddce5a0e6825fae44264e0315962209602ff4437 Mon Sep 17 00:00:00 2001 From: Chris Mead Date: Tue, 17 Dec 2024 09:32:48 -0700 Subject: [PATCH 14/24] change order --- .github/actions/setup-build-env/action.yml | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/.github/actions/setup-build-env/action.yml b/.github/actions/setup-build-env/action.yml index 6521c9e185f..26c3f659ebf 100644 --- a/.github/actions/setup-build-env/action.yml +++ b/.github/actions/setup-build-env/action.yml @@ -9,9 +9,9 @@ runs: sudo add-apt-repository "deb http://archive.ubuntu.com/ubuntu jammy main universe" sudo apt-get update sudo apt-get install libasound2 + sudo apt-get install libasound2t64 sudo add-apt-repository --remove "deb http://archive.ubuntu.com/ubuntu jammy main universe" sudo apt-get update - sudo apt-get install libasound2t64 sudo apt-get install -y \ vim curl build-essential clang make cmake git \ libsodium-dev libxkbfile-dev pkg-config libsecret-1-dev libxss1 dbus xvfb \ From 6f483eddd545f6586f3a62bf906acc0f56f6c8d4 Mon Sep 17 00:00:00 2001 From: Chris Mead Date: Tue, 17 Dec 2024 09:37:11 -0700 Subject: [PATCH 15/24] libasound2t64 --- .github/actions/setup-build-env/action.yml | 4 ---- 1 file changed, 4 deletions(-) diff --git a/.github/actions/setup-build-env/action.yml b/.github/actions/setup-build-env/action.yml index 26c3f659ebf..bacaca7f35e 100644 --- a/.github/actions/setup-build-env/action.yml +++ b/.github/actions/setup-build-env/action.yml @@ -6,12 +6,8 @@ runs: - name: Install Build Dependencies shell: bash run: | - sudo add-apt-repository "deb http://archive.ubuntu.com/ubuntu jammy main universe" sudo apt-get update - sudo apt-get install libasound2 sudo apt-get install libasound2t64 - sudo add-apt-repository --remove "deb http://archive.ubuntu.com/ubuntu jammy main universe" - sudo apt-get update sudo apt-get install -y \ vim curl build-essential clang make cmake git \ libsodium-dev libxkbfile-dev pkg-config libsecret-1-dev libxss1 dbus xvfb \ From 6b3bca24cc82d804def9c538d1aab293d8437b76 Mon Sep 17 00:00:00 2001 From: Chris Mead Date: Tue, 17 Dec 2024 09:40:11 -0700 Subject: [PATCH 16/24] oops --- .github/actions/setup-build-env/action.yml | 3 +-- 1 file changed, 1 insertion(+), 2 deletions(-) diff --git a/.github/actions/setup-build-env/action.yml b/.github/actions/setup-build-env/action.yml index bacaca7f35e..8f00aa9f1b1 100644 --- a/.github/actions/setup-build-env/action.yml +++ b/.github/actions/setup-build-env/action.yml @@ -7,11 +7,10 @@ runs: shell: bash run: | sudo apt-get update - sudo apt-get install libasound2t64 sudo apt-get install -y \ vim curl build-essential clang make cmake git \ libsodium-dev libxkbfile-dev pkg-config libsecret-1-dev libxss1 dbus xvfb \ - libgtk-3-0 libgbm1 libnss3 libnspr4 libasound2 libkrb5-dev libcairo-dev \ + libgtk-3-0 libgbm1 libnss3 libnspr4 libasound2t64 libkrb5-dev libcairo-dev \ libsdl-pango-dev libjpeg-dev libgif-dev pandoc From 898764fafc2aa14bfc954f521580418d3a8856aa Mon Sep 17 00:00:00 2001 From: Chris Mead Date: Tue, 17 Dec 2024 09:45:25 -0700 Subject: [PATCH 17/24] extra line --- .github/actions/setup-build-env/action.yml | 1 - 1 file changed, 1 deletion(-) diff --git a/.github/actions/setup-build-env/action.yml b/.github/actions/setup-build-env/action.yml index 8f00aa9f1b1..f8e011163bb 100644 --- a/.github/actions/setup-build-env/action.yml +++ b/.github/actions/setup-build-env/action.yml @@ -13,7 +13,6 @@ runs: libgtk-3-0 libgbm1 libnss3 libnspr4 libasound2t64 libkrb5-dev libcairo-dev \ libsdl-pango-dev libjpeg-dev libgif-dev pandoc - - name: Install Node packages shell: bash env: From b54229662600673fda35ffddbba509372386999e Mon Sep 17 00:00:00 2001 From: Chris Mead Date: Tue, 17 Dec 2024 10:08:52 -0700 Subject: [PATCH 18/24] switch on version --- .github/actions/setup-build-env/action.yml | 17 +++++++++++++++-- 1 file changed, 15 insertions(+), 2 deletions(-) diff --git a/.github/actions/setup-build-env/action.yml b/.github/actions/setup-build-env/action.yml index f8e011163bb..4523064966c 100644 --- a/.github/actions/setup-build-env/action.yml +++ b/.github/actions/setup-build-env/action.yml @@ -6,11 +6,24 @@ runs: - name: Install Build Dependencies shell: bash run: | - sudo apt-get update + # Detect Ubuntu version + UBUNTU_VERSION=$(lsb_release -rs) + echo "Running on Ubuntu version: $UBUNTU_VERSION" + + # Install libasound2 or libasound2t64 based on version + if [[ "$UBUNTU_VERSION" == "24.04" ]]; then + echo "Installing libasound2t64 for Ubuntu 24.04" + sudo apt-get update + sudo apt-get install -y libasound2t64 + else + echo "Installing libasound2 for older Ubuntu versions" + sudo apt-get update + sudo apt-get install -y libasound2 + fi sudo apt-get install -y \ vim curl build-essential clang make cmake git \ libsodium-dev libxkbfile-dev pkg-config libsecret-1-dev libxss1 dbus xvfb \ - libgtk-3-0 libgbm1 libnss3 libnspr4 libasound2t64 libkrb5-dev libcairo-dev \ + libgtk-3-0 libgbm1 libnss3 libnspr4 libkrb5-dev libcairo-dev \ libsdl-pango-dev libjpeg-dev libgif-dev pandoc - name: Install Node packages From 7f93f9c83e558f39f0f07f0ea2e7dbaf9b70fa6a Mon Sep 17 00:00:00 2001 From: Chris Mead Date: Tue, 17 Dec 2024 10:24:29 -0700 Subject: [PATCH 19/24] unpin --- .github/workflows/test-unit.yml | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/.github/workflows/test-unit.yml b/.github/workflows/test-unit.yml index 006805dd3da..4a20d264e19 100644 --- a/.github/workflows/test-unit.yml +++ b/.github/workflows/test-unit.yml @@ -11,7 +11,7 @@ permissions: jobs: unit-tests: name: unit - runs-on: ubuntu-22.04 + runs-on: ubuntu-latest timeout-minutes: 30 env: GITHUB_TOKEN: ${{ secrets.GITHUB_TOKEN }} From 29e36258d544b3ffca08b1003dab297e06809c78 Mon Sep 17 00:00:00 2001 From: Chris Mead Date: Tue, 17 Dec 2024 11:00:32 -0700 Subject: [PATCH 20/24] see if pak can be faster --- .github/actions/install-r/action.yml | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/.github/actions/install-r/action.yml b/.github/actions/install-r/action.yml index e308c935350..295a74abd31 100644 --- a/.github/actions/install-r/action.yml +++ b/.github/actions/install-r/action.yml @@ -30,4 +30,4 @@ runs: curl -s https://raw.githubusercontent.com/posit-dev/qa-example-content/main/DESCRIPTION --output DESCRIPTION # Install development dependencies using pak Rscript -e "if (!requireNamespace('pak', quietly = TRUE)) install.packages('pak', repos = 'https://cran.rstudio.com')" - Rscript -e "pak::local_install_dev_deps(ask = FALSE)" + Rscript -e "options(pak.install_binary = TRUE); pak::local_install_dev_deps(ask = FALSE)" From 848e9543e5c1f07221b702bce5542dc475ca0b3e Mon Sep 17 00:00:00 2001 From: Chris Mead Date: Tue, 17 Dec 2024 11:51:16 -0700 Subject: [PATCH 21/24] another R attampt --- .github/actions/install-r/action.yml | 17 +++++++++++++++-- 1 file changed, 15 insertions(+), 2 deletions(-) diff --git a/.github/actions/install-r/action.yml b/.github/actions/install-r/action.yml index 295a74abd31..5cc2189b263 100644 --- a/.github/actions/install-r/action.yml +++ b/.github/actions/install-r/action.yml @@ -17,6 +17,21 @@ runs: curl -Ls https://github.com/r-lib/rig/releases/download/latest/rig-linux-"$(arch)"-latest.tar.gz | sudo tar xz -C /usr/local rig add "$R_VERSION" + - name: Configure Posit PPM for Ubuntu 22.04 with Custom HTTP User-Agent + shell: bash + run: | + echo "Configuring R to use Posit Package Manager for Jammy..." + cat < ~/.Rprofile + options( + repos = c(RSPM = "https://packagemanager.posit.co/cran/__linux__/jammy/latest"), + HTTPUserAgent = sprintf( + "R/%s (%s) R (%s)", + getRversion(), "ubuntu-2404", + paste(getRversion(), R.version\$platform, R.version\$arch, R.version\$os) + ) + ) + EOF + - name: Check R Installation shell: bash run: | @@ -26,8 +41,6 @@ runs: shell: bash run: | echo "Installing R development packages..." - # Download a sample DESCRIPTION file if not provided curl -s https://raw.githubusercontent.com/posit-dev/qa-example-content/main/DESCRIPTION --output DESCRIPTION - # Install development dependencies using pak Rscript -e "if (!requireNamespace('pak', quietly = TRUE)) install.packages('pak', repos = 'https://cran.rstudio.com')" Rscript -e "options(pak.install_binary = TRUE); pak::local_install_dev_deps(ask = FALSE)" From 2dccec585e1b674351a1922f42d0edbc552195f5 Mon Sep 17 00:00:00 2001 From: Chris Mead Date: Tue, 17 Dec 2024 12:51:08 -0700 Subject: [PATCH 22/24] disable sandbox for unit tests --- scripts/test.sh | 4 +++- 1 file changed, 3 insertions(+), 1 deletion(-) diff --git a/scripts/test.sh b/scripts/test.sh index ae0d88cc734..020ae9b0ef0 100755 --- a/scripts/test.sh +++ b/scripts/test.sh @@ -8,7 +8,9 @@ else ROOT=$(dirname $(dirname $(readlink -f $0))) # --disable-dev-shm-usage: when run on docker containers where size of /dev/shm # partition < 64MB which causes OOM failure for chromium compositor that uses the partition for shared memory - LINUX_EXTRA_ARGS="--disable-dev-shm-usage" + # --- Start Positron --- + LINUX_EXTRA_ARGS="--disable-dev-shm-usage --no-sandbox" + # --- End Positron --- fi cd $ROOT From b321c00e4b7dcbdef76e97e94b78186b2d90c3ce Mon Sep 17 00:00:00 2001 From: Chris Mead Date: Tue, 17 Dec 2024 13:12:50 -0700 Subject: [PATCH 23/24] unit test dependencies --- .../actions/setup-unit-test-env/action.yml | 57 +++++++++++++------ 1 file changed, 40 insertions(+), 17 deletions(-) diff --git a/.github/actions/setup-unit-test-env/action.yml b/.github/actions/setup-unit-test-env/action.yml index 27782447b7b..4ad1c75da20 100644 --- a/.github/actions/setup-unit-test-env/action.yml +++ b/.github/actions/setup-unit-test-env/action.yml @@ -7,21 +7,44 @@ runs: shell: bash run: | sudo apt-get update - sudo apt-get install -y \ - libwoff1 \ - libvpx7 \ - libevent-2.1-7 \ - libgstreamer-plugins-base1.0-0 \ - libgstreamer1.0-0 \ - libflite1 \ - libavif13 \ - libhyphen0 \ - libmanette-0.2-0 \ - libgl1-mesa-glx \ - libx264-dev \ - libgstreamer-gl1.0-0 \ - gstreamer1.0-plugins-base \ - gstreamer1.0-plugins-good \ - gstreamer1.0-plugins-bad \ - libgles2-mesa + UBUNTU_VERSION=$(lsb_release -rs) + echo "Detected Ubuntu version: $UBUNTU_VERSION" + + if [[ "$UBUNTU_VERSION" == "24.04" ]]; then + sudo apt-get install -y \ + libwoff1 \ + libvpx8 \ + libevent-2.1-7 \ + libgstreamer-plugins-base1.0-0 \ + libgstreamer1.0-0 \ + libflite1 \ + libavif15 \ + libhyphen0 \ + libmanette-0.2-0 \ + libgl1-mesa-dri \ + libx264-dev \ + libgstreamer-gl1.0-0 \ + gstreamer1.0-plugins-base \ + gstreamer1.0-plugins-good \ + gstreamer1.0-plugins-bad \ + libgles2 + else + sudo apt-get install -y \ + libwoff1 \ + libvpx7 \ + libevent-2.1-7 \ + libgstreamer-plugins-base1.0-0 \ + libgstreamer1.0-0 \ + libflite1 \ + libavif13 \ + libhyphen0 \ + libmanette-0.2-0 \ + libgl1-mesa-glx \ + libx264-dev \ + libgstreamer-gl1.0-0 \ + gstreamer1.0-plugins-base \ + gstreamer1.0-plugins-good \ + gstreamer1.0-plugins-bad \ + libgles2-mesa + fi From dc52e6e7f3484991f169466142d71f4ee7b73b8d Mon Sep 17 00:00:00 2001 From: Chris Mead Date: Tue, 17 Dec 2024 13:39:00 -0700 Subject: [PATCH 24/24] version bumps --- .github/actions/setup-unit-test-env/action.yml | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/.github/actions/setup-unit-test-env/action.yml b/.github/actions/setup-unit-test-env/action.yml index 4ad1c75da20..ce19ff4ac46 100644 --- a/.github/actions/setup-unit-test-env/action.yml +++ b/.github/actions/setup-unit-test-env/action.yml @@ -14,12 +14,12 @@ runs: if [[ "$UBUNTU_VERSION" == "24.04" ]]; then sudo apt-get install -y \ libwoff1 \ - libvpx8 \ + libvpx9 \ libevent-2.1-7 \ libgstreamer-plugins-base1.0-0 \ libgstreamer1.0-0 \ libflite1 \ - libavif15 \ + libavif16 \ libhyphen0 \ libmanette-0.2-0 \ libgl1-mesa-dri \