Skip to content
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.

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

Update GitHub actions #252

Merged
merged 4 commits into from
Jan 22, 2024
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
17 changes: 4 additions & 13 deletions .github/workflows/Build.yml
Original file line number Diff line number Diff line change
Expand Up @@ -16,13 +16,10 @@ env:
CI: true
TERM: dumb
GRADLE_OPTS: >-
-Dorg.gradle.jvmargs="-Xmx3G -XX:MaxMetaspaceSize=1g -XX:SoftRefLRUPolicyMSPerMB=10 -XX:+UseParallelGC"
-Dorg.gradle.workers.max=2
-Dorg.gradle.vfs.watch=false
-Dorg.gradle.jvmargs="-Xmx4G -XX:MaxMetaspaceSize=1g -XX:SoftRefLRUPolicyMSPerMB=10 -XX:+UseParallelGC -XX:NewRatio=1"
-Dorg.gradle.dependency.verification.console=verbose
-DwarningsAsErrors=false
KOTLIN_DAEMON_JVMARGS: >-
-Xmx2G -XX:MaxMetaspaceSize=320M -XX:SoftRefLRUPolicyMSPerMB=10 -XX:+UseParallelGC -XX:NewRatio=1
-Xmx1G -XX:MaxMetaspaceSize=320M -XX:SoftRefLRUPolicyMSPerMB=10 -XX:+UseParallelGC -XX:NewRatio=1

jobs:
assemble:
Expand All @@ -43,14 +40,11 @@ jobs:
- name: Check LFS files
uses: actionsdesk/[email protected]

- name: Validate Gradle wrapper
uses: gradle/wrapper-validation-action@v1

- name: Setup Java
uses: actions/setup-java@v4
with:
distribution: 'temurin'
java-version: '20'
java-version: '21'

- name: Unpack pixnews.properties
env:
Expand Down Expand Up @@ -125,14 +119,11 @@ jobs:
[ ! -e ~/.dprint/bin/dprint ] && curl -fsSL https://dprint.dev/install.sh | sh > /dev/null 2>&1
echo "$HOME/.dprint/bin" >> $GITHUB_PATH

- name: Validate Gradle wrapper
uses: gradle/wrapper-validation-action@v1

- name: Setup Java
uses: actions/setup-java@v4
with:
distribution: 'temurin'
java-version: '20'
java-version: '21'

- name: Run dprint
run: dprint check
Expand Down
31 changes: 13 additions & 18 deletions .github/workflows/BuildOnPushMain.yml
Original file line number Diff line number Diff line change
Expand Up @@ -21,14 +21,10 @@ env:
CI: true
TERM: dumb
GRADLE_OPTS: >-
-Dorg.gradle.jvmargs="-Xmx1536M -XX:MaxMetaspaceSize=1g -XX:SoftRefLRUPolicyMSPerMB=10 -XX:+UseParallelGC"
-Dorg.gradle.parallel=true
-Dorg.gradle.workers.max=2
-Dorg.gradle.vfs.watch=false
-Dorg.gradle.jvmargs="-Xmx4G -XX:MaxMetaspaceSize=1g -XX:SoftRefLRUPolicyMSPerMB=10 -XX:+UseParallelGC"
-Dorg.gradle.dependency.verification.console=verbose
-DwarningsAsErrors=false
KOTLIN_DAEMON_JVMARGS: >-
-Xmx1536M -XX:MaxMetaspaceSize=320M -XX:SoftRefLRUPolicyMSPerMB=10 -XX:+UseParallelGC -XX:NewRatio=1
-Xmx1G -XX:MaxMetaspaceSize=320M -XX:SoftRefLRUPolicyMSPerMB=10 -XX:+UseParallelGC -XX:NewRatio=1

jobs:
assemble:
Expand All @@ -46,14 +42,11 @@ jobs:
lfs: true
submodules: true

- name: Validate Gradle wrapper
uses: gradle/wrapper-validation-action@v1

- name: Setup Java
uses: actions/setup-java@v4
with:
distribution: 'temurin'
java-version: '20'
java-version: '21'

- name: Setup Gradle
uses: gradle/gradle-build-action@v2
Expand Down Expand Up @@ -107,11 +100,18 @@ jobs:

instrumented-tests:
name: Instrumented tests
runs-on: macos-latest
runs-on: ubuntu-latest
timeout-minutes: 60
if: ${{ !contains(github.event.head_commit.message, '[ci skip]') }}

steps:
- name: Enable KVM group perms
run: |
echo 'KERNEL=="kvm", GROUP="kvm", MODE="0666", OPTIONS+="static_node=kvm"' | sudo tee /etc/udev/rules.d/99-kvm4all.rules
sudo udevadm control --reload-rules
sudo udevadm trigger --name-match=kvm
ls /dev/kvm

