Skip to content
New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Jump to bottom

Updating for compatability with Ubuntu 24.04 #799

Merged
merged 8 commits into from
Jun 16, 2024
Merged

Updating for compatability with Ubuntu 24.04 #799

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
8 commits
Select commit Hold shift + click to select a range
52dadd9
Updating for compatability with Ubuntu 24.04
raivisdejus Jun 16, 2024
4a433cb
Switching python version and restoring triton dependency settings
raivisdejus Jun 16, 2024
10eb4cd
Fix for tests
raivisdejus Jun 16, 2024
b418fa7
Will try without libegl1-mesa
raivisdejus Jun 16, 2024
b3f413b
Test and CI fixes
raivisdejus Jun 16, 2024
25f9b8e
Fix attempt for macOS
raivisdejus Jun 16, 2024
f87ecb1
Will skip failing tests on macOS 13
raivisdejus Jun 16, 2024
06c6a4e
Will skip failing tests on macOS 13
raivisdejus Jun 16, 2024
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
17 changes: 12 additions & 5 deletions .github/workflows/ci.yml
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -24,14 +24,15 @@ jobs:
- os: windows-latest
- os: ubuntu-20.04
- os: ubuntu-22.04
- os: ubuntu-24.04
steps:
- uses: actions/checkout@v4
with:
submodules: recursive

- uses: actions/setup-python@v5
with:
python-version: "3.10.11"
python-version: "3.11.9"

- name: Install Poetry Action
uses: snok/install-poetry@v1.3.1
Expand Down Expand Up @@ -70,7 +71,10 @@ jobs:
- name: Install apt dependencies
run: |
sudo apt-get update
sudo apt-get install --no-install-recommends libyaml-dev libegl1-mesa libxkbcommon-x11-0 libxcb-icccm4 libxcb-image0 libxcb-keysyms1 libxcb-randr0 libxcb-render-util0 libxcb-xinerama0 libxcb-shape0 libxcb-cursor0 libportaudio2 gettext libpulse0
if [ "$(lsb_release -rs)" != "24.04" ]; then
sudo apt-get install --no-install-recommends libegl1-mesa
fi
sudo apt-get install --no-install-recommends libyaml-dev libxkbcommon-x11-0 libxcb-icccm4 libxcb-image0 libxcb-keysyms1 libxcb-randr0 libxcb-render-util0 libxcb-xinerama0 libxcb-shape0 libxcb-cursor0 libportaudio2 gettext libpulse0
if: "startsWith(matrix.os, 'ubuntu-')"

- name: Test
Expand Down Expand Up @@ -100,7 +104,7 @@ jobs:
submodules: recursive
- uses: actions/setup-python@v5
with:
python-version: "3.10.11"
python-version: "3.11.9"

- name: Install Poetry Action
uses: snok/install-poetry@v1.3.1
Expand Down Expand Up @@ -134,7 +138,10 @@ jobs:
- name: Install apt dependencies
run: |
sudo apt-get update
sudo apt-get install --no-install-recommends libyaml-dev libegl1-mesa libxkbcommon-x11-0 libxcb-icccm4 libxcb-image0 libxcb-keysyms1 libxcb-randr0 libxcb-render-util0 libxcb-xinerama0 libxcb-shape0 libxcb-cursor0 libportaudio2 gettext libpulse0
if [ "$(lsb_release -rs)" != "24.04" ]; then
sudo apt-get install --no-install-recommends libegl1-mesa
fi
sudo apt-get install --no-install-recommends libyaml-dev libxkbcommon-x11-0 libxcb-icccm4 libxcb-image0 libxcb-keysyms1 libxcb-randr0 libxcb-render-util0 libxcb-xinerama0 libxcb-shape0 libxcb-cursor0 libportaudio2 gettext libpulse0
if: "startsWith(matrix.os, 'ubuntu-')"

- name: Install FPM
Expand Down Expand Up @@ -209,7 +216,7 @@ jobs:
submodules: recursive
- uses: actions/setup-python@v5
with:
python-version: "3.10.11"
python-version: "3.11.9"
- name: Install Poetry Action
uses: snok/install-poetry@v1.3.1
with:
Expand Down
2 changes: 1 addition & 1 deletion .github/workflows/manual-build.yml
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -21,7 +21,7 @@ jobs:
submodules: recursive
- uses: actions/setup-python@v5
with:
python-version: "3.10.11"
python-version: "3.11.9"

- name: Install Poetry Action
uses: snok/install-poetry@v1.3.1
Expand Down
1 change: 1 addition & 0 deletions .gitignore
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -23,3 +23,4 @@ benchmarks.json

.eggs
*.egg-info
/coverage/
6 changes: 3 additions & 3 deletions CONTRIBUTING.md
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -43,19 +43,19 @@ Linux versions get also pushed to the snap. To install latest development versio

1. Clone the repository `git clone --recursive https://github.com/chidiwilliams/buzz.git`
2. Enter repo folder `cd buzz`
3. Install Poetry `apt-get install python3-poetry`
3. Install Poetry `sudo apt-get install python3-poetry`
4. Activate the virtual environment `poetry shell`
5. Install the dependencies `poetry install`
6. Install system dependencies you may be missing
```
sudo apt-get install --no-install-recommends libyaml-dev libegl1-mesa libxkbcommon-x11-0 libxcb-icccm4 libxcb-image0 libxcb-keysyms1 libxcb-randr0 libxcb-render-util0 libxcb-xinerama0 libxcb-shape0 libxcb-cursor0 libportaudio2 gettext libpulse0 ffmpeg
sudo apt-get install --no-install-recommends libyaml-dev libxkbcommon-x11-0 libxcb-icccm4 libxcb-image0 libxcb-keysyms1 libxcb-randr0 libxcb-render-util0 libxcb-xinerama0 libxcb-shape0 libxcb-cursor0 libportaudio2 gettext libpulse0 ffmpeg
```
7. Build Buzz `poetry build`
8. Run Buzz `python -m buzz`

### Windows

Assumes you have [Git](https://git-scm.com/downloads) and [python <3.11](https://www.python.org/downloads) installed and added to PATH.
Assumes you have [Git](https://git-scm.com/downloads) and [python](https://www.python.org/downloads) installed and added to PATH.

1. Install the chocolatey package manager for Windows. [More info](https://docs.chocolatey.org/en-us/choco/setup)
```
Expand Down
Loading
Loading