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

Add sqlite3mc and e_sqlite3mc to build process #19

Merged
merged 1 commit into from
Nov 9, 2023
Merged

Add sqlite3mc and e_sqlite3mc to build process #19

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
1 commit
Select commit
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
70 changes: 42 additions & 28 deletions .github/workflows/build.yml
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -17,10 +17,10 @@ jobs:
os: [ubuntu-20.04, macos-latest, windows-2019]
runs-on: ${{ matrix.os }}
steps:
- uses: actions/checkout@v2
- uses: actions/checkout@v3
with:
path: "cb"
- uses: actions/checkout@v2
- uses: actions/checkout@v3
with:
repository: libtom/libtomcrypt
path: "libtomcrypt"
Expand All @@ -34,7 +34,7 @@ jobs:
with:
ndk-version: r21e
- name: Setup .NET
uses: actions/setup-dotnet@v1
uses: actions/setup-dotnet@v3
with:
dotnet-version: 3.1.x
- name: Generate script
Expand Down Expand Up @@ -73,10 +73,18 @@ jobs:
ndk-build
mkdir -p ../bin/e_sqlite3/android
cp -r libs/* ../bin/e_sqlite3/android
cd ../android_e_sqlite3mc
ndk-build
mkdir -p ../bin/e_sqlite3mc/android
cp -r libs/* ../bin/e_sqlite3mc/android
cd ../android_e_sqlcipher
ndk-build
mkdir -p ../bin/e_sqlcipher/android
cp -r libs/* ../bin/e_sqlcipher/android
cd ../android_sqlite3mc
ndk-build
mkdir -p ../bin/sqlite3mc/android
cp -r libs/* ../bin/sqlite3mc/android
working-directory: cb/bld
- name: Build (macOS, iOS, tvOS)
if: startsWith(matrix.os, 'macos')
Expand All @@ -89,12 +97,12 @@ jobs:
- name: Build (Windows)
if: startsWith(matrix.os, 'windows')
run: |
$files = Get-ChildItem *.bat -Exclude "win_e_sqlite3.bat","win_e_sqlcipher.bat"
$files = Get-ChildItem *.bat -Exclude "win_e_sqlite3.bat","win_e_sqlite3mc.bat","win_e_sqlcipher.bat","win_sqlite3mc.bat"
foreach ($f in $files) {
cmd /C $f
}
working-directory: cb/bld
- uses: actions/upload-artifact@v2
- uses: actions/upload-artifact@v3
with:
name: bin-${{ matrix.os }}
path: cb/bld/bin
Expand All @@ -109,20 +117,20 @@ jobs:
- '{ "tfm": "net8.0", "emsdk": "3.1.34" }' # eol: 2026-11-14
runs-on: ubuntu-20.04
steps:
- uses: actions/checkout@v2
- uses: actions/checkout@v3
with:
path: "cb"
- uses: actions/checkout@v2
- uses: actions/checkout@v3
with:
repository: libtom/libtomcrypt
path: "libtomcrypt"
ref: "v1.18.2"
- name: Setup Emscripten
uses: mymindstorm/setup-emsdk@v11
uses: mymindstorm/setup-emsdk@v12
with:
version: ${{ fromJSON(matrix.config).emsdk }}
- name: Setup .NET
uses: actions/setup-dotnet@v1
uses: actions/setup-dotnet@v3
with:
dotnet-version: 3.1.x
- name: Generate script
Expand All @@ -142,7 +150,7 @@ jobs:
bash "$f" ${{ fromJSON(matrix.config).tfm }}
done
working-directory: cb/bld
- uses: actions/upload-artifact@v2
- uses: actions/upload-artifact@v3
with:
name: bin-wasm-${{ fromJSON(matrix.config).tfm }}
path: cb/bld/bin
Expand All @@ -156,10 +164,10 @@ jobs:
os: [windows-2019]
runs-on: ${{ matrix.os }}
steps:
- uses: actions/checkout@v2
- uses: actions/checkout@v3
with:
path: "cb"
- uses: actions/checkout@v2
- uses: actions/checkout@v3
with:
fetch-depth: 0
repository: ericsink/SQLitePCL.raw
Expand All @@ -172,27 +180,27 @@ jobs:
if: startsWith(matrix.os, 'windows')
run: rm bin -r -fo
working-directory: cb/bld
- uses: actions/download-artifact@v2
- uses: actions/download-artifact@v3
with:
name: bin-ubuntu-20.04
path: cb/bld/bin
- uses: actions/download-artifact@v2
- uses: actions/download-artifact@v3
with:
name: bin-macos-latest
path: cb/bld/bin
- uses: actions/download-artifact@v2
- uses: actions/download-artifact@v3
with:
name: bin-windows-2019
path: cb/bld/bin
- uses: actions/download-artifact@v2
- uses: actions/download-artifact@v3
with:
name: bin-wasm-net6.0
path: cb/bld/bin
- uses: actions/download-artifact@v2
- uses: actions/download-artifact@v3
with:
name: bin-wasm-net7.0
path: cb/bld/bin
- uses: actions/download-artifact@v2
- uses: actions/download-artifact@v3
with:
name: bin-wasm-net8.0
path: cb/bld/bin
Expand All @@ -202,7 +210,7 @@ jobs:
with:
java-version: 11
- name: Setup .NET 6
uses: actions/setup-dotnet@v1
uses: actions/setup-dotnet@v3
with:
dotnet-version: 6.0.x
- name: Install workload ios
Expand All @@ -212,11 +220,11 @@ jobs:
- name: Install workload tvos
run: dotnet workload install tvos
- name: Setup .NET 5
uses: actions/setup-dotnet@v1
uses: actions/setup-dotnet@v3
with:
dotnet-version: 5.0.x
- name: Setup .NET 3.1
uses: actions/setup-dotnet@v1
uses: actions/setup-dotnet@v3
with:
dotnet-version: 3.1.x
- name: Install T4
Expand All @@ -231,44 +239,50 @@ jobs:
if: ${{ github.event_name == 'push' }}
runs-on: ubuntu-20.04
steps:
- uses: actions/checkout@v2
- uses: actions/checkout@v3
with:
fetch-depth: 0
- name: Clean output directory
run: |
rm -fr bin/e_sqlite3
rm -fr bin/e_sqlite3mc
rm -fr bin/e_sqlcipher
rm -fr bin/sqlite3mc
working-directory: bld
- uses: actions/download-artifact@v2
- uses: actions/download-artifact@v3
with:
name: bin-ubuntu-20.04
path: bld/bin
- uses: actions/download-artifact@v2
- uses: actions/download-artifact@v3
with:
name: bin-macos-latest
path: bld/bin
- uses: actions/download-artifact@v2
- uses: actions/download-artifact@v3
with:
name: bin-windows-2019
path: bld/bin
- uses: actions/download-artifact@v2
- uses: actions/download-artifact@v3
with:
name: bin-wasm-net6.0
path: bld/bin
- uses: actions/download-artifact@v2
- uses: actions/download-artifact@v3
with:
name: bin-wasm-net7.0
path: bld/bin
- uses: actions/download-artifact@v2
- uses: actions/download-artifact@v3
with:
name: bin-wasm-net8.0
path: bld/bin
- name: Fix permissions
run: |
find ./bld/bin/e_sqlite3 -name *.so | xargs chmod 0775
find ./bld/bin/e_sqlite3 -name *.dylib | xargs chmod 0775
find ./bld/bin/e_sqlite3mc -name *.so | xargs chmod 0775
find ./bld/bin/e_sqlite3mc -name *.dylib | xargs chmod 0775
find ./bld/bin/e_sqlcipher -name *.so | xargs chmod 0775
find ./bld/bin/e_sqlcipher -name *.dylib | xargs chmod 0775
find ./bld/bin/sqlite3mc -name *.so | xargs chmod 0775
find ./bld/bin/sqlite3mc -name *.dylib | xargs chmod 0775
- name: Commit & Push changes
uses: actions-js/push@master
with:
Expand Down
2 changes: 1 addition & 1 deletion README.md
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -1,6 +1,6 @@
# cb

This repo contains the SQLite and SQLCipher for SQLitePCL.raw, and the scripts to construct them.
This repo contains SQLite, SQLite3 Multiple Ciphers and SQLCipher for SQLitePCL.raw, and the scripts to construct them.

Previously this stuff was in the SQLitePCL.raw repo.

Expand Down
Loading
Loading