Skip to content
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
12 changes: 0 additions & 12 deletions .github/actions/android-app-setup/action.yml
Original file line number Diff line number Diff line change
Expand Up @@ -20,15 +20,6 @@ inputs:
app-module:
description: 'The Gradle app module (e.g. "app" or "android:androidApp").'
required: true
maven-proxy-url:
description: 'Artifactory URL (with /android suffix) for the Maven proxy.'
required: true
maven-proxy-username:
description: 'Artifactory username for Maven proxy authentication.'
required: true
maven-proxy-password:
description: 'Artifactory password for Maven proxy authentication.'
required: true
gradle-cache-job-id:
description: 'Job ID for Gradle cache scoping (e.g. JDK version + module).'
required: true
Expand Down Expand Up @@ -60,9 +51,6 @@ runs:
use-git-lfs: ${{ inputs.use-git-lfs }}
jdk: ${{ inputs.jdk }}
setup-rust: ${{ inputs.setup-rust }}
maven-proxy-url: ${{ inputs.maven-proxy-url }}
maven-proxy-username: ${{ inputs.maven-proxy-username }}
maven-proxy-password: ${{ inputs.maven-proxy-password }}
gradle-cache-job-id: ${{ inputs.gradle-cache-job-id }}

- name: Set Build Variables
Expand Down
19 changes: 1 addition & 18 deletions .github/actions/android-base-setup/action.yml
Original file line number Diff line number Diff line change
@@ -1,8 +1,7 @@
name: Setup Android Environment
description: >
Base setup for Android CI jobs. Checks out the repository, sets up a JDK,
configures the Maven proxy, sets up the Gradle cache,
and optionally sets up the Rust toolchain.
sets up the Gradle cache, and optionally sets up the Rust toolchain.

inputs:
checkout-token:
Expand All @@ -17,15 +16,6 @@ inputs:
setup-rust:
description: 'Whether to set up the Rust toolchain.'
required: true
maven-proxy-url:
description: 'Artifactory URL (with /android suffix) for the Maven proxy.'
required: true
maven-proxy-username:
description: 'Artifactory username for Maven proxy authentication.'
required: true
maven-proxy-password:
description: 'Artifactory password for Maven proxy authentication.'
required: true
gradle-cache-job-id:
description: 'Job ID for Gradle cache scoping (e.g. JDK version + module).'
required: true
Expand All @@ -47,13 +37,6 @@ runs:
distribution: 'zulu'
java-version: ${{ inputs.jdk }}

- name: Setup Maven Proxy
uses: UbiqueInnovation/actions-android/.github/actions/maven-proxy-setup@v2
with:
maven-proxy-url: ${{ inputs.maven-proxy-url }}
maven-proxy-username: ${{ inputs.maven-proxy-username }}
maven-proxy-password: ${{ inputs.maven-proxy-password }}

- name: Setup Gradle Cache
uses: UbiqueInnovation/actions-android/.github/actions/gradle-cache-setup@v2
with:
Expand Down
51 changes: 0 additions & 51 deletions .github/actions/maven-proxy-setup/action.yml

This file was deleted.

6 changes: 0 additions & 6 deletions .github/workflows/android_build_alpaka_upload.yml
Original file line number Diff line number Diff line change
Expand Up @@ -113,9 +113,6 @@ jobs:
setup-rust: ${{ inputs.setup-rust }}
flavor: ${{ inputs.flavor }}
app-module: ${{ inputs.app-module }}
maven-proxy-url: ${{ secrets.UB_ARTIFACTORY_URL_ANDROID }}
maven-proxy-username: ${{ secrets.UB_ARTIFACTORY_USER }}
maven-proxy-password: ${{ secrets.UB_ARTIFACTORY_PASSWORD }}
gradle-cache-job-id: '${{ inputs.jdk }}-${{ inputs.app-module }}'

- name: Setup SSH
Expand Down Expand Up @@ -194,9 +191,6 @@ jobs:
setup-rust: false
flavor: ${{ inputs.flavor }}
app-module: ${{ inputs.app-module }}
maven-proxy-url: ${{ secrets.UB_ARTIFACTORY_URL_ANDROID }}
maven-proxy-username: ${{ secrets.UB_ARTIFACTORY_USER }}
maven-proxy-password: ${{ secrets.UB_ARTIFACTORY_PASSWORD }}
gradle-cache-job-id: '${{ inputs.jdk }}-${{ inputs.app-module }}'

