From 7a54c0ec2eaf87801d841e46252181a67ca42ce1 Mon Sep 17 00:00:00 2001 From: Maxim Date: Fri, 17 May 2024 10:53:38 +0300 Subject: [PATCH] REL - Release v1.26 --- .github/workflows/veraPDF_gui.yml | 6 +++--- CLI/Issues/399/399.bats | 2 +- CLI/Options/config/config.bats | 2 +- CLI/Options/plugins/plugins_without_ext_files.bats | 2 +- CLI/Options/profile/profile.bats | 2 +- CLI/Options/version/version.bats | 2 +- tools/test_helper/common-setup.bash | 2 +- tools/test_helper/html_helper.bash | 3 +-- tools/verapdf-env.sh | 10 +++++----- 9 files changed, 15 insertions(+), 16 deletions(-) diff --git a/.github/workflows/veraPDF_gui.yml b/.github/workflows/veraPDF_gui.yml index 2a75aad..83ab18b 100755 --- a/.github/workflows/veraPDF_gui.yml +++ b/.github/workflows/veraPDF_gui.yml @@ -45,8 +45,8 @@ jobs: echo "Performing veraPDF installation ... " echo "#Downloading veraPDF, latest rc version ... unziping to $PWD" - curl -LO https://software.verapdf.org/releases/verapdf-installer-rc.zip - unzip verapdf-installer-rc.zip + curl -LO https://software.verapdf.org/releases/verapdf-installer.zip + unzip verapdf-installer.zip echo "Definition of the variables" veradir=$(ls | grep verapdf-greenfield) @@ -56,7 +56,7 @@ jobs: echo "veraPATH: $veraPATH" echo "#Downloading auto-install.xml ..." - curl -LO https://raw.githubusercontent.com/veraPDF/veraPDF-regression-tests/rc/1.26/tools/auto-install.xml + curl -LO https://raw.githubusercontent.com/veraPDF/veraPDF-regression-tests/rel/1.26/tools/auto-install.xml #Definition of the 'PATH' to install veraPDF using the auto-install.xml file sed -i '5 c\ '$(echo $veraPATH)'' ./auto-install.xml diff --git a/CLI/Issues/399/399.bats b/CLI/Issues/399/399.bats index ab6c019..8ff7f62 100644 --- a/CLI/Issues/399/399.bats +++ b/CLI/Issues/399/399.bats @@ -6,7 +6,7 @@ setup() { # https://github.com/veraPDF/veraPDF-library/issues/399 @test "#399, CLI: --profile argument, external options check" { - run verapdf/verapdf -p verapdf/profiles/veraPDF-validation-profiles-rc-1.26/PDF_A/PDFA-4.xml $BATS_TEST_DIRNAME/a.pdf + run verapdf/verapdf -p verapdf/profiles/veraPDF-validation-profiles-rel-1.26/PDF_A/PDFA-4.xml $BATS_TEST_DIRNAME/a.pdf [ "$status" -eq 0 ] assert_output --partial '' diff --git a/CLI/Options/config/config.bats b/CLI/Options/config/config.bats index 6f73463..641c2d7 100644 --- a/CLI/Options/config/config.bats +++ b/CLI/Options/config/config.bats @@ -18,7 +18,7 @@ setup() { cp -r verapdf/* $BATS_TEST_TMPDIR cd $BATS_TEST_TMPDIR - VERAPDF_FOLDER=1.26rc + VERAPDF_FOLDER=1.26 assert [ ${#FILES_TO_CHECK[@]} != 0 ] assert [ ${#PLUGIN_FILES_TO_CHECK[@]} != 0 ] } diff --git a/CLI/Options/plugins/plugins_without_ext_files.bats b/CLI/Options/plugins/plugins_without_ext_files.bats index 3e8f4ef..292b998 100644 --- a/CLI/Options/plugins/plugins_without_ext_files.bats +++ b/CLI/Options/plugins/plugins_without_ext_files.bats @@ -10,7 +10,7 @@ setup() { cd $BATS_TEST_TMPDIR - LAST_BUILD=$(get_last_plugins_version "1.26rc") + LAST_BUILD=$(get_last_plugins_version "1.26") } diff --git a/CLI/Options/profile/profile.bats b/CLI/Options/profile/profile.bats index 4f79a65..99f3f0f 100644 --- a/CLI/Options/profile/profile.bats +++ b/CLI/Options/profile/profile.bats @@ -21,7 +21,7 @@ setup() { profile_check() { echo "Running: $1" >&3 - run verapdf/verapdf --profile verapdf/profiles/veraPDF-validation-profiles-rc-1.26/PDF_A/PDFA-4.xml $FILE_PATH/$1 + run verapdf/verapdf --profile verapdf/profiles/veraPDF-validation-profiles-rel-1.26/PDF_A/PDFA-4.xml $FILE_PATH/$1 assert_output --partial 'profileName="PDF/A-4 validation profile"' [ "$status" -eq 1 ] } diff --git a/CLI/Options/version/version.bats b/CLI/Options/version/version.bats index d9d014d..b949425 100644 --- a/CLI/Options/version/version.bats +++ b/CLI/Options/version/version.bats @@ -14,6 +14,6 @@ setup() { [ "$status" -eq 0 ] assert_output --partial 'Developed and released by the veraPDF Consortium' assert_output --partial 'Funded by the PREFORMA project' - assert_output --regexp '^veraPDF [1-9].[1-9][0-9].[0-9]-RC[1-9]([0-9][0-9]?)?' + assert_output --regexp '^veraPDF [1-9].[1-9][0-9].[0-9]([0-9][0-9]?)?' } diff --git a/tools/test_helper/common-setup.bash b/tools/test_helper/common-setup.bash index 3491772..974cb56 100755 --- a/tools/test_helper/common-setup.bash +++ b/tools/test_helper/common-setup.bash @@ -39,7 +39,7 @@ verapdf_folder() { get_plugin_version() { PLUGIN_NAME=$1 - PLUGIN_VERSION=$(cat "$PROJECT_ROOT/verapdf/config/plugins.xml" | grep "$PLUGIN_NAME" | grep -o [0-9].[0-9][0-9].[0-9]-RC[0-9]) + PLUGIN_VERSION=$(cat "$PROJECT_ROOT/verapdf/config/plugins.xml" | grep "$PLUGIN_NAME" | grep -o [0-9].[0-9][0-9].[0-9][0-9]) echo "PLUGIN_VERSION: "$PLUGIN_VERSION >&3 echo "$PLUGIN_VERSION" diff --git a/tools/test_helper/html_helper.bash b/tools/test_helper/html_helper.bash index 10d8c05..786d2d6 100755 --- a/tools/test_helper/html_helper.bash +++ b/tools/test_helper/html_helper.bash @@ -33,8 +33,7 @@ get_last_build_page_on_jenkins() { get_last_plugins_version() { echo "FOLDER: $1" >&3 - BUILD_VERSION=$(curl https://jenkins.openpreservation.org/job/veraPDF/job/$1/job/plugins/lastBuild/ | grep -o 'class="jenkins-icon-adjacent">Build [0-9].[0-9][0-9].[0-9]-RC[0-9]*' | grep -o [0-9].[0-9][0-9].[0-9]-RC[0-9]*) + BUILD_VERSION=$(curl https://jenkins.openpreservation.org/job/veraPDF/job/$1/job/plugins/lastBuild/ | grep -o 'class="jenkins-icon-adjacent">Build [0-9].[0-9][0-9].[0-9][0-9]*' | grep -o [0-9].[0-9][0-9].[0-9][0-9]*) echo "BUILD_VERSION: $BUILD_VERSION" >&3 echo "$BUILD_VERSION" } - diff --git a/tools/verapdf-env.sh b/tools/verapdf-env.sh index a6cb525..564afe1 100755 --- a/tools/verapdf-env.sh +++ b/tools/verapdf-env.sh @@ -5,9 +5,9 @@ timestamp=$1 cd $timestamp -echo "#Downloading veraPDF, latest rc version ... unziping to $PWD" -curl -LO https://software.verapdf.org/releases/verapdf-installer-rc.zip -unzip verapdf-installer-rc.zip +echo "#Downloading veraPDF, latest rel version ... unziping to $PWD" +curl -LO https://software.verapdf.org/releases/verapdf-installer.zip +unzip verapdf-installer.zip #Definition of the variable, pointing to the veraPDF directory with installation files veradir=$(ls | grep verapdf-greenfield) @@ -18,11 +18,11 @@ export veraPATH="${timestamp}/../verapdf" echo "veraPATH: $veraPATH" #Prepare of the file: auto-install.xml -# curl -LO https://raw.githubusercontent.com/veraPDF/veraPDF-regression-tests/rc/1.26/TOOLS/auto-install.xml +# curl -LO https://raw.githubusercontent.com/veraPDF/veraPDF-regression-tests/rel/1.26/TOOLS/auto-install.xml # OR #cp /home/test/auto-install.xml ./ -curl -LO https://raw.githubusercontent.com/veraPDF/veraPDF-regression-tests/rc/1.26/tools/auto-install.xml +curl -LO https://raw.githubusercontent.com/veraPDF/veraPDF-regression-tests/rel/1.26/tools/auto-install.xml #Definition of the 'PATH' to install veraPDF using the auto-install.xml file sed -i '5 c\ '$(echo $veraPATH)'' ./auto-install.xml