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.

Sign up for GitHub

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

fix: Enable CI cache #2438

Merged
merged 7 commits into from
Feb 25, 2025
+119 −133
Merged

fix: Enable CI cache #2438

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
7 commits
Select commit Hold shift + click to select a range
4f9ec08
fix: remove dev container
stepanLav Feb 20, 2025
1cd6251
fix: return cache back
stepanLav Feb 20, 2025
991a692
remove ruby cache
stepanLav Feb 20, 2025
0ec81a7
try previous version
stepanLav Feb 24, 2025
9bd7d28
fix update to previous one
stepanLav Feb 24, 2025
6fe59ca
fix use toolchain - 1.84.0
stepanLav Feb 24, 2025
e84eae9
fix components
stepanLav Feb 24, 2025
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: 0 additions & 17 deletions .devcontainer/devcontainer.json
View file
Open in desktop

This file was deleted.

24 changes: 12 additions & 12 deletions .github/workflows/actions.yml
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -39,13 +39,13 @@ jobs:
brew install sourcery
bundle install

# - name: Get cached Swift Packages managed by Xcode
# uses: actions/cache@v3
# with:
# path: ~/Library/Developer/Xcode/DerivedData/**/SourcePackages/
# key: ${{ runner.os }}-spm-${{ hashFiles('**/Package.resolved') }}
# restore-keys: |
# ${{ runner.os }}-spm-
- name: Get cached Swift Packages managed by Xcode
uses: actions/cache@v3
with:
path: ~/Library/Developer/Xcode/DerivedData/**/SourcePackages/
key: ${{ runner.os }}-spm-${{ hashFiles('**/Package.resolved') }}
restore-keys: |
${{ runner.os }}-spm-

- name: Install Rust targets
uses: dtolnay/rust-toolchain@stable
Expand All @@ -58,12 +58,12 @@ jobs:
with:
crate: uniffi_bindgen
version: 0.22.0 # Must be in sync with version in Cargo.toml
use-tool-cache: false
use-tool-cache: true

# - name: Rust Cache
# uses: Swatinem/rust-cache@27b8ea9368cf428f0bfe41b0876b1a7e809d9844 # v2.7.7
# with:
# workspaces: rust -> rust/target
- name: Rust Cache
uses: Swatinem/rust-cache@27b8ea9368cf428f0bfe41b0876b1a7e809d9844 # v2.7.7
with:
workspaces: rust -> rust/target

- name: Build iOS and run tests
shell: bash
Expand Down
60 changes: 30 additions & 30 deletions .github/workflows/android-app.yml
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -38,28 +38,28 @@ jobs:
with:
crate: uniffi_bindgen
version: 0.22.0 # Must be in sync with version in Cargo.toml
use-tool-cache: false
use-tool-cache: true

- name: Install additional rust targets
run: rustup target add aarch64-linux-android armv7-linux-androideabi x86_64-linux-android

- name: Install Android Dependencies
uses: ./.github/actions/install-android-dep

# - name: Rust Cache
# uses: Swatinem/rust-cache@27b8ea9368cf428f0bfe41b0876b1a7e809d9844 # v2.7.7
# with:
# workspaces: rust -> rust/target

# - name: Gradle Cache
# uses: actions/cache@v3
# with:
# path: |
# ~/.gradle/caches
# ~/.gradle/wrapper
# key: ${{ runner.os }}-gradle-${{ hashFiles('**/.gradle*', '**/gradle-wrapper.properties') }}
# restore-keys: |
# ${{ runner.os }}-gradle-
- name: Rust Cache
uses: Swatinem/rust-cache@27b8ea9368cf428f0bfe41b0876b1a7e809d9844 # v2.7.7
with:
workspaces: rust -> rust/target

- name: Gradle Cache
uses: actions/cache@v3
with:
path: |
~/.gradle/caches
~/.gradle/wrapper
key: ${{ runner.os }}-gradle-${{ hashFiles('**/.gradle*', '**/gradle-wrapper.properties') }}
restore-keys: |
${{ runner.os }}-gradle-

- name: Build
run: |
Expand Down Expand Up @@ -92,28 +92,28 @@ jobs:
with:
crate: uniffi_bindgen
version: 0.22.0 # Must be in sync with version in Cargo.toml
use-tool-cache: false
use-tool-cache: true

- name: Install additional rust targets
run: rustup target add aarch64-linux-android armv7-linux-androideabi x86_64-linux-android

- name: Install Android Dependencies
uses: ./.github/actions/install-android-dep

# - name: Rust Cache
# uses: Swatinem/rust-cache@27b8ea9368cf428f0bfe41b0876b1a7e809d9844 # v2.7.7
# with:
# workspaces: rust -> rust/target

