tei/MapLibreParticleLab
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

Rename Gradle targets Android (#2226)

Browse Source
This commit is contained in:
Bart Louwers
2024-04-02 23:15:50 +02:00
committed by GitHub
parent 37170ed61c
commit 9f8ae7a98b
1081 changed files with 132 additions and 370 deletions
Download Patch File Download Diff File Expand all files Collapse all files

32
.github/workflows/android-ci.yml vendored
View File

@@ -114,7 +114,7 @@ jobs:
run: |
MAPLIBRE_DEVELOPER_CONFIG_XML='${{ secrets.MAPLIBRE_DEVELOPER_CONFIG_XML }}'
if [ -n "${MAPLIBRE_DEVELOPER_CONFIG_XML}" ]; then
echo "${MAPLIBRE_DEVELOPER_CONFIG_XML}" > MapboxGLAndroidSDKTestApp/src/main/res/values/developer-config.xml
echo "${MAPLIBRE_DEVELOPER_CONFIG_XML}" > MapLibreAndroidTestApp/src/main/res/values/developer-config.xml
else
echo "No secrets.MAPLIBRE_DEVELOPER_CONFIG_XML variable set, not copying..."
fi
@@ -122,8 +122,8 @@ jobs:
- name: Build Benchmark, copy to platform/android
run: |
./gradlew assembleDrawableRelease assembleDrawableReleaseAndroidTest -PtestBuildType=release
cp MapboxGLAndroidSDKTestApp/build/outputs/apk/drawable/release/MapboxGLAndroidSDKTestApp-drawable-release.apk .
cp MapboxGLAndroidSDKTestApp/build/outputs/apk/androidTest/drawable/release/MapboxGLAndroidSDKTestApp-drawable-release-androidTest.apk .
cp MapLibreAndroidTestApp/build/outputs/apk/drawable/release/MapLibreAndroidTestApp-drawable-release.apk .
cp MapLibreAndroidTestApp/build/outputs/apk/androidTest/drawable/release/MapLibreAndroidTestApp-drawable-release-androidTest.apk .
- name: Create artifact for benchmark APKs
uses: actions/upload-artifact@v4
@@ -131,8 +131,8 @@ jobs:
if-no-files-found: error
name: benchmarkAPKs
path: |
platform/android/MapboxGLAndroidSDKTestApp-drawable-release.apk
platform/android/MapboxGLAndroidSDKTestApp-drawable-release-androidTest.apk
platform/android/MapLibreAndroidTestApp-drawable-release.apk
platform/android/MapLibreAndroidTestApp-drawable-release-androidTest.apk
- if: github.event_name == 'pull_request'
uses: ./.github/actions/save-pr-number
@@ -159,7 +159,7 @@ jobs:
id: upload-android-app
with:
project_arn: ${{ vars.AWS_DEVICE_FARM_PROJECT_ARN }}
name: MapboxGLAndroidSDKTestApp-debug.apk
name: MapLibreAndroidTestApp-debug.apk
type: ANDROID_APP
- name: Create upload
@@ -168,14 +168,14 @@ jobs:
id: upload-android-test
with:
project_arn: ${{ vars.AWS_DEVICE_FARM_PROJECT_ARN }}
name: MapboxGLAndroidSDKTestApp-debug-androidTest.apk
name: MapLibreAndroidTestApp-debug-androidTest.apk
type: INSTRUMENTATION_TEST_PACKAGE
- name: Upload Android UI test
if: github.ref == 'refs/heads/main'
run: |
curl -T MapboxGLAndroidSDKTestApp/build/outputs/apk/legacy/debug/MapboxGLAndroidSDKTestApp-legacy-debug.apk '${{ steps.upload-android-app.outputs.url }}'
curl -T MapboxGLAndroidSDKTestApp/build/outputs/apk/androidTest/legacy/debug/MapboxGLAndroidSDKTestApp-legacy-debug-androidTest.apk '${{ steps.upload-android-test.outputs.url }}'
curl -T MapLibreAndroidTestApp/build/outputs/apk/legacy/debug/MapLibreAndroidTestApp-legacy-debug.apk '${{ steps.upload-android-app.outputs.url }}'
curl -T MapLibreAndroidTestApp/build/outputs/apk/androidTest/legacy/debug/MapLibreAndroidTestApp-legacy-debug-androidTest.apk '${{ steps.upload-android-test.outputs.url }}'
- name: Write uploads.env
if: github.ref == 'refs/heads/main'
@@ -196,13 +196,13 @@ jobs:
with:
name: debug-artifacts
path: |
MapboxGLAndroidSDKTestApp/build/outputs/apk/debug
MapboxGLAndroidSDK/build/reports/lint-results.html
MapboxGLAndroidSDK/lint-baseline.xml
MapboxGLAndroidSDKTestApp/build/reports/lint-results.html
MapboxGLAndroidSDKTestApp/build/reports/lint-results.xml
MapboxGLAndroidSDKTestApp/lint-baseline.xml
MapboxGLAndroidSDK/build/intermediates/cmake/debug/obj
MapLibreAndroidTestApp/build/outputs/apk/debug
MapLibreAndroid/build/reports/lint-results.html
MapLibreAndroid/lint-baseline.xml
MapLibreAndroidTestApp/build/reports/lint-results.html
MapLibreAndroidTestApp/build/reports/lint-results.xml
MapLibreAndroidTestApp/lint-baseline.xml
MapLibreAndroid/build/intermediates/cmake/debug/obj
android-build-render-test:
runs-on: ubuntu-latest

4
.github/workflows/android-device-test.yml vendored
View File

@@ -22,8 +22,8 @@ jobs:
},
{
artifactName: benchmarkAPKs,
testFile: "MapboxGLAndroidSDKTestApp-drawable-release-androidTest.apk",
appFile: "MapboxGLAndroidSDKTestApp-drawable-release.apk",
testFile: "MapLibreAndroidTestApp-drawable-release-androidTest.apk",
appFile: "MapLibreAndroidTestApp-drawable-release.apk",
name: "Android Benchmark",
testFilter: "org.maplibre.android.benchmark.Benchmark",
# top devices, query with `aws list-device-pools --arn <project_arn>`

12
.github/workflows/android-release.yml vendored
View File

@@ -89,9 +89,9 @@ jobs:
RELEASE_VERSION="$( git describe --tags --match=android-v*.*.* --abbrev=0 | sed 's/^android-v//' )"
echo "Latest version from tag: $RELEASE_VERSION"
if [ -n "$RELEASE_VERSION" ]; then
sed -i -e "s/^VERSION_NAME=.*/VERSION_NAME=${RELEASE_VERSION}/" MapboxGLAndroidSDK/gradle.properties
echo "MapboxGLAndroidSDK/gradle.properties:"
cat MapboxGLAndroidSDK/gradle.properties
sed -i -e "s/^VERSION_NAME=.*/VERSION_NAME=${RELEASE_VERSION}/" MapLibreAndroid/gradle.properties
echo "MapLibreAndroid/gradle.properties:"
cat MapLibreAndroid/gradle.properties
fi
shell: bash
@@ -102,7 +102,7 @@ jobs:
run: |
MAPLIBRE_DEVELOPER_CONFIG_XML='${{ secrets.MAPLIBRE_DEVELOPER_CONFIG_XML }}'
if [ -n "${MAPLIBRE_DEVELOPER_CONFIG_XML}" ]; then
echo "${MAPLIBRE_DEVELOPER_CONFIG_XML}" > MapboxGLAndroidSDKTestApp/src/main/res/values/developer-config.xml
echo "${MAPLIBRE_DEVELOPER_CONFIG_XML}" > MapLibreAndroidTestApp/src/main/res/values/developer-config.xml
make android
else
echo "No secrets.MAPLIBRE_DEVELOPER_CONFIG_XML variable set, skipping apk build..."
@@ -138,8 +138,8 @@ jobs:
GITHUB_TOKEN: ${{ secrets.GITHUB_TOKEN }}
with:
upload_url: ${{ steps.create_release.outputs.upload_url }}
asset_path: platform/android/MapboxGLAndroidSDK/build/outputs/aar/MapboxGLAndroidSDK-drawable-release.aar
asset_name: MapboxGLAndroidSDK-release.aar
asset_path: platform/android/MapLibreAndroid/build/outputs/aar/MapLibreAndroid-drawable-release.aar
asset_name: MapLibreAndroid-release.aar
asset_content_type: application/zip
- name: Clean release

2
.github/workflows/gh-pages-android-api.yml vendored
View File

@@ -20,5 +20,5 @@ jobs:
uses: JamesIves/github-pages-deploy-action@v4.5.0
with:
branch: gh-pages
folder: platform/android/MapboxGLAndroidSDK/build/dokka/html
folder: platform/android/MapLibreAndroid/build/dokka/html
target-folder: android/api/