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.

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

fix(ci): required ubuntu 24 runner forward ports as 24 is now latest #422

Open
wants to merge 5 commits into
base: main
Choose a base branch
from
Open
Show file tree
Hide file tree
Changes from all commits
Commits
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
21 changes: 7 additions & 14 deletions .github/workflows/build-quick.yml
Original file line number Diff line number Diff line change
Expand Up @@ -27,26 +27,19 @@ jobs:
runs-on: ${{ matrix.os }}
timeout-minutes: 80
steps:
- name: Liberate disk space (Ubuntu)
uses: jlumbroso/free-disk-space@main
if: contains(matrix.os, 'ubuntu')
with:
tool-cache: false
android: false
dotnet: true
haskell: true
large-packages: false
docker-images: true
swap-storage: false

- uses: actions/checkout@v4

- name: Enable KVM group perms (Ubuntu)
- name: Ubuntu setup
# We get KVM set up on Ubuntu as we run the emulator there (only platform with nested virt)
# We also install some system software needed for the build on ubuntu
# We also clear out the command-line tools, the emulator runner will reinstall, but latest version
if: contains(matrix.os, 'ubuntu')
run: |
echo 'KERNEL=="kvm", GROUP="kvm", MODE="0666", OPTIONS+="static_node=kvm"' | sudo tee /etc/udev/rules.d/99-kvm4all.rules
sudo udevadm control --reload-rules
sudo udevadm trigger --name-match=kvm
sudo apt update
sudo apt -y install liblzma-dev

- name: Fetch submodules
run: git submodule update --init
Expand Down Expand Up @@ -145,7 +138,7 @@ jobs:
arguments: test rsdroid:lint --daemon

- name: Run tests (Emulator)
uses: reactivecircus/android-emulator-runner@v2
uses: reactivecircus/android-emulator-runner@8c07710601c4b0e50139034f86054e4b09abf601
if: contains(matrix.os, 'ubuntu')
timeout-minutes: 30
with:
Expand Down
17 changes: 5 additions & 12 deletions .github/workflows/codeql.yml
Original file line number Diff line number Diff line change
Expand Up @@ -77,18 +77,11 @@ jobs:
# to build your code.
# ℹ️ Command-line programs to run using the OS shell.
# 📚 See https://docs.github.com/en/actions/using-workflows/workflow-syntax-for-github-actions#jobsjob_idstepsrun
# We need a great deal of pre-build stuff for the Java to work, because it relies on the Rust working...
- name: Liberate disk space (Ubuntu)
if: matrix.build-mode == 'manual'
uses: jlumbroso/free-disk-space@main
with:
tool-cache: false
android: false
dotnet: true
haskell: true
large-packages: false
docker-images: true
swap-storage: false
- name: Ubuntu setup
# We also install some system software needed for the build on ubuntu
run: |
sudo apt update
sudo apt -y install liblzma-dev

- name: Fetch submodules
if: matrix.build-mode == 'manual'
Expand Down
6 changes: 3 additions & 3 deletions build.gradle
Original file line number Diff line number Diff line change
Expand Up @@ -3,9 +3,9 @@ import org.gradle.internal.jvm.Jvm
// Top-level build file where you can add configuration options common to all sub-projects/modules.
buildscript {
ext {
compileSdk = 34
targetSdk = 34
minSdk = 21
compileSdk = 35
targetSdk = 35
minSdk = 23
protobufVersion = "4.26.1"
appcompatVersion = "1.6.1"
androidxTestJunitVersion = "1.1.5"
Expand Down
Loading