From 94d105a9e7fdbb6c5b81291fd15799d72558c7a8 Mon Sep 17 00:00:00 2001 From: irenab Date: Sun, 31 Mar 2024 14:01:15 +0300 Subject: [PATCH] fix ci --- .github/workflows/ci.yaml | 77 ++++++++++++++++++++------------------- 1 file changed, 39 insertions(+), 38 deletions(-) diff --git a/.github/workflows/ci.yaml b/.github/workflows/ci.yaml index fa73e4c..67084ee 100644 --- a/.github/workflows/ci.yaml +++ b/.github/workflows/ci.yaml @@ -38,7 +38,7 @@ jobs: python-version: ${{matrix.py_ver}} - name: Install dependencies run: | - pip install tensorflow==${{matrix.tf_ver}} + pip install tensorflow==${{matrix.tf_ver}}.* pip install -r requirements_test.txt pip list - name: Run pytest @@ -51,19 +51,23 @@ jobs: fail-fast: false matrix: py_ver: [ "3.8", "3.9", "3.10", "3.11" ] - ort_ver: ["1.15.*", "1.16.*", "1.17.*"] - ort_ext_ver: ["0.8.*", "0.9.*", "0.10.*"] - onnx_ver: ["1.14.*", "1.15.*"] + torch_ver: ["2.0", "2.1", "2.2"] + ort_ver: ["1.15", "1.16", "1.17"] + ort_ext_ver: ["0.8", "0.9", "0.10"] include: - - torch_ver: "2.2.*" - torchvision_ver: "0.17.*" - - torch_ver: "2.1.*" - torchvision_ver: "0.16.*" - - torch_ver: "2.0.*" - torchvision_ver: "0.15.*" + - torch_ver: "2.2" + torchvision_ver: "0.17" + onnx_ver: "1.15" + - torch_ver: "2.1" + torchvision_ver: "0.16" + onnx_ver: "1.14" + - torch_ver: "2.0" + torchvision_ver: "0.15" + onnx_ver: "1.15" + exclude: - py_ver: "3.11" - ort_ext_ver: "0.8.*" + ort_ext_ver: "0.8" steps: - name: Checkout uses: actions/checkout@v4 @@ -73,11 +77,11 @@ jobs: python-version: ${{matrix.py_ver}} - name: Install dependencies run: | - pip install torch==${{matrix.torch_ver}} \ - torchvision==${{matrix.torchvision_ver}} \ - onnxruntime==${{matrix.ort_ver}} \ - onnxruntime_extensions==${{matrix.ort_ext_ver}} \ - onnx==${{matrix.onnx_ver}} \ + pip install torch==${{matrix.torch_ver}}.* \ + torchvision==${{matrix.torchvision_ver}}.* \ + onnxruntime==${{matrix.ort_ver}}.* \ + onnxruntime_extensions==${{matrix.ort_ext_ver}}.* \ + onnx==${{matrix.onnx_ver}}.* \ --index-url https://download.pytorch.org/whl/cpu \ --extra-index-url https://pypi.org/simple @@ -96,12 +100,10 @@ jobs: uses: actions/setup-python@v5 with: python-version: "3.10" - - name: Run pre-commit run: | ./install-pre-commit.sh pre-commit run --all - - name: get new dev tag shell: bash run : | @@ -109,23 +111,23 @@ jobs: git fetch --tags latest_tag=$(git tag -l | sort -V -r | head -n 1) - if [ -z "$latest_tag" ]; then - new_version=0.0.0.dev0 - else - latest_tag_without_v=${latest_tag#v} - new_version=$(python -c " - from packaging.version import parse - v = parse('$latest_tag_without_v') - if v.is_devrelease: - print(f'{v.major}.{v.minor}.{v.micro}.dev{v.dev + 1}') - else: - print(f'{v.major}.{v.minor}.{v.micro + 1}.dev0') - ") - fi - echo "new_ver=${new_version}" >> $GITHUB_ENV - echo "new_tag=v${new_version}" >> $GITHUB_ENV - echo "cat GITHUB_ENV" - cat $GITHUB_ENV + if [ -z "$latest_tag" ]; then + new_version=0.0.0.dev0 + else + latest_tag_without_v=${latest_tag#v} + new_version=$(python -c " + from packaging.version import parse + v = parse('$latest_tag_without_v') + if v.is_devrelease: + print(f'{v.major}.{v.minor}.{v.micro}.dev{v.dev + 1}') + else: + print(f'{v.major}.{v.minor}.{v.micro + 1}.dev0') + ") + fi + echo "new_ver=${new_version}" >> $GITHUB_ENV + echo "new_tag=v${new_version}" >> $GITHUB_ENV + echo "cat GITHUB_ENV" + cat $GITHUB_ENV - name: update name and version to dev shell: bash @@ -133,7 +135,7 @@ jobs: echo "__version__ = '${{ env.new_ver }}'" > sony_custom_layers/version.py echo "print sony_custom_layers/version.py" cat sony_custom_layers/version.py - + sed -i 's/name = sony-custom-layers/name = sony-custom-layers-dev/' setup.cfg echo "print setup.cfg" cat setup.cfg @@ -153,5 +155,4 @@ jobs: git tag ${{ env.new_tag }} git push origin ${{ env.new_tag }} fi - - +