From 32c73ae299341196231ffbe9fb037371b5f5853c Mon Sep 17 00:00:00 2001 From: Andrew Pikul Date: Mon, 16 Jun 2025 15:18:59 -0500 Subject: [PATCH 1/8] Update github actions lint --- .pre-commit-config.yaml | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/.pre-commit-config.yaml b/.pre-commit-config.yaml index 9bf923b4..a661870a 100644 --- a/.pre-commit-config.yaml +++ b/.pre-commit-config.yaml @@ -46,7 +46,7 @@ repos: }\ }"] - repo: https://github.com/rhysd/actionlint - rev: v1.7.4 + rev: v1.7.7 hooks: - id: actionlint name: Lint GitHub Actions workflow files From 4d286e118a1baeb8555ba70e4903c0b82151ec41 Mon Sep 17 00:00:00 2001 From: Andrew Pikul Date: Mon, 16 Jun 2025 15:19:54 -0500 Subject: [PATCH 2/8] Update GHA to use arm --- .github/workflows/publish_testpypi.yml | 2 +- .github/workflows/test.yml | 2 +- 2 files changed, 2 insertions(+), 2 deletions(-) diff --git a/.github/workflows/publish_testpypi.yml b/.github/workflows/publish_testpypi.yml index 47e3d9c3..92a888c4 100644 --- a/.github/workflows/publish_testpypi.yml +++ b/.github/workflows/publish_testpypi.yml @@ -11,7 +11,7 @@ jobs: strategy: max-parallel: 2 matrix: - os: [ubuntu-latest, windows-latest, macos-latest] + os: [ubuntu-latest, windows-latest, macos-latest, ubuntu-24.04-arm] python_v: ['3.8', '3.9', '3.10', ''] # chrome_v: ['-1'] name: Build and Test diff --git a/.github/workflows/test.yml b/.github/workflows/test.yml index bf039c6d..ab774f82 100644 --- a/.github/workflows/test.yml +++ b/.github/workflows/test.yml @@ -9,7 +9,7 @@ jobs: test-all: strategy: matrix: - os: [ubuntu-latest, windows-latest, macos-latest] + os: [ubuntu-latest, windows-latest, macos-latest, ubuntu-24.04-arm] runs-on: ${{ matrix.os }} steps: - uses: actions/checkout@v4 From 698cfc8326f35683a7681054563d6d361fecf47b Mon Sep 17 00:00:00 2001 From: Andrew Pikul Date: Mon, 16 Jun 2025 15:37:48 -0500 Subject: [PATCH 3/8] Add deps for arm --- .github/workflows/publish_testpypi.yml | 11 ++++++++--- .github/workflows/test.yml | 12 ++++++++---- 2 files changed, 16 insertions(+), 7 deletions(-) diff --git a/.github/workflows/publish_testpypi.yml b/.github/workflows/publish_testpypi.yml index 92a888c4..fab25ad8 100644 --- a/.github/workflows/publish_testpypi.yml +++ b/.github/workflows/publish_testpypi.yml @@ -20,9 +20,14 @@ jobs: - uses: actions/checkout@v4 - uses: astral-sh/setup-uv@v5 - name: Install Dependencies - if: ${{ matrix.os == 'ubuntu-latest' }} - run: sudo apt-get update && sudo apt-get install xvfb - timeout-minutes: 1 + if: ${{ startsWith(matrix.os, 'ubuntu-') }} + run: > + sudo apt-get update && + sudo apt-get install xvfb + libnss3 libatk-bridge2.0-0 libcups2 libxcomposite1 libxdamage1 + libxfixes3 libxrandr2 libgbm1 libxkbcommon0 libpango-1.0-0 + libcairo2 libasound2 + timeout-minutes: 3 # must actually checkout for version determination - run: git checkout ${{ github.ref_name }} - run: uv python install ${{ matrix.python_v }} diff --git a/.github/workflows/test.yml b/.github/workflows/test.yml index ab774f82..d3889f7b 100644 --- a/.github/workflows/test.yml +++ b/.github/workflows/test.yml @@ -17,11 +17,15 @@ jobs: - uses: actions/setup-python@v5 with: python-version-file: "pyproject.toml" - - name: Install Dependencies - if: ${{ matrix.os == 'ubuntu-latest' }} - run: sudo apt-get update && sudo apt-get install xvfb - timeout-minutes: 1 + if: ${{ startsWith(matrix.os, 'ubuntu-') }} + run: > + sudo apt-get update && + sudo apt-get install xvfb + libnss3 libatk-bridge2.0-0 libcups2 libxcomposite1 libxdamage1 + libxfixes3 libxrandr2 libgbm1 libxkbcommon0 libpango-1.0-0 + libcairo2 libasound2 + timeout-minutes: 3 - name: Install choreographer run: uv sync --no-sources --all-extras - name: Install google-chrome-for-testing From bd500fb897cc3b71c591fc06c4e5c0105ef3f27b Mon Sep 17 00:00:00 2001 From: Andrew Pikul Date: Mon, 16 Jun 2025 15:39:32 -0500 Subject: [PATCH 4/8] Try removing libasound2 --- .github/workflows/publish_testpypi.yml | 2 +- .github/workflows/test.yml | 2 +- 2 files changed, 2 insertions(+), 2 deletions(-) diff --git a/.github/workflows/publish_testpypi.yml b/.github/workflows/publish_testpypi.yml index fab25ad8..c76307c0 100644 --- a/.github/workflows/publish_testpypi.yml +++ b/.github/workflows/publish_testpypi.yml @@ -26,7 +26,7 @@ jobs: sudo apt-get install xvfb libnss3 libatk-bridge2.0-0 libcups2 libxcomposite1 libxdamage1 libxfixes3 libxrandr2 libgbm1 libxkbcommon0 libpango-1.0-0 - libcairo2 libasound2 + libcairo2 timeout-minutes: 3 # must actually checkout for version determination - run: git checkout ${{ github.ref_name }} diff --git a/.github/workflows/test.yml b/.github/workflows/test.yml index d3889f7b..da4039cc 100644 --- a/.github/workflows/test.yml +++ b/.github/workflows/test.yml @@ -24,7 +24,7 @@ jobs: sudo apt-get install xvfb libnss3 libatk-bridge2.0-0 libcups2 libxcomposite1 libxdamage1 libxfixes3 libxrandr2 libgbm1 libxkbcommon0 libpango-1.0-0 - libcairo2 libasound2 + libcairo2 timeout-minutes: 3 - name: Install choreographer run: uv sync --no-sources --all-extras From 55a77bc520ed1ff4c31baa69a1ad20b2129b1698 Mon Sep 17 00:00:00 2001 From: Andrew Pikul Date: Mon, 16 Jun 2025 21:05:09 -0500 Subject: [PATCH 5/8] Download chrome on ARM --- .github/workflows/publish_testpypi.yml | 6 +++++- .github/workflows/test.yml | 6 +++++- 2 files changed, 10 insertions(+), 2 deletions(-) diff --git a/.github/workflows/publish_testpypi.yml b/.github/workflows/publish_testpypi.yml index c76307c0..32bf1238 100644 --- a/.github/workflows/publish_testpypi.yml +++ b/.github/workflows/publish_testpypi.yml @@ -19,7 +19,7 @@ jobs: steps: - uses: actions/checkout@v4 - uses: astral-sh/setup-uv@v5 - - name: Install Dependencies + - name: Install Dependencies on Ubuntu if: ${{ startsWith(matrix.os, 'ubuntu-') }} run: > sudo apt-get update && @@ -28,6 +28,10 @@ jobs: libxfixes3 libxrandr2 libgbm1 libxkbcommon0 libpango-1.0-0 libcairo2 timeout-minutes: 3 + - name: Install Chrome on Ubuntu-Arm + if: ${{ startsWith(matrix.os, 'ubuntu-24.04-arm') }} + run: sudo apt-get install chromium-browser:w + timeout-minutes: 3 # must actually checkout for version determination - run: git checkout ${{ github.ref_name }} - run: uv python install ${{ matrix.python_v }} diff --git a/.github/workflows/test.yml b/.github/workflows/test.yml index da4039cc..32224b9d 100644 --- a/.github/workflows/test.yml +++ b/.github/workflows/test.yml @@ -17,7 +17,7 @@ jobs: - uses: actions/setup-python@v5 with: python-version-file: "pyproject.toml" - - name: Install Dependencies + - name: Install Dependencies on Ubuntu if: ${{ startsWith(matrix.os, 'ubuntu-') }} run: > sudo apt-get update && @@ -26,6 +26,10 @@ jobs: libxfixes3 libxrandr2 libgbm1 libxkbcommon0 libpango-1.0-0 libcairo2 timeout-minutes: 3 + - name: Install Chrome on Ubuntu-Arm + if: ${{ startsWith(matrix.os, 'ubuntu-24.04-arm') }} + run: sudo apt-get install chromium-browser + timeout-minutes: 3 - name: Install choreographer run: uv sync --no-sources --all-extras - name: Install google-chrome-for-testing From ed9b5037f270bbf52522a63c8cf1dc9d0a40bc06 Mon Sep 17 00:00:00 2001 From: Andrew Pikul Date: Mon, 16 Jun 2025 21:11:24 -0500 Subject: [PATCH 6/8] Turn off local download for arm. --- .github/workflows/publish_testpypi.yml | 3 ++- .github/workflows/test.yml | 3 ++- 2 files changed, 4 insertions(+), 2 deletions(-) diff --git a/.github/workflows/publish_testpypi.yml b/.github/workflows/publish_testpypi.yml index 32bf1238..2df35bab 100644 --- a/.github/workflows/publish_testpypi.yml +++ b/.github/workflows/publish_testpypi.yml @@ -29,7 +29,7 @@ jobs: libcairo2 timeout-minutes: 3 - name: Install Chrome on Ubuntu-Arm - if: ${{ startsWith(matrix.os, 'ubuntu-24.04-arm') }} + if: ${{ matrix.os == 'ubuntu-24.04-arm' }} run: sudo apt-get install chromium-browser:w timeout-minutes: 3 # must actually checkout for version determination @@ -46,6 +46,7 @@ jobs: run --no-sync --with setuptools-git-versioning setuptools-git-versioning)-py3-none-any.whl - run: uv run --no-sync choreo_get_chrome -v #--i ${{ matrix.chrome_v }} + if: ${{ matrix.os != 'ubuntu-24.04-arm' }} - name: Diagnose run: uv run --no-sync choreo_diagnose --no-run - name: Test diff --git a/.github/workflows/test.yml b/.github/workflows/test.yml index 32224b9d..e18174ef 100644 --- a/.github/workflows/test.yml +++ b/.github/workflows/test.yml @@ -27,12 +27,13 @@ jobs: libcairo2 timeout-minutes: 3 - name: Install Chrome on Ubuntu-Arm - if: ${{ startsWith(matrix.os, 'ubuntu-24.04-arm') }} + if: ${{ matrix.os == 'ubuntu-24.04-arm' }} run: sudo apt-get install chromium-browser timeout-minutes: 3 - name: Install choreographer run: uv sync --no-sources --all-extras - name: Install google-chrome-for-testing + if: ${{ matrix.os != 'ubuntu-24.04-arm' }} run: uv run --no-sources choreo_get_chrome -v - name: Diagnose run: uv run --no-sources choreo_diagnose --no-run From 484f6d91351e0f53a3fba537fc05c6fc7ffcdb37 Mon Sep 17 00:00:00 2001 From: Andrew Pikul Date: Mon, 16 Jun 2025 21:24:54 -0500 Subject: [PATCH 7/8] Try new test methed on ubuntu-intel as well --- .github/workflows/test.yml | 6 ++++-- 1 file changed, 4 insertions(+), 2 deletions(-) diff --git a/.github/workflows/test.yml b/.github/workflows/test.yml index e18174ef..e9a6aeca 100644 --- a/.github/workflows/test.yml +++ b/.github/workflows/test.yml @@ -27,13 +27,15 @@ jobs: libcairo2 timeout-minutes: 3 - name: Install Chrome on Ubuntu-Arm - if: ${{ matrix.os == 'ubuntu-24.04-arm' }} + if: ${{ startsWith(matrix.os, 'ubuntu-') }} + #if: ${{ matrix.os == 'ubuntu-24.04-arm' }} run: sudo apt-get install chromium-browser timeout-minutes: 3 - name: Install choreographer run: uv sync --no-sources --all-extras - name: Install google-chrome-for-testing - if: ${{ matrix.os != 'ubuntu-24.04-arm' }} + if: ${{ ! startsWith(matrix.os, 'ubuntu-') }} +# if: ${{ matrix.os != 'ubuntu-24.04-arm' }} run: uv run --no-sources choreo_get_chrome -v - name: Diagnose run: uv run --no-sources choreo_diagnose --no-run From 16a66a8726e7d797db8c16b054c7b499e0181e8c Mon Sep 17 00:00:00 2001 From: Andrew Pikul Date: Mon, 16 Jun 2025 21:29:20 -0500 Subject: [PATCH 8/8] Print chromium version with install. --- .github/workflows/publish_testpypi.yml | 2 +- .github/workflows/test.yml | 2 +- 2 files changed, 2 insertions(+), 2 deletions(-) diff --git a/.github/workflows/publish_testpypi.yml b/.github/workflows/publish_testpypi.yml index 2df35bab..53cd1430 100644 --- a/.github/workflows/publish_testpypi.yml +++ b/.github/workflows/publish_testpypi.yml @@ -30,7 +30,7 @@ jobs: timeout-minutes: 3 - name: Install Chrome on Ubuntu-Arm if: ${{ matrix.os == 'ubuntu-24.04-arm' }} - run: sudo apt-get install chromium-browser:w + run: sudo apt-get install chromium-browser && chromium --version timeout-minutes: 3 # must actually checkout for version determination - run: git checkout ${{ github.ref_name }} diff --git a/.github/workflows/test.yml b/.github/workflows/test.yml index e9a6aeca..5c7a7cdb 100644 --- a/.github/workflows/test.yml +++ b/.github/workflows/test.yml @@ -29,7 +29,7 @@ jobs: - name: Install Chrome on Ubuntu-Arm if: ${{ startsWith(matrix.os, 'ubuntu-') }} #if: ${{ matrix.os == 'ubuntu-24.04-arm' }} - run: sudo apt-get install chromium-browser + run: sudo apt-get install chromium-browser && chromium --version timeout-minutes: 3 - name: Install choreographer run: uv sync --no-sources --all-extras