# - name: Gradle Cache
# uses: actions/cache@v3
# with:
# path: |
# ~/.gradle/caches
# ~/.gradle/wrapper
# key: ${{ runner.os }}-gradle-${{ hashFiles('**/.gradle*', '**/gradle-wrapper.properties') }}
# restore-keys: |
# ${{ runner.os }}-gradle-
- name: Rust Cache
uses: Swatinem/rust-cache@27b8ea9368cf428f0bfe41b0876b1a7e809d9844 # v2.7.7
with:
workspaces: rust -> rust/target

- name: Gradle Cache
uses: actions/cache@v3
with:
path: |
~/.gradle/caches
~/.gradle/wrapper
key: ${{ runner.os }}-gradle-${{ hashFiles('**/.gradle*', '**/gradle-wrapper.properties') }}
restore-keys: |
${{ runner.os }}-gradle-

- name: Assemble unsigned debug apk
run: |
Expand Down
60 changes: 30 additions & 30 deletions .github/workflows/android-release.yml
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -34,28 +34,28 @@ jobs:
with:
crate: uniffi_bindgen
version: 0.22.0 # Must be in sync with version in Cargo.toml
use-tool-cache: false
use-tool-cache: true

- name: Install additional rust targets
run: rustup target add aarch64-linux-android armv7-linux-androideabi x86_64-linux-android

- name: Install Android Dependencies
uses: ./.github/actions/install-android-dep

# - name: Rust Cache
# uses: Swatinem/rust-cache@27b8ea9368cf428f0bfe41b0876b1a7e809d9844 # v2.7.7
# with:
# workspaces: rust -> rust/target

# - name: Gradle Cache
# uses: actions/cache@v3
# with:
# path: |
# ~/.gradle/caches
# ~/.gradle/wrapper
# key: ${{ runner.os }}-gradle-${{ hashFiles('**/.gradle*', '**/gradle-wrapper.properties') }}
# restore-keys: |
# ${{ runner.os }}-gradle-
- name: Rust Cache
uses: Swatinem/rust-cache@27b8ea9368cf428f0bfe41b0876b1a7e809d9844 # v2.7.7
with:
workspaces: rust -> rust/target

- name: Gradle Cache
uses: actions/cache@v3
with:
path: |
~/.gradle/caches
~/.gradle/wrapper
key: ${{ runner.os }}-gradle-${{ hashFiles('**/.gradle*', '**/gradle-wrapper.properties') }}
restore-keys: |
${{ runner.os }}-gradle-

- name: Build
run: |
Expand Down Expand Up @@ -88,28 +88,28 @@ jobs:
with:
crate: uniffi_bindgen
version: 0.22.0 # Must be in sync with version in Cargo.toml
use-tool-cache: false
use-tool-cache: true

- name: Install additional rust targets
run: rustup target add aarch64-linux-android armv7-linux-androideabi x86_64-linux-android

- name: Install Android Dependencies
uses: ./.github/actions/install-android-dep

# - name: Rust Cache
# uses: Swatinem/rust-cache@27b8ea9368cf428f0bfe41b0876b1a7e809d9844 # v2.7.7
# with:
# workspaces: rust -> rust/target

# - name: Gradle Cache
# uses: actions/cache@v3
# with:
# path: |
# ~/.gradle/caches
# ~/.gradle/wrapper
# key: ${{ runner.os }}-gradle-${{ hashFiles('**/.gradle*', '**/gradle-wrapper.properties') }}
# restore-keys: |
# ${{ runner.os }}-gradle-
- name: Rust Cache
uses: Swatinem/rust-cache@27b8ea9368cf428f0bfe41b0876b1a7e809d9844 # v2.7.7
with:
workspaces: rust -> rust/target

- name: Gradle Cache
uses: actions/cache@v3
with:
path: |
~/.gradle/caches
~/.gradle/wrapper
key: ${{ runner.os }}-gradle-${{ hashFiles('**/.gradle*', '**/gradle-wrapper.properties') }}
restore-keys: |
${{ runner.os }}-gradle-

# Build and publish

Expand Down
10 changes: 5 additions & 5 deletions .github/workflows/docs.yml
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -33,10 +33,10 @@ jobs:
- name: Install Rust stable toolchain
uses: dtolnay/rust-toolchain@stable

# - name: Rust Cache
# uses: Swatinem/rust-cache@27b8ea9368cf428f0bfe41b0876b1a7e809d9844 # v2.7.7
# with:
# workspaces: rust -> rust/target
- name: Rust Cache
uses: Swatinem/rust-cache@27b8ea9368cf428f0bfe41b0876b1a7e809d9844 # v2.7.7
with:
workspaces: rust -> rust/target

