diff --git a/.github/workflows/centos-and-fedora-new.yml b/.github/workflows/centos-and-fedora-new.yml index 5198fb7792..837f24079e 100644 --- a/.github/workflows/centos-and-fedora-new.yml +++ b/.github/workflows/centos-and-fedora-new.yml @@ -40,7 +40,7 @@ env: jobs: tests: - name: ${{ matrix.image.container }} [CC ${{ matrix.env.CC }}; backend - ${{ matrix.image.backend }} - ${{ matrix.image.botan_ver }}; gpg - ${{ matrix.image.gpg_ver }}; build - ${{ matrix.env.BUILD_MODE }}] + name: ${{ matrix.image.container }} [CC ${{ matrix.env.CC }}; backend ${{ matrix.image.backend }} ${{ matrix.image.botan_ver }}; gpg ${{ matrix.image.gpg_ver }}; build ${{ matrix.env.BUILD_MODE }}; SM2 ${{ matrix.image.sm2 }}; IDEA ${{ matrix.image.idea }}] runs-on: ubuntu-latest timeout-minutes: 120 strategy: @@ -102,25 +102,14 @@ jobs: with: submodules: true -# if [[ '${{ matrix.image.gpg_ver }}' != 'system' && '${{ matrix.image.gpg_ver }}' != '' ]]; then -# echo "/opt/gpg/${{ matrix.image.gpg_ver }}/bin" >> $GITHUB_PATH -# fi - name: Setup environment run: | set -o errexit -o pipefail -o noclobber -o nounset - backend=${{ matrix.image.backend }} - backend="$(echo "${backend:-}" | tr '[:upper:]' '[:lower:]')" - echo CRYPTO_BACKEND="$backend" >> $GITHUB_ENV + /opt/tools/tools.sh select_crypto_backend_for_gha ${{ matrix.image.backend }} /opt/tools/tools.sh select_gpg_version_for_gha ${{ matrix.image.gpg_ver }} + /opt/tools/tools.sh select_botan_version_for_gha ${{ matrix.image.botan_ver }} - if [[ '${{ matrix.image.botan_ver }}' != 'system' && '${{ matrix.image.botan_ver }}' != '' ]]; then - echo "/opt/botan/${{ matrix.image.botan_ver }}/bin" >> $GITHUB_PATH - echo BOTAN_ROOT_DIR="/opt/botan/${{ matrix.image.botan_ver }}" >> $GITHUB_ENV - echo LD_LIBRARY_PATH="/opt/botan/${{ matrix.image.botan_ver }}/lib${LD_LIBRARY_PATH:+:${LD_LIBRARY_PATH}}" >> $GITHUB_ENV - echo PKG_CONFIG_PATH="/opt/botan/${{ matrix.image.botan_ver }}/lib/pkgconfig${PKG_CONFIG_PATH:+:${PKG_CONFIG_PATH}}" >> $GITHUB_ENV - echo CPATH="/opt/botan/${{ matrix.image.botan_ver }}/include${CPATH:+:${CPATH}}" >> $GITHUB_ENV - fi echo "ENABLE_SM2=${{ matrix.image.sm2 }}" >> $GITHUB_ENV echo "ENABLE_IDEA=${{ matrix.image.idea }}" >> $GITHUB_ENV