From 1b7441a870af3326b22d810908bb5435d29c5535 Mon Sep 17 00:00:00 2001 From: BilligsterUser Date: Fri, 29 Mar 2024 19:51:51 +0100 Subject: [PATCH] lint --- .github/workflows/actions/build/action.yml | 74 ------------- .github/workflows/android.yml | 119 ++++++++++++++++++++- 2 files changed, 114 insertions(+), 79 deletions(-) delete mode 100644 .github/workflows/actions/build/action.yml diff --git a/.github/workflows/actions/build/action.yml b/.github/workflows/actions/build/action.yml deleted file mode 100644 index aa181473..00000000 --- a/.github/workflows/actions/build/action.yml +++ /dev/null @@ -1,74 +0,0 @@ -name: Build-for-android-base - -on: - push : - branches : [release] -env: - EXPO_NO_TELEMETRY: 1 - SENTRY_DISABLE_AUTO_UPLOAD: true -jobs: - Build-for-android-base: - name: build-for-android-base - runs-on: ubuntu-latest - steps: - - uses: actions/checkout@v4 - - - name: Restore cached Cache - id: cache-restore - uses: actions/cache/restore@v4 - with: - path: | - ~/**/*android* - ~/*android* - ~/**/*gradle* - ~/*gradle* - **/node_modules - ./node_modules - **/android - ./android - key: ${{ runner.os }}-android-build - restore-keys: | - ${{ runner.os }}-android-build - ci-${{ runner.os }}-android-build - - - uses: actions/setup-node@v4 - with: - cache: npm - cache-dependency-path: | - ${{ env.GITHUB_WORKSPACE }}/package-lock.json - - - uses: actions/setup-java@v4 - with: - distribution: temurin - java-version: '17' # The JDK version to make available on the path. - # ${{ env.GITHUB_WORKSPACE }}/**/*gradle* - # ${{ env.GITHUB_WORKSPACE }}/*gradle* - - - uses: expo/expo-github-action@v8 - - - name: Setup Android SDK - uses: android-actions/setup-android@v3 - with: - packages: platform-tools platforms;android-34 build-tools;33.0.1 build-tools;34.0.0 ndk;25.1.8937393 cmake;3.22.1 - - - name: Install deps - run: npm ci - - - name: PreBuild Android - run: npx expo prebuild -p android --clean - - - name: Save Cache - id: cache-save - uses: actions/cache/save@v4 - with: - path: | - ~/**/*android* - ~/*android* - ~/**/*gradle* - ~/*gradle* - **/node_modules - ./node_modules - **/android - ./android - key: ${{ runner.os }}-android-build - \ No newline at end of file diff --git a/.github/workflows/android.yml b/.github/workflows/android.yml index c16ffa02..e08f57b1 100644 --- a/.github/workflows/android.yml +++ b/.github/workflows/android.yml @@ -6,16 +6,125 @@ on: pull_request: # types: [opened, reopened] # types: [opened, synchronize, edited, ready_for_review] - + env: EXPO_NO_TELEMETRY: 1 SENTRY_DISABLE_AUTO_UPLOAD: true jobs: - composite: + Build-for-android-base: + name: build-for-android-base + runs-on: ubuntu-latest + steps: + - uses: actions/checkout@v4 + + - name: Restore cached Cache + id: cache-restore + uses: actions/cache/restore@v4 + with: + path: | + ~/**/*android* + ~/*android* + ~/**/*gradle* + ~/*gradle* + **/node_modules + ./node_modules + **/android + ./android + key: ${{ runner.os }}-android-build + restore-keys: | + ${{ runner.os }}-android-build + ci-${{ runner.os }}-android-build + + - uses: actions/setup-node@v4 + with: + cache: npm + cache-dependency-path: | + ${{ env.GITHUB_WORKSPACE }}/package-lock.json + + - uses: actions/setup-java@v4 + with: + distribution: temurin + java-version: '17' # The JDK version to make available on the path. + # ${{ env.GITHUB_WORKSPACE }}/**/*gradle* + # ${{ env.GITHUB_WORKSPACE }}/*gradle* + + - uses: expo/expo-github-action@v8 + + - name: Setup Android SDK + uses: android-actions/setup-android@v3 + with: + packages: platform-tools platforms;android-34 build-tools;33.0.1 build-tools;34.0.0 ndk;25.1.8937393 cmake;3.22.1 + + - name: Install deps + run: npm ci + + - name: PreBuild Android + run: npx expo prebuild -p android --clean + + - name: Save Cache + id: cache-save + uses: actions/cache/save@v4 + with: + path: | + ~/**/*android* + ~/*android* + ~/**/*gradle* + ~/*gradle* + **/node_modules + ./node_modules + **/android + ./android + key: ${{ runner.os }}-android-build + + + build: name: build-for-android-base-composite runs-on: ubuntu-latest steps: - uses: actions/checkout@v4 - - run: ls -alh ./.github/ - - id: build-base - uses: ./.github/workflows/actions/build + + - uses: actions/checkout@v4 + + - name: Restore cached Cache + id: cache-restore + uses: actions/cache/restore@v4 + with: + path: | + ~/**/*android* + ~/*android* + ~/**/*gradle* + ~/*gradle* + **/node_modules + ./node_modules + **/android + ./android + key: ${{ runner.os }}-android-build + restore-keys: | + ${{ runner.os }}-android-build + ci-${{ runner.os }}-android-build + + - uses: actions/setup-node@v4 + with: + cache: npm + cache-dependency-path: | + ${{ env.GITHUB_WORKSPACE }}/package-lock.json + + - uses: actions/setup-java@v4 + with: + distribution: temurin + java-version: '17' # The JDK version to make available on the path. + # ${{ env.GITHUB_WORKSPACE }}/**/*gradle* + # ${{ env.GITHUB_WORKSPACE }}/*gradle* + + - uses: expo/expo-github-action@v8 + + - name: Setup Android SDK + uses: android-actions/setup-android@v3 + with: + packages: platform-tools platforms;android-34 build-tools;33.0.1 build-tools;34.0.0 ndk;25.1.8937393 cmake;3.22.1 + + - name: Install deps + run: npm ci + + - name: PreBuild Android + run: npx expo prebuild -p android --clean \ No newline at end of file