Skip to content
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
5 changes: 4 additions & 1 deletion .cargo/config.toml
Original file line number Diff line number Diff line change
Expand Up @@ -2,4 +2,7 @@
rustflags = ["-Ctarget-feature=+crt-static"]

[target.aarch64-unknown-linux-gnu]
linker = "aarch64-linux-gnu-gcc"
linker = "aarch64-linux-gnu-gcc"

[target.'cfg(target_os="android")']
rustflags = ["-C", "link-args=-Wl,-z,max-page-size=16384"]
107 changes: 38 additions & 69 deletions .github/workflows/ci.yml
Original file line number Diff line number Diff line change
Expand Up @@ -17,7 +17,7 @@ on:

jobs:
setup_config:
runs-on: ubuntu-latest
runs-on: ubuntu-22.04
steps:
- name: Setup config artifact
run: |
Expand Down Expand Up @@ -50,7 +50,7 @@ jobs:

native_build_macos:
needs: [rust_code_format, setup_config]
runs-on: "macos-12"
runs-on: "macos-15"
steps:
- uses: actions/checkout@v4
with:
Expand All @@ -60,7 +60,7 @@ jobs:

native_build_ios:
needs: [rust_code_format, setup_config]
runs-on: "macos-12"
runs-on: "macos-15"
steps:
- uses: actions/checkout@v4
with:
Expand All @@ -70,7 +70,7 @@ jobs:

native_build_windows:
needs: [rust_code_format, setup_config]
runs-on: "windows-latest"
runs-on: "windows-2022"
steps:
- uses: actions/checkout@v4
with:
Expand All @@ -79,41 +79,20 @@ jobs:
- uses: ./.github/workflows/native/native-build-windows

#### NUGET BUILD ####
nugets_linux:
needs: [native_build_linux , csharp_code_format, setup_config]
runs-on: "ubuntu-latest"
steps:
- uses: actions/checkout@v4
with:
lfs: true
- run: git lfs pull
- uses: ./.github/workflows/nugets/nugets-linux

nugets_windows:
needs: [native_build_linux, native_build_macos, native_build_ios, native_build_windows , csharp_code_format, setup_config] # All Natives for dotnet-core
runs-on: "windows-latest"
nugets:
needs: [native_build_linux, native_build_macos, native_build_ios, native_build_windows , setup_config] # All Natives for dotnet-core
runs-on: "windows-2022"
steps:
- uses: actions/checkout@v4
with:
lfs: true
- run: git lfs pull
- uses: ./.github/workflows/nugets/nugets-windows

nugets_macos:
needs: [native_build_macos, native_build_ios, native_build_linux, csharp_code_format, setup_config]
runs-on: "macos-12"
steps:
- uses: actions/checkout@v4
with:
lfs: true
- run: git lfs pull
- uses: ./.github/workflows/nugets/nugets-macos


#### WEB ASSEMBLY BUILD ####
webassembly_build:
needs: rust_code_format
runs-on: "ubuntu-latest"
runs-on: "ubuntu-22.04"
steps:
- uses: actions/checkout@v4
with:
Expand All @@ -124,7 +103,7 @@ jobs:
#### WEB ASSEMBLY TEST ####
webassembly_test:
needs: webassembly_build
runs-on: "macos-12"
runs-on: "macos-15"
steps:
- uses: actions/checkout@v4
with:
Expand All @@ -134,8 +113,8 @@ jobs:

#### TESTS NUGETS ####
tests_nuget_windows:
needs: [nugets_windows, setup_config]
runs-on: "windows-latest"
needs: [nugets, setup_config]
runs-on: "windows-2022"
steps:
- uses: actions/checkout@v4
with:
Expand All @@ -144,8 +123,8 @@ jobs:
- uses: ./.github/workflows/tests/csharp/windows

tests_nuget_macos:
needs: [nugets_macos, nugets_windows, setup_config]
runs-on: "macos-12"
needs: [nugets, setup_config]
runs-on: "macos-15"
steps:
- uses: actions/checkout@v4
with:
Expand All @@ -154,8 +133,8 @@ jobs:
- uses: ./.github/workflows/tests/csharp/macos

tests_nuget_ios:
needs: [nugets_macos, setup_config]
runs-on: "macos-12"
needs: [nugets, setup_config]
runs-on: "macos-15"
steps:
- uses: actions/checkout@v4
with:
Expand All @@ -164,8 +143,8 @@ jobs:
- uses: ./.github/workflows/tests/csharp/ios

