diff --git a/.github/workflows/build.yml b/.github/workflows/build.yml index 0628332a..22f66267 100644 --- a/.github/workflows/build.yml +++ b/.github/workflows/build.yml @@ -46,7 +46,6 @@ jobs: cxx-compiler: clang++ cc-compiler: clang compiler-desc: Clang - checkout_version: 3 cuda: false opencl: true - name_prefix: Linux CentOS 7 VFX CY2022 @@ -64,7 +63,6 @@ jobs: cxx-compiler: clang++ cc-compiler: clang compiler-desc: Clang - checkout_version: 3 cuda: false opencl: true - name_prefix: Linux Rocky 8 VFX CY2023 @@ -81,7 +79,6 @@ jobs: cxx-compiler: clang++ cc-compiler: clang compiler-desc: Clang - checkout_version: 4 cuda: false opencl: true - name_prefix: Linux Rocky 8 VFX CY2023 No OpenGL @@ -98,7 +95,6 @@ jobs: cxx-compiler: clang++ cc-compiler: clang compiler-desc: Clang - checkout_version: 4 opengl: false - name_prefix: Linux Ubuntu release_prefix: linux-ubuntu @@ -112,7 +108,6 @@ jobs: cxx-compiler: clang++ cc-compiler: clang compiler-desc: Clang - checkout_version: 4 cuda: true opencl: true - name_prefix: MacOS @@ -126,7 +121,6 @@ jobs: cxx-compiler: clang++ cc-compiler: clang compiler-desc: Clang - checkout_version: 4 cuda: false opencl: true - name_prefix: Windows @@ -140,7 +134,6 @@ jobs: cxx-compiler: clang++ cc-compiler: clang compiler-desc: Clang - checkout_version: 4 cuda: true opencl: true - name_prefix: Windows no CUDA @@ -154,7 +147,6 @@ jobs: cxx-compiler: clang++ cc-compiler: clang compiler-desc: Clang - checkout_version: 4 cuda: false opencl: false defaults: @@ -167,16 +159,8 @@ jobs: curl --silent https://unofficial-builds.nodejs.org/download/release/v20.18.1/node-v20.18.1-linux-x64-glibc-217.tar.xz | \ tar -xJ --strip-components 1 -C /node20217 -f - - - name: Checkout code (v4) + - name: Checkout code uses: actions/checkout@v4 - if: matrix.checkout_version == 4 - with: - clean: true - fetch-depth: 0 - - - name: Checkout code (v3) - uses: actions/checkout@v3 - if: matrix.checkout_version == 3 with: clean: true fetch-depth: 0 @@ -205,7 +189,7 @@ jobs: - name: Set up python 3.11 uses: actions/setup-python@v5 - if: matrix.ostype == 'mac' + if: matrix.ostype == 'mac' || matrix.release_prefix == 'linux-vfx2021' with: python-version: '3.11' @@ -233,7 +217,7 @@ jobs: echo -n 'which python: ' && which python echo -n 'which python3: ' && which python3 echo -n 'python version: ' && python --version - echo -n 'python3 version: ' python3 --version + echo -n 'python3 version: ' && python3 --version which uv || echo "No python uv; continuing" - name: Install Conan