Skip to content

Commit

Permalink
Bump version to 1.0.2 (#5)
Browse files Browse the repository at this point in the history
  • Loading branch information
maroontress-tomohisa authored Aug 31, 2023
1 parent 98e8a1d commit 9b494d8
Show file tree
Hide file tree
Showing 3 changed files with 36 additions and 24 deletions.
26 changes: 18 additions & 8 deletions .github/workflows/ios.yml
Original file line number Diff line number Diff line change
Expand Up @@ -22,6 +22,8 @@ jobs:
- abi: x86_64
sdk: iphoneos
steps:
- name: get-cmake
uses: lukka/[email protected]
- uses: actions/checkout@v3
with:
submodules: true
Expand All @@ -40,12 +42,28 @@ jobs:
timeout-minutes: 30
needs: build_non_fat
steps:
- name: get-cmake
uses: lukka/[email protected]
- uses: actions/checkout@v3
with:
submodules: true
lfs: true
- name: Download artifacts
uses: actions/download-artifact@v3
- name: Run simulator
run: |
runtime=$(xcrun simctl list runtimes iOS -j | jq '.runtimes[].identifier' | tail -1)
udid=$(xcrun simctl list devices iPhone available -j | jq '.devices['$runtime']|.[].udid' | tail -1)
xcrun simctl bootstatus $(eval echo $udid) -b
- name: Test
run: |
ctest --test-dir build/iphonesimulator-x86_64 -C Release
- name: Archive artifacts (testsuite)
if: ${{failure()}}
uses: actions/upload-artifact@v3
with:
name: testsuite
path: ${{github.workspace}}/build/iphonesimulator-x86_64/
- name: Install fat files and XCFrameworks
run: |
sh ios.sh build install "$HOME/ios"
Expand All @@ -55,14 +73,6 @@ jobs:
name: xcframework
path: ~/ios
if-no-files-found: error
- name: Run simulator
run: |
runtime=$(xcrun simctl list runtimes iOS -j | jq '.runtimes[].identifier' | tail -1)
udid=$(xcrun simctl list devices iPhone available -j | jq '.devices['$runtime']|.[].udid' | tail -1)
xcrun simctl bootstatus $(eval echo $udid) -b
- name: Test
run: |
ctest --test-dir build/iphonesimulator-x86_64 -C Release
build-simply:
runs-on: macos-latest
timeout-minutes: 30
Expand Down
2 changes: 1 addition & 1 deletion CMakeLists.txt
Original file line number Diff line number Diff line change
@@ -1,6 +1,6 @@
cmake_minimum_required(VERSION 3.27)

project("mimicssl-md5" VERSION 1.0.0)
project("mimicssl-md5" VERSION 1.0.2)

cmake_policy(SET CMP0142 NEW)

Expand Down
32 changes: 17 additions & 15 deletions README.md
Original file line number Diff line number Diff line change
Expand Up @@ -64,13 +64,14 @@ but a typical configuration would be as follows:

Then build as follows:

```plaintext
```sh
abi=ABI
sh android.sh BUILD_DIR configure $abi -G Ninja \
build_dir=BUILD_DIR
sh android.sh $build_dir configure $abi -G Ninja \
-DCMAKE_MAKE_PROGRAM="/path/to/ninja" \
-DCMAKE_INSTALL_PREFIX:PATH="/path/to/dir"
cmake --build BUILD_DIR/$abi --config Release -v
cmake --install BUILD_DIR/$abi
cmake --build $build_dir/$abi --config Release -v
cmake --install $build_dir/$abi
```

`ABI` should be replaced by `arm64-v8a`, `armeabi-v7a`, `x86`, or `x86_64`.
Expand All @@ -79,39 +80,40 @@ Note that `ninja` is required on Windows.

Before running `testsuite`, start Android Emulator as follows:

```
```sh
$ANDROID_HOME/emulator/emulator -avd AVD_NAME -no-snapshot
```

`AVD_NAME` should be replaced by the AVD name. Note that You can get the list of
AVD names as follows:

```
```sh
$ANDROID_HOME/emulator/emulator -list-avds
```

Then run `testusite` as follows:

```
sh android.sh BUILD_DIR test $abi
```sh
sh android.sh $build_dir test $abi
```

## Build for iOS

Build as follows:
Build on macOS as follows:

```plaintext
sh ios.sh BUILD_DIR configure
sh ios.sh BUILD_DIR build
sh ios.sh BUILD_DIR install /path/to/dir
```sh
build_dir=BUILD_DIR
sh ios.sh $build_dir configure
sh ios.sh $build_dir build
sh ios.sh $build_dir install /path/to/dir
```

`BUILD_DIR` should be replaced by the build directory (e.g., `build-ios`).

You can run `testsuite` with the iPhone simulator as follows:

```plaintext
sh ios.sh BUILD_DIR test ARCH
```sh
sh ios.sh $build_dir test ARCH
```

`ARCH` should be replaced by `arm64` or `x86_64`. Note that `jq` is required to
Expand Down

0 comments on commit 9b494d8

Please sign in to comment.