Skip to content

[infra] Fix android-sdk image gradle version #15782

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

Merged
hseok-oh merged 1 commit into from
Jul 9, 2025
Merged

[infra] Fix android-sdk image gradle version #15782

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
1 commit
Select commit
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
22 changes: 12 additions & 10 deletions .github/workflows/build-dev-docker.yml
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -16,16 +16,13 @@ jobs:
filtering:
runs-on: ubuntu-latest
outputs:
yml: ${{ steps.filter.outputs.yml }}
target: ${{ steps.filter.outputs.changes }}
ubuntu-target: ${{ steps.ubuntu-filter.outputs.changes }}
android: ${{ steps.android-filter.outputs.android }}
steps:
- uses: dorny/paths-filter@v3
id: filter
id: ubuntu-filter
with:
filters: |
android:
- '.github/**'
- 'infra/docker/android-sdk/**'
focal:
- '.github/**'
- 'infra/docker/focal/Dockerfile'
Expand All @@ -35,16 +32,21 @@ jobs:
noble:
- '.github/**'
- 'infra/docker/noble/Dockerfile'
- uses: dorny/paths-filter@v3
id: android-filter
with:
filters: |
android:
- '.github/**'
- 'infra/docker/android-sdk/**'

# Build on docker CLI for PR test without login
build-ubuntu:
needs: filtering
runs-on: one-x64-linux
strategy:
matrix:
version: ${{ fromJSON(needs.filtering.outputs.target) }}
exclude:
- version: android
version: ${{ fromJSON(needs.filtering.outputs.ubuntu-target) }}
steps:
- name: Checkout
uses: actions/checkout@v4
Expand Down Expand Up @@ -85,7 +87,7 @@ jobs:

build-android:
needs: filtering
if: github.repository_owner == 'Samsung' && contains(fromJSON(needs.filtering.outputs.target), 'android')
if: github.repository_owner == 'Samsung' && needs.filtering.outputs.android == 'true'
runs-on: one-x64-linux
steps:
- name: Checkout
Expand Down
2 changes: 1 addition & 1 deletion infra/docker/android-sdk/Dockerfile
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -47,7 +47,7 @@ WORKDIR /opt/android-tools

# download and install Gradle
# https://services.gradle.org/distributions/
ARG GRADLE_VERSION=6.4.1
ARG GRADLE_VERSION=7.6.4
ARG GRADLE_DIST=bin
RUN wget -q https://services.gradle.org/distributions/gradle-${GRADLE_VERSION}-${GRADLE_DIST}.zip && \
unzip gradle*.zip && \
Expand Down