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

Ray/min sdk cache02 #1170

Closed
wants to merge 2 commits into from
Closed
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
6 changes: 3 additions & 3 deletions .github/actions/gradle-task/action.yml
Original file line number Diff line number Diff line change
Expand Up @@ -59,7 +59,7 @@ runs :
- name : restore cache for ${{inputs.write-cache-key}}
id : restore-write-cache
if : inputs.write-cache-key != 'null'
uses : actions/cache/restore@v3
uses : actions/cache/restore@v4
with :
path : |
~/.gradle/caches/build-cache-1
Expand All @@ -77,7 +77,7 @@ runs :
# Skipped if the restore-cache-key wasn't set, or if the write-cache-key restore had an exact match.
- name : restore cache for ${{inputs.restore-cache-key}}
if : inputs.restore-cache-key != 'null' && steps.restore-write-cache.outputs.cache-hit != 'true'
uses : actions/cache/restore@v3
uses : actions/cache/restore@v4
with :
path : |
~/.gradle/caches/build-cache-1
Expand Down Expand Up @@ -110,7 +110,7 @@ runs :
# Windows runners are welcome to *read* the cross-OS cache, but the directories get weird if
# they try to write to it.
- name : save the '${{inputs.write-cache-key}}' cache
uses : actions/cache/save@v3
uses : actions/cache/save@v4
id : save-write-cache-key
if : inputs.write-cache-key != 'null' && steps.restore-write-cache.outputs.cache-hit != 'true'
with :
Expand Down
4 changes: 2 additions & 2 deletions .github/actions/gradle-tasks-with-emulator/action.yml
Original file line number Diff line number Diff line change
Expand Up @@ -53,7 +53,7 @@ runs :

# Get the AVD if it's already cached.
- name : AVD cache
uses : actions/cache/restore@v3
uses : actions/cache/restore@v4
id : restore-avd-cache
with :
path : |
Expand All @@ -80,7 +80,7 @@ runs :
- name : cache new AVD before tests
if : steps.restore-avd-cache.outputs.cache-hit != 'true'
id : save-avd-cache
uses : actions/cache/save@v3
uses : actions/cache/save@v4
with :
path : |
~/.android/avd/*
Expand Down
11 changes: 6 additions & 5 deletions .github/workflows/kotlin.yml
Original file line number Diff line number Diff line change
Expand Up @@ -2,17 +2,18 @@ name : Kotlin CI

on :
push :
branches :
- main
# branches :
# - main
# Use pull_request_target so we can lock the runner down to run only on the main branch.
# When we want to test changes to this workflow, then we can use:
# pull_request :
# temporarily. We will also need to change the runner group permissions for the
# workflow-kotlin-test-runner-ubuntu-4core group so that it can run with the branch/SHA
# of the PR.
pull_request_target :
branches :
- main
pull_request :
# pull_request_target :
# branches :
# - main
merge_group :

env:
Expand Down
4 changes: 0 additions & 4 deletions workflow-ui/compose/build.gradle.kts
Original file line number Diff line number Diff line change
Expand Up @@ -13,10 +13,6 @@ android {
composeOptions {
kotlinCompilerExtensionVersion = libs.versions.androidx.compose.compiler.get()
}
defaultConfig {
// https://issuetracker.google.com/issues/194289155#comment21
minSdk = 24
}
namespace = "com.squareup.workflow1.ui.compose"
testNamespace = "$namespace.test"
}
Expand Down
Loading