- name: Setup SSH
Expand Down
6 changes: 0 additions & 6 deletions .github/workflows/android_build_store_upload.yml
Original file line number Diff line number Diff line change
Expand Up @@ -96,9 +96,6 @@ jobs:
setup-rust: ${{ inputs.setup-rust }}
flavor: ${{ inputs.flavor }}
app-module: ${{ inputs.app-module }}
maven-proxy-url: ${{ secrets.UB_ARTIFACTORY_URL_ANDROID }}
maven-proxy-username: ${{ secrets.UB_ARTIFACTORY_USER }}
maven-proxy-password: ${{ secrets.UB_ARTIFACTORY_PASSWORD }}
gradle-cache-job-id: '${{ inputs.jdk }}-${{ inputs.app-module }}'

# Build the app
Expand Down Expand Up @@ -160,9 +157,6 @@ jobs:
setup-rust: false
flavor: ${{ inputs.flavor }}
app-module: ${{ inputs.app-module }}
maven-proxy-url: ${{ secrets.UB_ARTIFACTORY_URL_ANDROID }}
maven-proxy-username: ${{ secrets.UB_ARTIFACTORY_USER }}
maven-proxy-password: ${{ secrets.UB_ARTIFACTORY_PASSWORD }}
gradle-cache-job-id: '${{ inputs.jdk }}-${{ inputs.app-module }}'

- name: Unstash app bundle
Expand Down
6 changes: 0 additions & 6 deletions .github/workflows/android_code_quality.yml
Original file line number Diff line number Diff line change
Expand Up @@ -103,9 +103,6 @@ jobs:
setup-rust: ${{ inputs.setup-rust }}
flavor: ${{ inputs.flavor }}
app-module: ${{ inputs.app-module }}
maven-proxy-url: ${{ secrets.UB_ARTIFACTORY_URL_ANDROID }}
maven-proxy-username: ${{ secrets.UB_ARTIFACTORY_USER }}
maven-proxy-password: ${{ secrets.UB_ARTIFACTORY_PASSWORD }}
gradle-cache-job-id: '${{ inputs.jdk }}-${{ inputs.app-module }}'

# Set Gradle properties for reuse in multiple steps
Expand Down Expand Up @@ -168,9 +165,6 @@ jobs:
setup-rust: ${{ inputs.setup-rust }}
flavor: ${{ inputs.flavor }}
app-module: ${{ inputs.app-module }}
maven-proxy-url: ${{ secrets.UB_ARTIFACTORY_URL_ANDROID }}
maven-proxy-username: ${{ secrets.UB_ARTIFACTORY_USER }}
maven-proxy-password: ${{ secrets.UB_ARTIFACTORY_PASSWORD }}
gradle-cache-job-id: '${{ inputs.jdk }}-${{ inputs.app-module }}'

# Set Gradle properties for reuse in multiple steps
Expand Down
3 changes: 0 additions & 3 deletions .github/workflows/android_gradle_task.yml
Original file line number Diff line number Diff line change
Expand Up @@ -71,9 +71,6 @@ jobs:
use-git-lfs: ${{ inputs.use-git-lfs }}
jdk: ${{ inputs.jdk }}
setup-rust: 'false'
maven-proxy-url: '${{ secrets.UB_ARTIFACTORY_URL }}${{ secrets.UB_ARTIFACTORY_REPO_ANDROID }}'
maven-proxy-username: ${{ secrets.UB_ARTIFACTORY_USER }}
maven-proxy-password: ${{ secrets.UB_ARTIFACTORY_PASSWORD }}
gradle-cache-job-id: '${{ inputs.jdk }}-${{ inputs.task }}'

- name: Run Gradle task
Expand Down
3 changes: 0 additions & 3 deletions .github/workflows/android_library_artifactory.yml
Original file line number Diff line number Diff line change
Expand Up @@ -67,9 +67,6 @@ jobs:
use-git-lfs: ${{ inputs.use-git-lfs }}
jdk: ${{ inputs.jdk }}
setup-rust: ${{ inputs.setup-rust }}
maven-proxy-url: ${{ secrets.UB_ARTIFACTORY_URL_ANDROID }}
maven-proxy-username: ${{ secrets.UB_ARTIFACTORY_USER }}
maven-proxy-password: ${{ secrets.UB_ARTIFACTORY_PASSWORD }}
gradle-cache-job-id: '${{ inputs.jdk }}-${{ inputs.lib-module }}'

# Append version name suffix
Expand Down