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

Add Android API 33 #116

Merged
merged 3 commits into from
Feb 9, 2023
Merged
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
4 changes: 4 additions & 0 deletions .ci/images_matrix.json
Original file line number Diff line number Diff line change
Expand Up @@ -20,6 +20,10 @@
{
"api": 32,
"build_tools": "32.0.0"
},
{
"api": 33,
"build_tools": "33.0.1"
}
],
"android_ndk": [
Expand Down
14 changes: 7 additions & 7 deletions .github/workflows/cd_prepare_release.yml
Original file line number Diff line number Diff line change
Expand Up @@ -5,9 +5,9 @@ on:
- 'release/**'
jobs:
generate_matrix:
runs-on: ubuntu-18.04
runs-on: ubuntu-22.04
container:
image: docker://alpine/git:v2.24.3
image: docker://alpine/git:v2.36.3
outputs:
matrix: ${{ steps.read.outputs.matrix }}
steps:
Expand All @@ -16,9 +16,9 @@ jobs:
- id: read
run: .ci/extract_github_action_matrix_as.sh matrix
job_compute_release_name:
runs-on: ubuntu-18.04
runs-on: ubuntu-22.04
container:
image: docker://alpine/git:v2.24.3
image: docker://alpine/git:v2.36.3
outputs:
release_name: ${{ steps.step_compute_release_name.outputs.release_name }}
steps:
Expand All @@ -32,7 +32,7 @@ jobs:

job_build_test_and_generate_desc:
needs: [job_compute_release_name, generate_matrix]
runs-on: ubuntu-18.04
runs-on: ubuntu-22.04
container:
image: docker://docker:stable-git
options: --name=runner
Expand All @@ -55,9 +55,9 @@ jobs:

job_create_pr:
needs: [job_compute_release_name, job_build_test_and_generate_desc]
runs-on: ubuntu-18.04
runs-on: ubuntu-22.04
container:
image: docker://alpine/git:v2.24.3
image: docker://alpine/git:v2.36.3
steps:
- name: Checkout
uses: actions/checkout@v2
Expand Down
10 changes: 5 additions & 5 deletions .github/workflows/cd_publish_release.yml
Original file line number Diff line number Diff line change
Expand Up @@ -4,9 +4,9 @@ on:
types: [published]
jobs:
generate_matrix:
runs-on: ubuntu-18.04
runs-on: ubuntu-22.04
container:
image: docker://alpine/git:v2.24.3
image: docker://alpine/git:v2.36.3
outputs:
matrix: ${{ steps.read.outputs.matrix }}
steps:
Expand All @@ -15,9 +15,9 @@ jobs:
- id: read
run: .ci/extract_github_action_matrix_as.sh matrix
job_compute_release_name:
runs-on: ubuntu-18.04
runs-on: ubuntu-22.04
container:
image: docker://alpine/git:v2.24.3
image: docker://alpine/git:v2.36.3
outputs:
release_name: ${{ steps.step_compute_release_name.outputs.release_name }}
steps:
Expand All @@ -30,7 +30,7 @@ jobs:
echo "::set-output name=release_name::$release_name"
job_publish_release:
needs: [job_compute_release_name, generate_matrix]
runs-on: ubuntu-18.04
runs-on: ubuntu-22.04
container:
image: docker://docker:stable-git
options: --name=runner
Expand Down
6 changes: 3 additions & 3 deletions .github/workflows/cd_snapshot.yml
Original file line number Diff line number Diff line change
Expand Up @@ -5,9 +5,9 @@ on:
- develop
jobs:
generate_matrix:
runs-on: ubuntu-18.04
runs-on: ubuntu-22.04
container:
image: docker://alpine/git:v2.24.3
image: docker://alpine/git:v2.36.3
outputs:
matrix: ${{ steps.read.outputs.matrix }}
steps:
Expand All @@ -17,7 +17,7 @@ jobs:
run: .ci/extract_github_action_matrix_as.sh matrix
build_test_and_deploy:
needs: [generate_matrix]
runs-on: ubuntu-18.04
runs-on: ubuntu-22.04
container:
image: docker://docker:stable-git
options: --name=runner
Expand Down
6 changes: 3 additions & 3 deletions .github/workflows/ci.yml
Original file line number Diff line number Diff line change
Expand Up @@ -7,9 +7,9 @@ on:
- 'release/**'
jobs:
generate_matrix:
runs-on: ubuntu-18.04
runs-on: ubuntu-22.04
container:
image: docker://alpine/git:v2.24.3
image: docker://alpine/git:v2.36.3
outputs:
matrix: ${{ steps.read.outputs.matrix }}
steps:
Expand All @@ -19,7 +19,7 @@ jobs:
run: .ci/extract_github_action_matrix_as.sh matrix
build_and_test:
needs: generate_matrix
runs-on: ubuntu-18.04
runs-on: ubuntu-22.04
container:
image: docker://docker:stable-git
options: --name=runner
Expand Down
2 changes: 1 addition & 1 deletion .github/workflows/ci_action.yml
Original file line number Diff line number Diff line change
Expand Up @@ -7,7 +7,7 @@ on:
- 'release/**'
jobs:
build_and_test:
runs-on: ubuntu-18.04
runs-on: ubuntu-22.04
container:
image: docker://docker:stable-git
steps:
Expand Down
2 changes: 1 addition & 1 deletion .github/workflows/daily_runner.yml
Original file line number Diff line number Diff line change
Expand Up @@ -4,7 +4,7 @@ on:
- cron: '0 22 * * *'
jobs:
job_build_and_test:
runs-on: ubuntu-18.04
runs-on: ubuntu-22.04
container:
image: docker://docker:stable-git
options: --name=runner
Expand Down
8 changes: 4 additions & 4 deletions Dockerfile
Original file line number Diff line number Diff line change
Expand Up @@ -97,11 +97,11 @@ RUN if [ "$gcloud" = true ] ; \
## Install Android SDK
ARG sdk_version=commandlinetools-linux-6200805_latest.zip
ARG android_home=/opt/android/sdk
ARG android_api=android-32
ARG android_build_tools=32.0.0
ARG android_api=android-33
ARG android_build_tools=33.0.1
ARG android_ndk=false
ARG ndk_version=23.1.7779620
ARG cmake=3.18.1
ARG ndk_version=25.1.8937393
ARG cmake=3.22.1
RUN mkdir -p ${android_home} && \
wget --quiet --output-document=/tmp/${sdk_version} https://dl.google.com/android/repository/${sdk_version} && \
unzip -q /tmp/${sdk_version} -d ${android_home} && \
Expand Down
4 changes: 2 additions & 2 deletions README.md
Original file line number Diff line number Diff line change
Expand Up @@ -63,7 +63,7 @@ on:

jobs:
my_android_job:
runs-on: ubuntu-18.04 # Works also with self hosted runner supporting docker
runs-on: ubuntu-22.04 # Works also with self hosted runner supporting docker
container:
image: docker://fabernovel/android:api-29-v1.1.0

Expand Down Expand Up @@ -105,7 +105,7 @@ on:

jobs:
my_android_job:
runs-on: ubuntu-18.04 # Works also with self hosted runner supporting docker
runs-on: ubuntu-22.04 # Works also with self hosted runner supporting docker

steps:
- name: Checkout
Expand Down