diff --git a/.github/workflows/release.yml b/.github/workflows/release.yml index 4db6798..a1991eb 100644 --- a/.github/workflows/release.yml +++ b/.github/workflows/release.yml @@ -138,7 +138,7 @@ jobs: env: cache-name: cache-pdftotext-windows with: - path: xpdf-tools-win-4.03.zip + path: xpdf-tools-win-4.04.zip key: ${{ runner.os }}-build-${{ env.cache-name }} restore-keys: | ${{ runner.os }}-build-${{ env.cache-name }} @@ -147,27 +147,27 @@ jobs: - name: Download pdftotext if: ${{ matrix.os == 'windows' }} run: | - if(!(Test-Path -Path "xpdf-tools-win-4.03.zip")) { - Invoke-WebRequest -Uri "https://dl.xpdfreader.com/xpdf-tools-win-4.03.zip" -OutFile "xpdf-tools-win-4.03.zip" + if(!(Test-Path -Path "xpdf-tools-win-4.04.zip")) { + Invoke-WebRequest -Uri "https://dl.xpdfreader.com/xpdf-tools-win-4.04.zip" -OutFile "xpdf-tools-win-4.04.zip" } - Expand-Archive -Path xpdf-tools-win-4.03.zip + Expand-Archive -Path xpdf-tools-win-4.04.zip - name: Copy pdftotext if: ${{ matrix.os == 'windows' && matrix.arch == 'x64' }} run: | New-Item -path "lib\pdftotext\win" -type directory - Copy-Item "xpdf-tools-win-4.03\xpdf-tools-win-4.03\bin64\pdftotext.exe" -Destination "lib\pdftotext\win\pdftotext64.exe" + Copy-Item "xpdf-tools-win-4.04\xpdf-tools-win-4.04\bin64\pdftotext.exe" -Destination "lib\pdftotext\win\pdftotext64.exe" - name: Copy pdftotext if: ${{ matrix.os == 'windows' && matrix.arch == 'x86' }} run: | New-Item -path "lib\pdftotext\win" -type directory - Copy-Item "xpdf-tools-win-4.03\xpdf-tools-win-4.03\bin32\pdftotext.exe" -Destination "lib\pdftotext\win\pdftotext32.exe" + Copy-Item "xpdf-tools-win-4.04\xpdf-tools-win-4.04\bin32\pdftotext.exe" -Destination "lib\pdftotext\win\pdftotext32.exe" - name: Cache pdftotext uses: actions/cache@v2 if: ${{ matrix.os == 'linux' }} env: cache-name: cache-pdftotext-linux with: - path: xpdf-tools-linux-4.03.tar.gz + path: xpdf-tools-linux-4.04.tar.gz key: ${{ matrix.os }}-build-${{ env.cache-name }} restore-keys: | ${{ matrix.os }}-build-${{ env.cache-name }} @@ -176,20 +176,20 @@ jobs: - name: Download pdftotext linux if: ${{ matrix.os == 'linux' }} run: | - if [ ! -f xpdf-tools-linux-4.03.tar.gz ]; then - curl https://dl.xpdfreader.com/xpdf-tools-linux-4.03.tar.gz -o xpdf-tools-linux-4.03.tar.gz + if [ ! -f xpdf-tools-linux-4.04.tar.gz ]; then + curl https://dl.xpdfreader.com/xpdf-tools-linux-4.04.tar.gz -o xpdf-tools-linux-4.04.tar.gz fi - tar -xvzf xpdf-tools-linux-4.03.tar.gz + tar -xvzf xpdf-tools-linux-4.04.tar.gz - name: Copy pdftotext if: ${{ matrix.os == 'linux' && matrix.arch == 'x64' }} run: | mkdir "lib/pdftotext/linux" --parents - cp xpdf-tools-linux-4.03/bin64/pdftotext lib/pdftotext/linux/pdftotext64 + cp xpdf-tools-linux-4.04/bin64/pdftotext lib/pdftotext/linux/pdftotext64 - name: Copy pdftotext if: ${{ matrix.os == 'linux' && matrix.arch == 'x86' }} run: | mkdir "lib/pdftotext/linux" --parents - cp xpdf-tools-linux-4.03/bin32/pdftotext lib/pdftotext/linux/pdftotext32 + cp xpdf-tools-linux-4.04/bin32/pdftotext lib/pdftotext/linux/pdftotext32 - uses: ./.github/actions/nexe-compile name: Compile ${{ matrix.type }} for ${{ matrix.os }} ${{ matrix.arch }} with: @@ -276,7 +276,7 @@ jobs: env: cache-name: cache-pdftotext-windows with: - path: xpdf-tools-win-4.03.zip + path: xpdf-tools-win-4.04.zip key: ${{ runner.os }}-build-${{ env.cache-name }} restore-keys: | ${{ runner.os }}-build-${{ env.cache-name }} @@ -284,20 +284,20 @@ jobs: ${{ runner.os }}- - name: Download pdftotext run: | - if(!(Test-Path -Path "xpdf-tools-win-4.03.zip")) { - Invoke-WebRequest -Uri "https://dl.xpdfreader.com/xpdf-tools-win-4.03.zip" -OutFile "xpdf-tools-win-4.03.zip" + if(!(Test-Path -Path "xpdf-tools-win-4.04.zip")) { + Invoke-WebRequest -Uri "https://dl.xpdfreader.com/xpdf-tools-win-4.04.zip" -OutFile "xpdf-tools-win-4.04.zip" } - Expand-Archive -Path .\xpdf-tools-win-4.03.zip + Expand-Archive -Path .\xpdf-tools-win-4.04.zip - name: Copy pdftotext if: ${{ matrix.arch == 'x64' }} run: | New-Item -path "lib\pdftotext\win" -type directory - Copy-Item "xpdf-tools-win-4.03\xpdf-tools-win-4.03\bin64\pdftotext.exe" -Destination "lib\pdftotext\win\pdftotext64.exe" + Copy-Item "xpdf-tools-win-4.04\xpdf-tools-win-4.04\bin64\pdftotext.exe" -Destination "lib\pdftotext\win\pdftotext64.exe" - name: Copy pdftotext if: ${{ matrix.arch == 'x86' }} run: | New-Item -path "lib\pdftotext\win" -type directory - Copy-Item "xpdf-tools-win-4.03\xpdf-tools-win-4.03\bin32\pdftotext.exe" -Destination "lib\pdftotext\win\pdftotext32.exe" + Copy-Item "xpdf-tools-win-4.04\xpdf-tools-win-4.04\bin32\pdftotext.exe" -Destination "lib\pdftotext\win\pdftotext32.exe" - name: Write key file run: | $bytes = [Convert]::FromBase64String("${{ secrets.PFX_CERTIFICATE }}") @@ -379,7 +379,7 @@ jobs: runs-on: ubuntu-latest name: Publish to hecht.space if: ${{ contains(github.ref, 'main') }} - needs: ["publish","buildLinuxInstaller", "buildWinInstaller"] + needs: ['publish', 'buildLinuxInstaller', 'buildWinInstaller'] steps: - name: Checkout uses: actions/checkout@v2 diff --git a/.github/workflows/review.yml b/.github/workflows/review.yml index 427d556..48936cb 100644 --- a/.github/workflows/review.yml +++ b/.github/workflows/review.yml @@ -130,7 +130,7 @@ jobs: env: cache-name: cache-pdftotext-windows with: - path: xpdf-tools-win-4.03.zip + path: xpdf-tools-win-4.04.zip key: ${{ runner.os }}-build-${{ env.cache-name }} restore-keys: | ${{ runner.os }}-build-${{ env.cache-name }} @@ -139,27 +139,27 @@ jobs: - name: Download pdftotext if: ${{ matrix.os == 'windows' }} run: | - if(!(Test-Path -Path "xpdf-tools-win-4.03.zip")) { - Invoke-WebRequest -Uri "https://dl.xpdfreader.com/xpdf-tools-win-4.03.zip" -OutFile "xpdf-tools-win-4.03.zip" + if(!(Test-Path -Path "xpdf-tools-win-4.04.zip")) { + Invoke-WebRequest -Uri "https://dl.xpdfreader.com/xpdf-tools-win-4.04.zip" -OutFile "xpdf-tools-win-4.04.zip" } - Expand-Archive -Path xpdf-tools-win-4.03.zip + Expand-Archive -Path xpdf-tools-win-4.04.zip - name: Copy pdftotext if: ${{ matrix.os == 'windows' && matrix.arch == 'x64' }} run: | New-Item -path "lib\pdftotext\win" -type directory - Copy-Item "xpdf-tools-win-4.03\xpdf-tools-win-4.03\bin64\pdftotext.exe" -Destination "lib\pdftotext\win\pdftotext64.exe" + Copy-Item "xpdf-tools-win-4.04\xpdf-tools-win-4.04\bin64\pdftotext.exe" -Destination "lib\pdftotext\win\pdftotext64.exe" - name: Copy pdftotext if: ${{ matrix.os == 'windows' && matrix.arch == 'x86' }} run: | New-Item -path "lib\pdftotext\win" -type directory - Copy-Item "xpdf-tools-win-4.03\xpdf-tools-win-4.03\bin32\pdftotext.exe" -Destination "lib\pdftotext\win\pdftotext32.exe" + Copy-Item "xpdf-tools-win-4.04\xpdf-tools-win-4.04\bin32\pdftotext.exe" -Destination "lib\pdftotext\win\pdftotext32.exe" - name: Cache pdftotext uses: actions/cache@v2 if: ${{ matrix.os == 'linux' }} env: cache-name: cache-pdftotext-linux with: - path: xpdf-tools-linux-4.03.tar.gz + path: xpdf-tools-linux-4.04.tar.gz key: ${{ matrix.os }}-build-${{ env.cache-name }} restore-keys: | ${{ matrix.os }}-build-${{ env.cache-name }} @@ -168,20 +168,20 @@ jobs: - name: Download pdftotext linux if: ${{ matrix.os == 'linux' }} run: | - if [ ! -f xpdf-tools-linux-4.03.tar.gz ]; then - curl https://dl.xpdfreader.com/xpdf-tools-linux-4.03.tar.gz -o xpdf-tools-linux-4.03.tar.gz + if [ ! -f xpdf-tools-linux-4.04.tar.gz ]; then + curl https://dl.xpdfreader.com/xpdf-tools-linux-4.04.tar.gz -o xpdf-tools-linux-4.04.tar.gz fi - tar -xvzf xpdf-tools-linux-4.03.tar.gz + tar -xvzf xpdf-tools-linux-4.04.tar.gz - name: Copy pdftotext if: ${{ matrix.os == 'linux' && matrix.arch == 'x64' }} run: | mkdir "lib/pdftotext/linux" --parents - cp xpdf-tools-linux-4.03/bin64/pdftotext lib/pdftotext/linux/pdftotext64 + cp xpdf-tools-linux-4.04/bin64/pdftotext lib/pdftotext/linux/pdftotext64 - name: Copy pdftotext if: ${{ matrix.os == 'linux' && matrix.arch == 'x86' }} run: | mkdir "lib/pdftotext/linux" --parents - cp xpdf-tools-linux-4.03/bin32/pdftotext lib/pdftotext/linux/pdftotext32 + cp xpdf-tools-linux-4.04/bin32/pdftotext lib/pdftotext/linux/pdftotext32 - uses: ./.github/actions/nexe-compile name: Compile ${{ matrix.type }} for ${{ matrix.os }} ${{ matrix.arch }} with: @@ -251,7 +251,7 @@ jobs: env: cache-name: cache-pdftotext-windows with: - path: xpdf-tools-win-4.03.zip + path: xpdf-tools-win-4.04.zip key: ${{ runner.os }}-build-${{ env.cache-name }} restore-keys: | ${{ runner.os }}-build-${{ env.cache-name }} @@ -259,20 +259,20 @@ jobs: ${{ runner.os }}- - name: Download pdftotext run: | - if(!(Test-Path -Path "xpdf-tools-win-4.03.zip")) { - Invoke-WebRequest -Uri "https://dl.xpdfreader.com/xpdf-tools-win-4.03.zip" -OutFile "xpdf-tools-win-4.03.zip" + if(!(Test-Path -Path "xpdf-tools-win-4.04.zip")) { + Invoke-WebRequest -Uri "https://dl.xpdfreader.com/xpdf-tools-win-4.04.zip" -OutFile "xpdf-tools-win-4.04.zip" } - Expand-Archive -Path .\xpdf-tools-win-4.03.zip + Expand-Archive -Path .\xpdf-tools-win-4.04.zip - name: Copy pdftotext if: ${{ matrix.arch == 'x64' }} run: | New-Item -path "lib\pdftotext\win" -type directory - Copy-Item "xpdf-tools-win-4.03\xpdf-tools-win-4.03\bin64\pdftotext.exe" -Destination "lib\pdftotext\win\pdftotext64.exe" + Copy-Item "xpdf-tools-win-4.04\xpdf-tools-win-4.04\bin64\pdftotext.exe" -Destination "lib\pdftotext\win\pdftotext64.exe" - name: Copy pdftotext if: ${{ matrix.arch == 'x86' }} run: | New-Item -path "lib\pdftotext\win" -type directory - Copy-Item "xpdf-tools-win-4.03\xpdf-tools-win-4.03\bin32\pdftotext.exe" -Destination "lib\pdftotext\win\pdftotext32.exe" + Copy-Item "xpdf-tools-win-4.04\xpdf-tools-win-4.04\bin32\pdftotext.exe" -Destination "lib\pdftotext\win\pdftotext32.exe" - name: Write key file run: | $bytes = [Convert]::FromBase64String("${{ secrets.PFX_CERTIFICATE }}") @@ -370,9 +370,9 @@ jobs: [System.Collections.ArrayList]$originalContent = (Get-Content $configFilePath) $originalContent.removeRange(9, 5) $originalContent | Out-File -encoding utf8 $configFilePath - + Start-Sleep -Seconds 30 - + if (((Get-Service "EMAPC").Status) -ne "Running") { @@ -387,7 +387,7 @@ jobs: Write-Host "Service not running after config change" exit 1 } - + (Get-Content $configFilePath) ` -replace '^(.*)required: true$', '$1default: ein standard wert' ` -replace '^((.*)inputKeyWord: EM)', "`$1`r`n`$2default: ['Muster', 'Max']" | @@ -409,9 +409,9 @@ jobs: [System.Collections.ArrayList]$originalContent = (Get-Content $configFilePath) $originalContent.removeRange(0, 57) $originalContent | Out-File -encoding utf8 $configFilePath - + Start-Sleep -Seconds 30 - + if (((Get-Service "EMAPC").Status) -ne "Stopped") { Get-Content $configFilePath @@ -428,7 +428,7 @@ jobs: - name: Uninstall service run: | Start-Process msiexec.exe -Wait -ArgumentList "/X $PWD\emapc-windows-service-installer-x64.msi /passive /qn" - + If ( (Test-Path -Path "$([environment]::getfolderpath('programfiles'))/EMAPC") -Or (Get-Service "EMAPC" -ErrorAction SilentlyContinue) ) { Write-Host "Service did not properly uninstall" @@ -453,7 +453,7 @@ jobs: env: cache-name: cache-pdftotext-linux-test with: - path: xpdf-tools-linux-4.03.tar.gz + path: xpdf-tools-linux-4.04.tar.gz key: ${{ matrix.os }}-build-${{ env.cache-name }} restore-keys: | ${{ matrix.os }}-build-${{ env.cache-name }} @@ -461,13 +461,13 @@ jobs: ${{ matrix.os }}- - name: Download pdftotext linux run: | - if [ ! -f xpdf-tools-linux-4.03.tar.gz ]; then - curl https://dl.xpdfreader.com/xpdf-tools-linux-4.03.tar.gz -o xpdf-tools-linux-4.03.tar.gz + if [ ! -f xpdf-tools-linux-4.04.tar.gz ]; then + curl https://dl.xpdfreader.com/xpdf-tools-linux-4.04.tar.gz -o xpdf-tools-linux-4.04.tar.gz fi - tar -xvzf xpdf-tools-linux-4.03.tar.gz + tar -xvzf xpdf-tools-linux-4.04.tar.gz - name: Copy pdftotext run: | mkdir "lib/pdftotext/linux" --parents - cp xpdf-tools-linux-4.03/bin64/pdftotext lib/pdftotext/linux/pdftotext64 + cp xpdf-tools-linux-4.04/bin64/pdftotext lib/pdftotext/linux/pdftotext64 - name: test run: ./test/linuxtests.sh