tests_nuget_linux:
needs: [nugets_linux, nugets_windows, setup_config]
runs-on: "ubuntu-latest"
needs: [nugets, setup_config]
runs-on: "ubuntu-22.04"
steps:
- uses: actions/checkout@v4
with:
Expand All @@ -175,7 +154,7 @@ jobs:

##### SWIFT TESTS #####
tests_swift:
runs-on: "macos-14"
runs-on: "macos-15"
steps:
- uses: actions/checkout@v4
with:
Expand All @@ -185,44 +164,34 @@ jobs:

##### KOTLIN BUILD #####
build_kotlin:
runs-on: "ubuntu-latest"
runs-on: "ubuntu-22.04"
steps:
- uses: actions/checkout@v4
with:
lfs: true
- run: git lfs pull
- uses: ./.github/workflows/kotlin

#tests_nuget_android:
# needs: [nugets_macos, setup_config]
# runs-on: "macos-14"
# steps:
# - uses: actions/checkout@v4
# with:
# lfs: true
# - run: git lfs pull
# - uses: ./.github/workflows/tests/csharp/android

tests_ios_integration:
needs: [tests_nuget_ios, setup_config]
runs-on: "macos-12"
steps:
- uses: actions/checkout@v4
with:
lfs: true
- run: git lfs pull
- uses: ./.github/workflows/tests/csharp/integration-ios
tests_nuget_android:
needs: [nugets, setup_config]
runs-on: "ubuntu-22.04"
steps:
- uses: actions/checkout@v4
with:
lfs: true
- run: git lfs pull
- uses: ./.github/workflows/tests/csharp/android

#### CODE FORMATTING ####
rust_code_format:
runs-on: "ubuntu-latest"
runs-on: "ubuntu-22.04"
steps:
- uses: actions/checkout@v4
- uses: ./.github/workflows/formatting/rust

csharp_code_format:
needs: setup_config
runs-on: "windows-latest"
runs-on: "windows-2022"
steps:
- uses: actions/checkout@v4
with:
Expand All @@ -232,7 +201,7 @@ jobs:

#### PYTHON BUILD ####
build_python_linux:
runs-on: "ubuntu-latest"
runs-on: "ubuntu-22.04"
steps:
- uses: actions/checkout@v4
with:
Expand All @@ -241,7 +210,7 @@ jobs:
- uses: ./.github/workflows/python/build/linux

build_python_macos:
runs-on: "macos-12"
runs-on: "macos-15"
steps:
- uses: actions/checkout@v4
with:
Expand All @@ -250,7 +219,7 @@ jobs:
- uses: ./.github/workflows/python/build/macos

build_python_windows:
runs-on: "windows-latest"
runs-on: "windows-2022"
steps:
- uses: actions/checkout@v4
with:
Expand All @@ -261,28 +230,28 @@ jobs:
#### PYTHON TEST ####
test_python_linux:
needs: build_python_linux
runs-on: "ubuntu-latest"
runs-on: "ubuntu-22.04"
steps:
- uses: actions/checkout@v4
- uses: ./.github/workflows/tests/python/linux

test_python_macos:
needs: build_python_macos
runs-on: "macos-12"
runs-on: "macos-15"
steps:
- uses: actions/checkout@v4
- uses: ./.github/workflows/tests/python/macos

test_python_windows:
needs: build_python_windows
runs-on: "windows-latest"
runs-on: "windows-2022"
steps:
- uses: actions/checkout@v4
- uses: ./.github/workflows/tests/python/windows

#### PUBLISH SOURCE ####
source_publish:
runs-on: "ubuntu-latest"
runs-on: "ubuntu-22.04"
steps:
- uses: actions/checkout@v4
with:
Expand All @@ -291,7 +260,7 @@ jobs:
- uses: ./.github/workflows/other/source-publish

publish_sbom:
runs-on: "ubuntu-latest"
runs-on: "ubuntu-22.04"
if: ${{ github.event.inputs.generate_release == 'true' }}
steps:
- uses: actions/checkout@v4
Expand Down
30 changes: 4 additions & 26 deletions .github/workflows/formatting/csharp/action.yml
Original file line number Diff line number Diff line change
Expand Up @@ -9,31 +9,9 @@ runs:
name: config.txt
path: ./wrappers/csharp

- uses: actions/setup-python@v5
with:
python-version: "3.7"

