Updated ci.yml and fixed build

This commit is contained in:
snake-4
2024-04-09 23:07:04 +02:00
parent 6f4d78b0fc
commit 33a9ff93f4
2 changed files with 8 additions and 12 deletions

View File

@@ -1,28 +1,24 @@
name: CI name: CI
on: on: [push]
workflow_dispatch:
push:
branches: [ main ]
tags: [ v* ]
pull_request:
merge_group:
jobs: jobs:
build: build:
runs-on: ubuntu-latest runs-on: ubuntu-latest
steps: steps:
- name: Checkout - name: Checkout
uses: actions/checkout@v3 uses: actions/checkout@v4
with: with:
submodules: "recursive" submodules: "recursive"
fetch-depth: 0
- name: Setup Java - name: Setup Java
uses: actions/setup-java@v3 uses: actions/setup-java@v4
with: with:
distribution: "temurin" distribution: "temurin"
java-version: "17" java-version: 17
- name: Setup Gradle
uses: gradle/actions/setup-gradle@v3
- name: Build with Gradle - name: Build with Gradle
run: | run: |

View File

@@ -37,7 +37,7 @@ androidComponents.onVariants { variant ->
val variantCapped = variant.name.capitalizeUS() val variantCapped = variant.name.capitalizeUS()
val buildTypeLowered = variant.buildType?.lowercase() val buildTypeLowered = variant.buildType?.lowercase()
val libOutDir = layout.buildDirectory.dir("intermediates/stripped_native_libs/$variantLowered/strip${variantLowered}DebugSymbols/out/lib").get() val libOutDir = layout.buildDirectory.dir("intermediates/stripped_native_libs/$variantLowered/strip${variantCapped}DebugSymbols/out/lib").get()
val moduleDir = layout.buildDirectory.dir("outputs/module/$variantLowered").get() val moduleDir = layout.buildDirectory.dir("outputs/module/$variantLowered").get()
val zipOutDir = layout.buildDirectory.dir("outputs/release").get() val zipOutDir = layout.buildDirectory.dir("outputs/release").get()
val zipFileName = "$moduleName-$verName-$commitHash-$buildTypeLowered.zip".replace(' ', '-') val zipFileName = "$moduleName-$verName-$commitHash-$buildTypeLowered.zip".replace(' ', '-')