mirrors/monado
1
0
Fork 0
mirror of https://gitlab.freedesktop.org/monado/monado.git synced 2025-01-27 09:01:46 +00:00
Code Issues Actions Packages Projects Releases Wiki Activity

ci: Bump versions of tools and sdks for Android

Browse source
This commit is contained in:
Ryan Pavlik 2022-06-27 09:43:15 -05:00
parent 10b5df277d
commit 6028c81796
3 changed files with 5 additions and 5 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

2
.gitlab-ci.yml
View file

@ -36,7 +36,7 @@ include:
.monado.variables.debian:bullseye-ndk:
variables:
FDO_DISTRIBUTION_VERSION: "bullseye"
FDO_DISTRIBUTION_TAG: "2022-03-16.0"
FDO_DISTRIBUTION_TAG: "2022-06-27.0"
FDO_REPO_SUFFIX: ndk
# Variables for build and usage of Ubuntu focal image

2
.gitlab-ci/config.yml
View file

@ -115,7 +115,7 @@ distributions:
distro_version: bullseye
repo_suffix: ndk
script: android_container_prep.sh
tag: "2022-03-16.0"
tag: "2022-06-27.0"
packages:
git:
wget:

6
.gitlab-ci/install-android-sdk.sh
View file

@ -5,10 +5,10 @@
# Partially inspired by https://about.gitlab.com/blog/2018/10/24/setting-up-gitlab-ci-for-android-projects/
set -eo pipefail
VERSION=7583922
VERSION=8512546
ROOT=${ROOT:-/opt/android-sdk}
ANDROID_COMPILE_SDK=${ANDROID_COMPILE_SDK:-30}
ANDROID_BUILD_TOOLS=${ANDROID_BUILD_TOOLS:-30.0.3}
ANDROID_COMPILE_SDK=${ANDROID_COMPILE_SDK:-31}
ANDROID_BUILD_TOOLS=${ANDROID_BUILD_TOOLS:-31.0.0}
mkdir -p "$ROOT"
FN=commandlinetools-linux-${VERSION}_latest.zip