- name: Checkout sources
uses: actions/checkout@v4
with:
Expand All @@ -120,14 +120,11 @@ jobs:
lfs: true
submodules: true

- name: Validate Gradle wrapper
uses: gradle/wrapper-validation-action@v1

- name: Setup Java
uses: actions/setup-java@v4
with:
distribution: 'temurin'
java-version: '20'
java-version: '21'

- name: Setup Gradle
uses: gradle/gradle-build-action@v2
Expand All @@ -148,8 +145,6 @@ jobs:
./gradlew
-Pkotlin.daemon.jvmargs="${{ env.KOTLIN_DAEMON_JVMARGS }}"
-Dorg.gradle.workers.max=1
-Pandroid.testoptions.manageddevices.emulator.gpu=swiftshader_indirect
-Pandroid.experimental.testOptions.managedDevices.emulator.showKernelLogging=true
-Pandroid.testInstrumentationRunnerArguments.androidx.benchmark.enabledRules=""
pixel2api30DebugAndroidTest
--scan --continue
Expand All @@ -173,7 +168,7 @@ jobs:
-o -path '*/build/outputs/androidTest-results'
-o -path '*/build/outputs/managed_*'
-o -path '*/build/reports/androidTests' \) -print0
| xargs -0 tar -c --zstd --options zstd:compression-level=20 -f instrumented-tests.tar.zst
| xargs -0 tar -c -I 'zstd -19 -T0' -f instrumented-tests.tar.zst

- name: Upload test reports
if: ${{ failure() }}
Expand Down
2 changes: 1 addition & 1 deletion .github/workflows/GenerateBaselineProfile.yml
Original file line number Diff line number Diff line change
Expand Up @@ -38,7 +38,7 @@ jobs:
uses: actions/setup-java@v4
with:
distribution: 'temurin'
java-version: '20'
java-version: '21'

- name: Setup Gradle
uses: gradle/gradle-build-action@v2
Expand Down
20 changes: 20 additions & 0 deletions .github/workflows/GradleWrapper.yml
Original file line number Diff line number Diff line change
@@ -0,0 +1,20 @@
name: gradle-wrapper

on:
pull_request:
paths:
- 'gradlew'
- 'gradlew.bat'
- 'gradle/wrapper/'

jobs:
validate:
runs-on: ubuntu-latest
steps:
- name: Checkout sources
uses: actions/checkout@v4
with:
fetch-depth: 0

- name: Validate Gradle wrapper
uses: gradle/wrapper-validation-action@v1
6 changes: 1 addition & 5 deletions .github/workflows/InstrumentedTestOnSelfHostedRunner.yml
Original file line number Diff line number Diff line change
Expand Up @@ -24,7 +24,6 @@ env:
-Dorg.gradle.jvmargs="-Xmx1536M -XX:MaxMetaspaceSize=1g -XX:SoftRefLRUPolicyMSPerMB=10 -XX:+UseParallelGC"
-Dorg.gradle.parallel=true
-Dorg.gradle.workers.max=2
-Dorg.gradle.vfs.watch=false
-Dorg.gradle.dependency.verification.console=verbose
-DwarningsAsErrors=false
KOTLIN_DAEMON_JVMARGS: >-
Expand All @@ -51,14 +50,11 @@ jobs:
lfs: true
submodules: true

- name: Validate Gradle wrapper
uses: gradle/wrapper-validation-action@v1

- name: Setup Java
uses: actions/setup-java@v4
with:
distribution: 'temurin'
java-version: '20'
java-version: '21'

- name: Setup Gradle
uses: gradle/gradle-build-action@v2
Expand Down
12 changes: 7 additions & 5 deletions gradle.properties
Original file line number Diff line number Diff line change
Expand Up @@ -12,18 +12,20 @@ org.gradle.configuration-cache=true
android.useAndroidX=true
android.enableJetifier=false

#Kotlin
kotlin.code.style=official

#Debug
#org.gradle.dependency.verification=lenient
#org.gradle.logging.level=debug
#org.gradle.debug=true
kotlin.compiler.preciseCompilationResultsBackup=true
#kotlin.build.report.enable=true
#kotlin.build.report.output=file
#kotlin.build.report.verbose=true
#Metrics
#kotlin.build.report.metrics=true

#Debug
#org.gradle.dependency.verification=lenient
#org.gradle.logging.level=debug
#org.gradle.debug=true

# Kapt controls
kapt.include.compile.classpath=false

Expand Down
2 changes: 1 addition & 1 deletion gradle/plugin/settings/settings-plugins.gradle.kts
Original file line number Diff line number Diff line change
Expand Up @@ -9,5 +9,5 @@ plugins {
group = "ru.pixnews.gradle.settings"

dependencies {
implementation("com.gradle:gradle-enterprise-gradle-plugin:3.14.1")
implementation("com.gradle:gradle-enterprise-gradle-plugin:3.16.1")
}
Loading