From 69f95c72fa0128cdb411e61ec2cc8a4b6f0544f0 Mon Sep 17 00:00:00 2001 From: Chandler Scott Date: Tue, 22 Oct 2024 07:48:49 -0600 Subject: [PATCH] Update GHA --- .github/workflows/XmsCore-CI.yaml | 10 +++++----- 1 file changed, 5 insertions(+), 5 deletions(-) diff --git a/.github/workflows/XmsCore-CI.yaml b/.github/workflows/XmsCore-CI.yaml index 469b3f91..0631361c 100644 --- a/.github/workflows/XmsCore-CI.yaml +++ b/.github/workflows/XmsCore-CI.yaml @@ -85,7 +85,7 @@ jobs: - name: Install Python Dependencies run: | python -m pip install --upgrade pip - pip install conan==1.60.0 conan-package-tools==0.39.0 devpi-client wheel MarkupSafe==2.0.0 + pip install cython<3 conan==1.60.0 conan-package-tools==0.39.0 devpi-client wheel MarkupSafe==2.0.0 python -m pip install -i https://public.aquapi.aquaveo.com/aquaveo/stable/+simple/ "xmsconan>=1.0.4,<2" # Setup Conan - name: Setup Conan Directory @@ -125,7 +125,7 @@ jobs: run: | tar czf ${{ github.workspace }}/${{ matrix.platform }}-Clang${{ matrix.compiler-version }}-${{ matrix.build_type }}.tar.gz ${{ env.CONAN_PATH }}/${{ env.LIBRARY_NAME }}/${{ env.XMS_VERSION }}/aquaveo/${{ env.CONAN_CHANNEL}}/package - name: Add Artifact - uses: actions/upload-artifact@v1 + uses: actions/upload-artifact@v4 with: name: ${{ matrix.platform }}-Clang${{ matrix.compiler-version }}-${{ matrix.build_type }} path: ${{ github.workspace }}/${{ matrix.platform }}-Clang${{ matrix.compiler-version }}-${{ matrix.build_type }}.tar.gz @@ -253,7 +253,7 @@ jobs: run: | tar czf ${{ github.workspace }}/${{ matrix.platform }}-GCC${{ matrix.compiler-version }}-${{ matrix.build_type }}.tar.gz ${{ env.CONAN_PATH }}/${{ env.LIBRARY_NAME }}/${{ env.XMS_VERSION }}/aquaveo/${{ env.CONAN_CHANNEL}}/package - name: Add Artifact - uses: actions/upload-artifact@v1 + uses: actions/upload-artifact@v4 with: name: ${{ matrix.platform }}-Clang${{ matrix.compiler-version }}-${{ matrix.build_type }} path: ${{ github.workspace }}/${{ matrix.platform }}-GCC${{ matrix.compiler-version }}-${{ matrix.build_type }}.tar.gz @@ -328,7 +328,7 @@ jobs: - name: Install Python Dependencies run: | python -m pip install --upgrade pip - pip install conan==1.41.0 conan-package-tools==0.35.1 devpi-client wheel MarkupSafe==2.0.0 + pip install Cython<3 conan==1.41.0 conan-package-tools==0.35.1 devpi-client wheel MarkupSafe==2.0.0 python -m pip install -i https://public.aquapi.aquaveo.com/aquaveo/stable/+simple/ "xmsconan>=1.0.4,<2" # Setup Visual Studio - name: Setup Visual Studio @@ -376,7 +376,7 @@ jobs: run: | tar czf ${{ github.workspace }}/${{ env.MATRIX_NAME }}.tar.gz ${{ env.CONAN_PATH }}/${{ env.LIBRARY_NAME }}/${{ env.XMS_VERSION }}/aquaveo/${{ env.CONAN_CHANNEL}}/package - name: Add Artifact - uses: actions/upload-artifact@v1 + uses: actions/upload-artifact@v4 with: name: ${{ env.MATRIX_NAME }} path: ${{ github.workspace }}/${{ env.MATRIX_NAME }}.tar.gz