Skip to content

Commit 1546cc8

Browse files
committed
Merge branch 'main' into feat/harness-tests
2 parents 19de80a + 882866f commit 1546cc8

15 files changed

Lines changed: 619 additions & 588 deletions

.github/workflows/build-android-release.yml

Lines changed: 11 additions & 10 deletions
Original file line numberDiff line numberDiff line change
@@ -4,26 +4,29 @@ on:
44
release:
55
types: [published]
66

7+
permissions:
8+
contents: write
9+
710
jobs:
811
build:
912
name: Build Android Example App (release)
10-
runs-on: ubuntu-latest
13+
runs-on: ubuntu-24.04
1114
steps:
12-
- uses: actions/checkout@v4
15+
- uses: actions/checkout@v6
1316
- uses: oven-sh/setup-bun@v2
1417

1518
- name: Install npm dependencies (bun)
1619
run: bun install
1720

1821
- name: Setup JDK 17
19-
uses: actions/setup-java@v4
22+
uses: actions/setup-java@v5
2023
with:
2124
distribution: "zulu"
2225
java-version: 17
2326
java-package: jdk
2427

2528
- name: Restore Gradle cache
26-
uses: actions/cache@v4
29+
uses: actions/cache@v5
2730
with:
2831
path: |
2932
~/.gradle/caches
@@ -35,14 +38,12 @@ jobs:
3538
run: ./gradlew assembleRelease --no-daemon --build-cache
3639

3740
- name: Upload APK to Release
38-
uses: actions/upload-release-asset@v1
3941
env:
4042
GITHUB_TOKEN: ${{ secrets.GITHUB_TOKEN }}
41-
with:
42-
upload_url: ${{ github.event.release.upload_url }}
43-
asset_path: example/android/app/build/outputs/apk/release/app-release.apk
44-
asset_name: "NitroSQLiteExample-${{ github.event.release.tag_name }}.apk"
45-
asset_content_type: application/vnd.android.package-archive
43+
run: |
44+
gh release upload "${{ github.event.release.tag_name }}" \
45+
example/android/app/build/outputs/apk/release/app-release.apk#NitroSQLiteExample-${{ github.event.release.tag_name }}.apk \
46+
--clobber
4647
4748
# Gradle cache doesn't like daemons
4849
- name: Stop Gradle Daemon

.github/workflows/build-android.yml

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -33,7 +33,7 @@ env:
3333
jobs:
3434
build:
3535
name: Build Android Example App
36-
runs-on: ubuntu-latest
36+
runs-on: ubuntu-24.04
3737
strategy:
3838
matrix:
3939
min-sdk:

.github/workflows/build-ios.yml

Lines changed: 9 additions & 7 deletions
Original file line numberDiff line numberDiff line change
@@ -34,7 +34,7 @@ env:
3434
jobs:
3535
build:
3636
name: Build iOS Example App
37-
runs-on: macOS-26
37+
runs-on: macos-26
3838
strategy:
3939
matrix:
4040
include:
@@ -73,8 +73,8 @@ jobs:
7373
bundler-cache: true
7474
working-directory: example
7575

76-
- name: Select Xcode 26.2
77-
run: sudo xcode-select -s "/Applications/Xcode_26.2.app/Contents/Developer"
76+
- name: Select Xcode 26.5
77+
run: sudo xcode-select -s "/Applications/Xcode_26.5.app/Contents/Developer"
7878

7979
- name: Restore Pods cache
8080
uses: actions/cache@v5
@@ -83,25 +83,27 @@ jobs:
8383
key: ${{ runner.os }}-${{ matrix.use_frameworks }}-pods-${{ hashFiles('**/Podfile.lock', '**/Gemfile.lock') }}
8484
restore-keys: |
8585
${{ runner.os }}-${{ matrix.use_frameworks }}-pods-
86+
- name: Clean generated iOS codegen
87+
run: rm -rf example/ios/build/generated
8688
- name: Install Pods
8789
working-directory: example
8890
run: bun pods
8991

9092
- name: Restore DerivedData cache
9193
uses: actions/cache@v5
9294
with:
93-
path: example/ios/build
94-
key: ${{ runner.os }}-${{ matrix.use_frameworks }}-dd-${{ hashFiles('**/Podfile.lock', '**/Gemfile.lock', '**/package.json', '**/bun.lock') }}-xcode26.2
95+
path: example/ios/build/DerivedData
96+
key: ${{ runner.os }}-${{ matrix.use_frameworks }}-dd-${{ hashFiles('**/Podfile.lock', '**/Gemfile.lock', '**/package.json', '**/bun.lock') }}-xcode26.5
9597
restore-keys: |
96-
${{ runner.os }}-${{ matrix.use_frameworks }}-dd-
98+
${{ runner.os }}-${{ matrix.use_frameworks }}-dd-${{ hashFiles('**/Podfile.lock', '**/Gemfile.lock', '**/package.json', '**/bun.lock') }}-xcode26.5
9799
98100
- name: Build App
99101
working-directory: example/ios
100102
run: |
101103
set -o pipefail
102104
xcodebuild \
103105
CC=clang CPLUSPLUS=clang++ LD=clang LDPLUSPLUS=clang++ \
104-
-derivedDataPath build -UseModernBuildSystem=YES \
106+
-derivedDataPath build/DerivedData -UseModernBuildSystem=YES \
105107
-workspace NitroSQLiteExample.xcworkspace \
106108
-scheme NitroSQLiteExample \
107109
-sdk iphonesimulator \

.github/workflows/lint-cpp.yml

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -23,7 +23,7 @@ on:
2323
jobs:
2424
lint:
2525
name: Format C++
26-
runs-on: ubuntu-latest
26+
runs-on: ubuntu-24.04
2727
steps:
2828
- uses: actions/checkout@v6
2929
- uses: oven-sh/setup-bun@v2

.github/workflows/lint-typescript.yml

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -34,7 +34,7 @@ on:
3434
jobs:
3535
tsc:
3636
name: Compile TypeScript (tsc)
37-
runs-on: ubuntu-latest
37+
runs-on: ubuntu-24.04
3838
steps:
3939
- uses: actions/checkout@v6
4040
- uses: oven-sh/setup-bun@v2
@@ -52,7 +52,7 @@ jobs:
5252

5353
lint:
5454
name: Lint TypeScript (eslint, prettier)
55-
runs-on: ubuntu-latest
55+
runs-on: ubuntu-24.04
5656
steps:
5757
- uses: actions/checkout@v6
5858
- uses: oven-sh/setup-bun@v2

.github/workflows/update-lockfiles.yml

Lines changed: 3 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -21,7 +21,7 @@ jobs:
2121
update-lockfiles:
2222
name: "Update lockfiles (Podfile.lock)"
2323
if: github.actor == 'dependabot[bot]'
24-
runs-on: macOS-26
24+
runs-on: macos-26
2525
steps:
2626
- uses: actions/checkout@v6
2727
with:
@@ -37,8 +37,8 @@ jobs:
3737
bundler-cache: true
3838
working-directory: example/ios
3939

40-
- name: Select Xcode 26.2
41-
run: sudo xcode-select -s "/Applications/Xcode_26.2.app/Contents/Developer"
40+
- name: Select Xcode 26.5
41+
run: sudo xcode-select -s "/Applications/Xcode_26.5.app/Contents/Developer"
4242

4343
- run: |
4444
bun install

0 commit comments

Comments
 (0)