diff --git a/.github/workflows/R-CMD-check.yaml b/.github/workflows/R-CMD-check.yaml index c1d13bf..e817e8a 100644 --- a/.github/workflows/R-CMD-check.yaml +++ b/.github/workflows/R-CMD-check.yaml @@ -23,7 +23,8 @@ jobs: - {os: windows-latest, r: 'devel'} - {os: ubuntu-latest, r: 'devel', http-user-agent: 'release'} - {os: ubuntu-latest, r: 'release'} - - {os: ubuntu-20.04, r: 'release'} + - {os: ubuntu-20.04, r: 'release', tesseract_version: '4'} + - {os: ubuntu-20.04, r: 'release', tesseract_version: '5'} env: GITHUB_PAT: ${{ secrets.GITHUB_TOKEN }} @@ -40,6 +41,13 @@ jobs: http-user-agent: ${{ matrix.config.http-user-agent }} use-public-rspm: true + - name: Install Tesseract 5 + if: matrix.config.os == 'ubuntu-20.04' && matrix.config.tesseract_version == '5' + run: | + sudo add-apt-repository -y ppa:alex-p/tesseract-ocr5 + sudo apt-get update + sudo apt-get install -y libtesseract-dev tesseract-ocr tesseract-ocr-eng + - uses: r-lib/actions/setup-r-dependencies@v2 with: extra-packages: rcmdcheck diff --git a/.github/workflows/tesseract-5-ubuntu-20.yaml b/.github/workflows/tesseract-5-ubuntu-20.yaml deleted file mode 100644 index 86be2ff..0000000 --- a/.github/workflows/tesseract-5-ubuntu-20.yaml +++ /dev/null @@ -1,49 +0,0 @@ -# Workflow derived from https://github.com/r-lib/actions/tree/master/examples -# Need help debugging build failures? Start at https://github.com/r-lib/actions#where-to-find-help -on: - push: - pull_request: - -name: tesseract-5-ubuntu-20 - -jobs: - R-CMD-check: - runs-on: ${{ matrix.config.os }} - - name: ${{ matrix.config.os }} (${{ matrix.config.r }}) - - strategy: - fail-fast: false - matrix: - config: - - {os: ubuntu-20.04, r: 'release'} - - env: - GITHUB_PAT: ${{ secrets.GITHUB_TOKEN }} - R_KEEP_PKG_SOURCE: yes - - steps: - - uses: actions/checkout@v4 - - - uses: r-lib/actions/setup-pandoc@v2 - - - uses: r-lib/actions/setup-r@v2 - with: - r-version: ${{ matrix.config.r }} - http-user-agent: ${{ matrix.config.http-user-agent }} - use-public-rspm: true - - - name: Install Tesseract 5 - if: runner.os == 'Linux' - run: | - sudo add-apt-repository -y ppa:alex-p/tesseract-ocr5 - sudo apt-get update - sudo apt-get install -y libtesseract-dev tesseract-ocr tesseract-ocr-eng - - - uses: r-lib/actions/setup-r-dependencies@v2 - with: - extra-packages: rcmdcheck - - - uses: r-lib/actions/check-r-package@v2 - with: - args: 'c("--no-manual", "--as-cran", "--run-donttest")'