Thanks to visit codestin.com
Credit goes to github.com

Skip to content

fix:sm3pbkdf2 test error,update README.md,remove unnecessary files. #22

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.

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

Merged
merged 42 commits into from
Apr 29, 2024
Merged
Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
42 commits
Select commit Hold shift + click to select a range
c00f669
fix:sm3pbkdf2 test error,update README.md,remove unnecessary files.
Apr 26, 2024
a4fc87e
Create Maven-CI-release-Windows.yml
yxk123 Apr 26, 2024
60ede8f
Update Maven-CI-release-Windows.yml
yxk123 Apr 26, 2024
f3f9372
Update Maven-CI-release-Windows.yml
yxk123 Apr 26, 2024
e5081f4
Update Maven-CI-release-Windows.yml
yxk123 Apr 26, 2024
64610ea
Update Maven-CI-release-Windows.yml
yxk123 Apr 26, 2024
e8e7647
Update and rename Maven-CI-release-Windows.yml to maven-ci-release-wi…
yxk123 Apr 26, 2024
2c6818f
Update maven-ci-release-windows.yml
yxk123 Apr 26, 2024
ae50080
Update maven-ci-release-windows.yml
yxk123 Apr 26, 2024
0eb888a
Update maven-ci-release-windows.yml
yxk123 Apr 26, 2024
9a296d9
Update maven-ci-release-windows.yml
yxk123 Apr 26, 2024
81bdbbb
Update maven-ci-release-windows.yml
yxk123 Apr 26, 2024
d6ba27a
Update maven-ci-release-windows.yml
yxk123 Apr 28, 2024
f7ce070
Update maven-ci-release-windows.yml
yxk123 Apr 28, 2024
25b4964
Update maven-ci-release-windows.yml
yxk123 Apr 28, 2024
7d94d97
Update maven-ci-release-windows.yml
yxk123 Apr 28, 2024
c9bfe6f
Update maven-ci-release-windows.yml
yxk123 Apr 28, 2024
d012137
Update maven-ci-release-windows.yml
yxk123 Apr 28, 2024
0a2fb71
Update maven-ci-release-windows.yml
yxk123 Apr 28, 2024
7de826b
Update maven-ci-release-windows.yml
yxk123 Apr 29, 2024
7683122
Update maven-ci-release-windows.yml
yxk123 Apr 29, 2024
1388338
Update maven-ci-release-windows.yml
yxk123 Apr 29, 2024
fdd721c
Update maven-ci-release-windows.yml
yxk123 Apr 29, 2024
9eba88a
Create maven-ci-release-ubuntu.yml
yxk123 Apr 29, 2024
781c46a
Update maven-ci-release-ubuntu.yml
yxk123 Apr 29, 2024
c52c2ab
Create maven-ci-release-macos.yml
yxk123 Apr 29, 2024
927352c
Update maven-ci-release-ubuntu.yml
yxk123 Apr 29, 2024
d7f02f3
Update maven-ci-release-macos.yml
yxk123 Apr 29, 2024
a8f7e48
Update maven-ci-release-macos.yml
yxk123 Apr 29, 2024
bb25221
Update maven-ci-release-macos.yml
yxk123 Apr 29, 2024
505f087
Update maven-ci-release-macos.yml
yxk123 Apr 29, 2024
e3fc866
Update maven-ci-release-macos.yml
yxk123 Apr 29, 2024
2f6c113
Update maven-ci-release-macos.yml
yxk123 Apr 29, 2024
0bc7a8e
Update maven-ci-release-macos.yml
yxk123 Apr 29, 2024
a634ae6
Update maven-ci-windows.yml
yxk123 Apr 29, 2024
cbb3a2a
Update maven-ci-release-windows.yml
yxk123 Apr 29, 2024
670ee4f
Update maven-ci-release-ubuntu.yml
yxk123 Apr 29, 2024
d06b785
Update maven-ci-release-macos.yml
yxk123 Apr 29, 2024
059d84c
Update maven-ci-macos.yml
yxk123 Apr 29, 2024
efbcc80
Update maven-ci-macos.yml
yxk123 Apr 29, 2024
27753a5
Update maven-ci-ubuntu.yml
yxk123 Apr 29, 2024
5a4e20d
Update maven-ci-windows.yml
yxk123 Apr 29, 2024
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
7 changes: 5 additions & 2 deletions .github/workflows/maven-ci-macos.yml
Original file line number Diff line number Diff line change
Expand Up @@ -13,7 +13,7 @@ on:
pull_request:
branches: [ "main" ]
env:
BUILD_TYPE: Release
BUILD_TYPE: Debug

jobs:
build:
Expand All @@ -35,9 +35,12 @@ jobs:
cd GmSSL
mkdir build
cd build
cmake ..
cmake .. -DCMAKE_OSX_ARCHITECTURES=x86_64
make
sudo make install

- name: Set DYLD_LIBRARY_PATH
run: echo "DYLD_LIBRARY_PATH=/usr/local/lib:$DYLD_LIBRARY_PATH" >> $GITHUB_ENV

- name: Build with Maven
run: sudo mvn -B -X package --file pom.xml
51 changes: 51 additions & 0 deletions .github/workflows/maven-ci-release-macos.yml
Original file line number Diff line number Diff line change
@@ -0,0 +1,51 @@
name: maven-ci-release-macos

on:
push:
branches: [ "main" ]
pull_request:
branches: [ "main" ]
env:
BUILD_TYPE: Release

jobs:
build:
runs-on: macos-latest

steps:
- uses: actions/checkout@v3