- name: Setting up PATH environment variable
- name: Run .NET format
shell: bash
working-directory: ./wrappers/csharp/src/
run: |
echo "c:\Program Files\Microsoft Visual Studio\2022\Enterprise\MSBuild\Current\Bin\Roslyn" >> $GITHUB_PATH

- name: Installing rust targets
shell: pwsh
run: |
rustup target add x86_64-pc-windows-msvc
rustup target add i686-pc-windows-msvc
rustup target add aarch64-pc-windows-msvc

- name: Building Windows
working-directory: ./wrappers/csharp
shell: pwsh
run: python GeneratePackage.py -p windows

- name: Add msbuild to PATH
uses: microsoft/setup-msbuild@v2

- name: Code Analysis
working-directory: ./wrappers/csharp/tests/unit-tests/manual/dotnet-framework
shell: pwsh
run: msbuild dotnet-framework.sln /t:restore,clean,build /p:TreatWarningsAsErrors=True /p:RunCodeAnalysis=true
dotnet tool install -g dotnet-format
dotnet format devolutions-crypto.csproj --verify-no-changes
15 changes: 8 additions & 7 deletions .github/workflows/kotlin/action.yml
Original file line number Diff line number Diff line change
Expand Up @@ -34,27 +34,28 @@ runs:
- name: Configure Android NDK
shell: bash
run: |
# Install NDK 25
# Install NDK 27

ANDROID_ROOT="/usr/local/lib/android"
ANDROID_SDK_ROOT="${ANDROID_ROOT}/sdk"
SDKMANAGER="${ANDROID_SDK_ROOT}/cmdline-tools/latest/bin/sdkmanager"
echo "y" | $SDKMANAGER "ndk;25.2.9519653"
echo "y" | $SDKMANAGER "ndk;27.2.12479018"

export ANDROID_NDK=$ANDROID_SDK_ROOT/ndk-bundle

echo "[target.aarch64-linux-android]
echo "
[target.aarch64-linux-android]
ar = \"$ANDROID_NDK/toolchains/llvm/prebuilt/linux-x86_64/bin/aarch64-linux-android-ar\"
linker = \"$ANDROID_NDK/toolchains/llvm/prebuilt/linux-x86_64/bin/aarch64-linux-android21-clang\"
[target.armv7-linux-androideabi]
ar = \"$ANDROID_NDK/toolchains/llvm/prebuilt/linux-x86_64/bin/arm-linux-androideabi-ar\"
linker = \"$ANDROID_NDK/toolchains/llvm/prebuilt/linux-x86_64/bin/armv7a-linux-androideabi19-clang\"
linker = \"$ANDROID_NDK/toolchains/llvm/prebuilt/linux-x86_64/bin/armv7a-linux-androideabi21-clang\"
[target.i686-linux-android]
ar = \"$ANDROID_NDK/toolchains/llvm/prebuilt/linux-x86_64/bin/i686-linux-android-ar\"
linker = \"$ANDROID_NDK/toolchains/llvm/prebuilt/linux-x86_64/bin/i686-linux-android19-clang\"
linker = \"$ANDROID_NDK/toolchains/llvm/prebuilt/linux-x86_64/bin/i686-linux-android21-clang\"
[target.x86_64-linux-android]
ar = \"$ANDROID_NDK/toolchains/llvm/prebuilt/linux-x86_64/bin/x86_64-linux-android-ar\"
linker = \"$ANDROID_NDK/toolchains/llvm/prebuilt/linux-x86_64/bin/x86_64-linux-android21-clang\"" >> ./.cargo/config
linker = \"$ANDROID_NDK/toolchains/llvm/prebuilt/linux-x86_64/bin/x86_64-linux-android21-clang\"" >> ./.cargo/config.toml

- name: Build
working-directory: ./wrappers/kotlin
Expand All @@ -63,7 +64,7 @@ runs:
export ANDROID_ROOT="/usr/local/lib/android"
export ANDROID_SDK_ROOT="${ANDROID_ROOT}/sdk"
export ANDROID_NDK=$ANDROID_SDK_ROOT/ndk-bundle
ln -sfn $ANDROID_SDK_ROOT/ndk/25.2.9519653 $ANDROID_NDK
ln -sfn $ANDROID_SDK_ROOT/ndk/27.2.12479018 $ANDROID_NDK

make release RELEASE=1

Expand Down
Loading
Loading