- name: Install cargo-spellcheck
uses: baptiste0928/cargo-install@1cd874a5478fdca35d868ccc74640c5aabbb8f1b # v3.0.0
Expand All @@ -48,7 +48,7 @@ jobs:
with:
crate: uniffi_bindgen
version: 0.22.0 # Must be in sync with version in Cargo.toml
use-tool-cache: false
use-tool-cache: true

- name: Run spellcheck
run: |
Expand Down
15 changes: 9 additions & 6 deletions .github/workflows/rust-clippy.yml
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -15,7 +15,7 @@ jobs:
name: Cargo clippy
runs-on: ubuntu-22.04
container:
image: ghcr.io/${{ github.repository }}/opencv-builder:4.11.0
image: ghcr.io/${{ github.repository }}/opencv-builder@sha256:c55a187a86eac41e1381d1f305eb1f139c80ba0082dea1cd9f9b55e43329d8f3
steps:

- name: Checkout sources
Expand All @@ -31,18 +31,21 @@ jobs:

- name: Install Rust stable toolchain
uses: dtolnay/rust-toolchain@stable
with:
toolchain: 1.84.0
components: clippy

- name: Install uniffi_bindgen
uses: actions-rs/install@v0.1
with:
crate: uniffi_bindgen
version: 0.22.0 # Must be in sync with version in Cargo.toml
use-tool-cache: false
use-tool-cache: true

# - name: Rust Cache
# uses: Swatinem/rust-cache@27b8ea9368cf428f0bfe41b0876b1a7e809d9844 # v2.7.7
# with:
# workspaces: rust -> rust/target
- name: Rust Cache
uses: Swatinem/rust-cache@27b8ea9368cf428f0bfe41b0876b1a7e809d9844 # v2.7.7
with:
workspaces: rust -> rust/target

- name: cargo clippy
run: |
Expand Down
10 changes: 5 additions & 5 deletions .github/workflows/rust-test-android.yml
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -43,12 +43,12 @@ jobs:
with:
crate: uniffi_bindgen
version: 0.22.0 # Must be in sync with version in Cargo.toml
use-tool-cache: false
use-tool-cache: true

# - name: Rust Cache
# uses: Swatinem/rust-cache@27b8ea9368cf428f0bfe41b0876b1a7e809d9844 # v2.7.7
# with:
# workspaces: rust -> rust/target
- name: Rust Cache
uses: Swatinem/rust-cache@27b8ea9368cf428f0bfe41b0876b1a7e809d9844 # v2.7.7
with:
workspaces: rust -> rust/target

- name: cargo nextest
run: |
Expand Down
10 changes: 5 additions & 5 deletions .github/workflows/rust-test-ios.yml
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -40,12 +40,12 @@ jobs:
with:
crate: uniffi_bindgen
version: 0.22.0 # Must be in sync with version in Cargo.toml
use-tool-cache: false
use-tool-cache: true

# - name: Rust Cache
# uses: Swatinem/rust-cache@27b8ea9368cf428f0bfe41b0876b1a7e809d9844 # v2.7.7
# with:
# workspaces: rust -> rust/target
- name: Rust Cache
uses: Swatinem/rust-cache@27b8ea9368cf428f0bfe41b0876b1a7e809d9844 # v2.7.7
with:
workspaces: rust -> rust/target

- name: cargo nextest
shell: bash
Expand Down
24 changes: 12 additions & 12 deletions .github/workflows/testflight-prod.yml
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -34,13 +34,13 @@ jobs:
brew install sourcery
bundle install

# - name: Get cached Swift Packages managed by Xcode
# uses: actions/cache@v3
# with:
# path: ~/Library/Developer/Xcode/DerivedData/**/SourcePackages/
# key: ${{ runner.os }}-spm-${{ hashFiles('**/Package.resolved') }}
# restore-keys: |
# ${{ runner.os }}-spm-
- name: Get cached Swift Packages managed by Xcode
uses: actions/cache@v3
with:
path: ~/Library/Developer/Xcode/DerivedData/**/SourcePackages/
key: ${{ runner.os }}-spm-${{ hashFiles('**/Package.resolved') }}
restore-keys: |
${{ runner.os }}-spm-

- name: Install Rust targets
uses: dtolnay/rust-toolchain@stable
Expand All @@ -53,12 +53,12 @@ jobs:
with:
crate: uniffi_bindgen
version: 0.22.0 # Must be in sync with version in Cargo.toml
use-tool-cache: false
use-tool-cache: true

# - name: Rust Cache
# uses: Swatinem/rust-cache@27b8ea9368cf428f0bfe41b0876b1a7e809d9844 # v2.7.7
# with:
# workspaces: rust -> rust/target
- name: Rust Cache
uses: Swatinem/rust-cache@27b8ea9368cf428f0bfe41b0876b1a7e809d9844 # v2.7.7
with:
workspaces: rust -> rust/target

- name: Install the Apple certificate and provisioning profile
env:
Expand Down
Loading
Loading