- name: Set up JDK 18
uses: actions/setup-java@v2
with:
java-version: '18'
distribution: 'temurin'
cache: maven

- name: Download GmSSL release
run: curl -L "https://github.com/guanzhi/GmSSL/archive/refs/tags/v3.1.1.zip" -o "GmSSL.zip"

- name: Extract GmSSL
run: unzip GmSSL.zip

- name: Build GmSSL
run: |
cd GmSSL-3.1.1
mkdir build
cd build
cmake .. -DCMAKE_OSX_ARCHITECTURES=x86_64
make
sudo make install
- name: Set DYLD_LIBRARY_PATH
run: echo "DYLD_LIBRARY_PATH=/usr/local/lib:$DYLD_LIBRARY_PATH" >> $GITHUB_ENV

- name: Verify Installation and Environment
run: gmssl version

- name: Build with Maven
run: mvn clean install

- name: Clean up
if: always()
run: rm GmSSL.zip
52 changes: 52 additions & 0 deletions .github/workflows/maven-ci-release-ubuntu.yml
Original file line number Diff line number Diff line change
@@ -0,0 +1,52 @@
name: maven-ci-release-ubuntu

on:
push:
branches: [ "main" ]
pull_request:
branches: [ "main" ]
env:
BUILD_TYPE: Release

jobs:
build:
runs-on: ubuntu-latest

steps:
- uses: actions/checkout@v3

- name: Set up JDK 18
uses: actions/setup-java@v2
with:
java-version: '18'
distribution: 'temurin'
cache: maven

- name: Install dependencies
run: sudo apt-get update && sudo apt-get install -y cmake build-essential

- name: Download GmSSL release
run: wget "https://github.com/guanzhi/GmSSL/archive/refs/tags/v3.1.1.zip" -O "GmSSL.zip"

- name: Extract GmSSL
run: unzip GmSSL.zip

- name: Build GmSSL
run: |
cd GmSSL-3.1.1
mkdir build
cd build
cmake ..
make
sudo make install
sudo ldconfig

- name: Verify Installation and Environment
run: gmssl version

- name: Build with Maven
run: mvn clean install

- name: Clean up
if: always()
run: rm GmSSL.zip
71 changes: 71 additions & 0 deletions .github/workflows/maven-ci-release-windows.yml
Original file line number Diff line number Diff line change
@@ -0,0 +1,71 @@
# This workflow will build a Java project with Maven, and cache/restore any dependencies to improve the workflow execution time
# For more information see: https://docs.github.com/en/actions/automating-builds-and-tests/building-and-testing-java-with-maven

# This workflow uses actions that are not certified by GitHub.
# They are provided by a third-party and are governed by
# separate terms of service, privacy policy, and support
# documentation.

name: maven-ci-release-windows

on:
push:
branches: [ "main" ]
pull_request:
branches: [ "main" ]
env:
BUILD_TYPE: Release

jobs:
build:
runs-on: windows-latest

steps:
- uses: actions/checkout@v3

- name: Configure build for x86
uses: ilammy/msvc-dev-cmd@v1
with:
arch: amd64

- name: Set up JDK 18
uses: actions/setup-java@v2
with:
java-version: '18'
distribution: 'temurin'
cache: maven

- name: Set up environment variable in windows
uses: myci-actions/append-to-path-windows@2
with:
path: C:\Program Files\GmSSL\bin
env-var: PATH

- name: Download GmSSL release
run: |
Invoke-WebRequest -Uri "https://github.com/guanzhi/GmSSL/archive/refs/tags/v3.1.1.zip" -OutFile "GmSSL.zip"

- name: Extract GmSSL
run: |
Expand-Archive -Path "GmSSL.zip" -DestinationPath "."

- name: Build GmSSL
run: |
cd GmSSL-3.1.1;
mkdir build;
cd build;
cmake .. -G "NMake Makefiles" -DWIN32=ON;
nmake ;
nmake install;

- name: Verify Installation and Environment
run: |
gmssl version

- name: Build with Maven
run: mvn clean install

- name: Clean up
if: always()
run: |
Remove-Item GmSSL.zip
2 changes: 1 addition & 1 deletion .github/workflows/maven-ci-ubuntu.yml
Original file line number Diff line number Diff line change
Expand Up @@ -14,7 +14,7 @@ on:
branches: [ "main" ]
env:
# Customize the CMake build type here (Release, Debug, RelWithDebInfo, etc.)
BUILD_TYPE: Release
BUILD_TYPE: Debug

jobs:
build:
Expand Down
11 changes: 8 additions & 3 deletions .github/workflows/maven-ci-windows.yml
Original file line number Diff line number Diff line change
Expand Up @@ -14,7 +14,7 @@ on:
pull_request:
branches: [ "main" ]
env:
BUILD_TYPE: Release
BUILD_TYPE: Debug

jobs:
build:
Expand All @@ -26,7 +26,7 @@ jobs:
- name: Configure build for x86
uses: ilammy/msvc-dev-cmd@v1
with:
arch: amd64_x86
arch: amd64

- name: Set up JDK 18
uses: actions/setup-java@v2
Expand All @@ -35,7 +35,12 @@ jobs:
distribution: 'temurin'
cache: maven


- name: Set up environment variable in windows
uses: myci-actions/append-to-path-windows@2
with:
path: C:\Program Files\GmSSL\bin
env-var: PATH

- name: Build GmSSL
run : |
git clone https://github.com/guanzhi/GmSSL.git;
Expand Down
53 changes: 0 additions & 53 deletions CMakeLists.txt

This file was deleted.

Loading