From 3725f178a07eb517270d5b9397bf8d3bf7b9648e Mon Sep 17 00:00:00 2001 From: litongjava Date: Fri, 24 Nov 2023 06:07:12 -1000 Subject: [PATCH 1/6] add javafx: true --- .github/workflows/build.yml | 96 +++++++++++++++++++------------------ readme.md | 1 + 2 files changed, 50 insertions(+), 47 deletions(-) diff --git a/.github/workflows/build.yml b/.github/workflows/build.yml index 69004fb..3f34675 100644 --- a/.github/workflows/build.yml +++ b/.github/workflows/build.yml @@ -1,47 +1,49 @@ -#name: Java CI with Maven and Java FX -# -#on: -# push: -# branches: [ "master" ] -# pull_request: -# branches: [ "master" ] -# -#jobs: -# build_windows: -# runs-on: windows-latest -# -# steps: -# - uses: actions/checkout@v3 -# - name: Set up JDK 8 -# uses: actions/setup-java@v3 -# with: -# java-version: '8' -# distribution: 'oracle' -# cache: maven -# -# - name: Download and Extract Models -# run: | -# Invoke-WebRequest -Uri "https://github.com/litongjava/tools-ocr/releases/download/model-ppocr-v4/ch_PP-OCRv4_det_infer-onnx.zip" -OutFile "model_det.zip" -# Invoke-WebRequest -Uri "https://github.com/litongjava/tools-ocr/releases/download/model-ppocr-v4/ch_PP-OCRv4_rec_infer-onnx.zip" -OutFile "model_rec.zip" -# mkdir models\ch_PP-OCRv4_det_infer -# mkdir models\ch_PP-OCRv4_rec_infer -# Expand-Archive "model_det.zip" -DestinationPath "models\ch_PP-OCRv4_det_infer" -# Expand-Archive "model_rec.zip" -DestinationPath "models\ch_PP-OCRv4_rec_infer" -# -# - name: Copy Models -# run: | -# mkdir target\jfx\app -# xcopy models target\jfx\app /E /I -# -# -# - name: Build with Maven -# run: mvn jfx:native -DskipTests -# -# - name : Show Native Files -# run : dir target\jfx\native -# - -# - name: Upload package -# uses: actions/upload-artifact@v3 -# with: -# name: treehole-windows-2.2.8.msi -# path: target\jfx\native\treehole-2.2.8.msi \ No newline at end of file +name: Java CI with Maven and Java FX + +on: + push: + branches: [ "master" ] + pull_request: + branches: [ "master" ] + +jobs: + build_windows: + runs-on: windows-latest + + steps: + - uses: actions/checkout@v3 + + - name: Set up JDK 8 + uses: actions/setup-java@v3 + with: + java-version: '1.8' + distribution: 'zulu' + javafx: true + cache: maven + + - name: Download and Extract Models + run: | + Invoke-WebRequest -Uri "https://github.com/litongjava/tools-ocr/releases/download/model-ppocr-v4/ch_PP-OCRv4_det_infer-onnx.zip" -OutFile "model_det.zip" + Invoke-WebRequest -Uri "https://github.com/litongjava/tools-ocr/releases/download/model-ppocr-v4/ch_PP-OCRv4_rec_infer-onnx.zip" -OutFile "model_rec.zip" + mkdir models\ch_PP-OCRv4_det_infer + mkdir models\ch_PP-OCRv4_rec_infer + Expand-Archive "model_det.zip" -DestinationPath "models\ch_PP-OCRv4_det_infer" + Expand-Archive "model_rec.zip" -DestinationPath "models\ch_PP-OCRv4_rec_infer" + + - name: Copy Models + run: | + mkdir target\jfx\app + xcopy models target\jfx\app /E /I + + + - name: Build with Maven + run: mvn jfx:native -DskipTests + + - name : Show Native Files + run : dir target\jfx\native + - + - name: Upload package + uses: actions/upload-artifact@v3 + with: + name: target-jfx-windows-x64 + path: target\jfx\ \ No newline at end of file diff --git a/readme.md b/readme.md index fe3baf7..cce79dd 100644 --- a/readme.md +++ b/readme.md @@ -2,6 +2,7 @@ 一款跨平台的 OCR 小工具,调用本地OCR进行识别,无需联网即可使用 用到的技术和框架 - jdk 1.8 +- javafx - djl - pytorch - onnx From c05dca60200e4d5ac190868bc47f360400695850 Mon Sep 17 00:00:00 2001 From: litongjava Date: Fri, 24 Nov 2023 06:11:02 -1000 Subject: [PATCH 2/6] change to 8.0.292 --- .github/workflows/build.yml | 3 +-- 1 file changed, 1 insertion(+), 2 deletions(-) diff --git a/.github/workflows/build.yml b/.github/workflows/build.yml index 3f34675..452d2c1 100644 --- a/.github/workflows/build.yml +++ b/.github/workflows/build.yml @@ -16,9 +16,8 @@ jobs: - name: Set up JDK 8 uses: actions/setup-java@v3 with: - java-version: '1.8' + java-version: '8.0.292' distribution: 'zulu' - javafx: true cache: maven - name: Download and Extract Models From 31128ec57ff7f457ef66b2f893c4d9514f7c8846 Mon Sep 17 00:00:00 2001 From: litongjava Date: Fri, 24 Nov 2023 07:07:21 -1000 Subject: [PATCH 3/6] change to docker:litongjava/centos-7-maven:3.8.8 --- .github/workflows/build.yml | 44 +++++++++++++++++-------------------- 1 file changed, 20 insertions(+), 24 deletions(-) diff --git a/.github/workflows/build.yml b/.github/workflows/build.yml index 452d2c1..5e1f892 100644 --- a/.github/workflows/build.yml +++ b/.github/workflows/build.yml @@ -1,4 +1,4 @@ -name: Java CI with Maven and Java FX +name: Docker JavaFX on: push: @@ -8,41 +8,37 @@ on: jobs: build_windows: - runs-on: windows-latest + runs-on: ubuntu-latest steps: - uses: actions/checkout@v3 - - name: Set up JDK 8 - uses: actions/setup-java@v3 - with: - java-version: '8.0.292' - distribution: 'zulu' - cache: maven - - name: Download and Extract Models run: | - Invoke-WebRequest -Uri "https://github.com/litongjava/tools-ocr/releases/download/model-ppocr-v4/ch_PP-OCRv4_det_infer-onnx.zip" -OutFile "model_det.zip" - Invoke-WebRequest -Uri "https://github.com/litongjava/tools-ocr/releases/download/model-ppocr-v4/ch_PP-OCRv4_rec_infer-onnx.zip" -OutFile "model_rec.zip" - mkdir models\ch_PP-OCRv4_det_infer - mkdir models\ch_PP-OCRv4_rec_infer - Expand-Archive "model_det.zip" -DestinationPath "models\ch_PP-OCRv4_det_infer" - Expand-Archive "model_rec.zip" -DestinationPath "models\ch_PP-OCRv4_rec_infer" + wget https://github.com/litongjava/tools-ocr/releases/download/model-ppocr-v4/ch_PP-OCRv4_det_infer-onnx.zip + wget https://github.com/litongjava/tools-ocr/releases/download/model-ppocr-v4/ch_PP-OCRv4_rec_infer-onnx.zip + mkdir -p models/ch_PP-OCRv4_det_infer + mkdir -p models/ch_PP-OCRv4_rec_infer + unzip ch_PP-OCRv4_det_infer-onnx.zip -d models/ch_PP-OCRv4_det_infer + unzip ch_PP-OCRv4_rec_infer-onnx.zip -d models/ch_PP-OCRv4_rec_infer - name: Copy Models run: | - mkdir target\jfx\app - xcopy models target\jfx\app /E /I + mkdir -p target/jfx/app + cp -r models/* target/jfx/app/ + - name: Build with Docker + run: docker run --rm \ + -v $(pwd):/workspace \ + -w /workspace \ + litongjava/centos-7-maven:3.8.8 \ + mvn jfx:native -DskipTests - - name: Build with Maven - run: mvn jfx:native -DskipTests + - name: Show Native Files + run: ls target/jfx/native - - name : Show Native Files - run : dir target\jfx\native - - - name: Upload package uses: actions/upload-artifact@v3 with: - name: target-jfx-windows-x64 - path: target\jfx\ \ No newline at end of file + name: target-jfx-native-linux-x64 + path: target/jfx/native \ No newline at end of file From 1da6f625fc2d803b4e61836a2d9d9597b6ea834f Mon Sep 17 00:00:00 2001 From: litongjava Date: Fri, 24 Nov 2023 07:11:51 -1000 Subject: [PATCH 4/6] change to github.workspace --- .github/workflows/build.yml | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/.github/workflows/build.yml b/.github/workflows/build.yml index 5e1f892..fd41aa0 100644 --- a/.github/workflows/build.yml +++ b/.github/workflows/build.yml @@ -29,7 +29,7 @@ jobs: - name: Build with Docker run: docker run --rm \ - -v $(pwd):/workspace \ + -v ${{ github.workspace }}:/workspace \ -w /workspace \ litongjava/centos-7-maven:3.8.8 \ mvn jfx:native -DskipTests From a102d8bddb82f0b570abec19b4f442426b5d145a Mon Sep 17 00:00:00 2001 From: litongjava Date: Fri, 24 Nov 2023 07:13:14 -1000 Subject: [PATCH 5/6] change to run | --- .github/workflows/build.yml | 11 ++++++----- 1 file changed, 6 insertions(+), 5 deletions(-) diff --git a/.github/workflows/build.yml b/.github/workflows/build.yml index fd41aa0..c360dfa 100644 --- a/.github/workflows/build.yml +++ b/.github/workflows/build.yml @@ -28,11 +28,12 @@ jobs: cp -r models/* target/jfx/app/ - name: Build with Docker - run: docker run --rm \ - -v ${{ github.workspace }}:/workspace \ - -w /workspace \ - litongjava/centos-7-maven:3.8.8 \ - mvn jfx:native -DskipTests + run: | + docker run --rm \ + -v ${{ github.workspace }}:/workspace \ + -w /workspace \ + litongjava/centos-7-maven:3.8.8 \ + mvn jfx:native -DskipTests - name: Show Native Files run: ls target/jfx/native From ee0b2c0bcc55be1dd20481e8f65913d4a0b2ba98 Mon Sep 17 00:00:00 2001 From: litongjava Date: Fri, 24 Nov 2023 07:19:38 -1000 Subject: [PATCH 6/6] test success with github action --- .github/workflows/build.yml | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/.github/workflows/build.yml b/.github/workflows/build.yml index c360dfa..d4ba96a 100644 --- a/.github/workflows/build.yml +++ b/.github/workflows/build.yml @@ -25,7 +25,7 @@ jobs: - name: Copy Models run: | mkdir -p target/jfx/app - cp -r models/* target/jfx/app/ + cp -r models target/jfx/app/ - name: Build with Docker run: | @@ -42,4 +42,4 @@ jobs: uses: actions/upload-artifact@v3 with: name: target-jfx-native-linux-x64 - path: target/jfx/native \ No newline at end of file + path: target/jfx/native/ \ No newline at end of file