Skip to content

Commit acf6d9d

Browse files
committed
Update GHA
1 parent b09807d commit acf6d9d

File tree

1 file changed

+6
-6
lines changed

1 file changed

+6
-6
lines changed

.github/workflows/XmsMesher-CI.yaml

+6-6
Original file line numberDiff line numberDiff line change
@@ -125,7 +125,7 @@ jobs:
125125
run: |
126126
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
127127
- name: Add Artifact
128-
uses: actions/upload-artifact@v1
128+
uses: actions/upload-artifact@v4
129129
with:
130130
name: ${{ matrix.platform }}-Clang${{ matrix.compiler-version }}-${{ matrix.build_type }}
131131
path: ${{ github.workspace }}/${{ matrix.platform }}-Clang${{ matrix.compiler-version }}-${{ matrix.build_type }}.tar.gz
@@ -180,7 +180,7 @@ jobs:
180180
CONAN_GCC_VERSIONS: ${{ matrix.compiler-version }}
181181
CONAN_DOCKER_IMAGE: docker.aquaveo.com/aquaveo/conan-docker/conan-gcc${{ matrix.compiler-version }}-py${{ matrix.python-version }}:latest
182182
CONAN_PIP_INSTALL: 'conan-package-tools==0.35.1'
183-
CONAN_PIP_PACKAGE: 'conan==1.41.0'
183+
CONAN_PIP_PACKAGE: 'conan==1.60.0'
184184
# Aquapi Variables
185185
AQUAPI_USERNAME: ${{ secrets.AQUAPI_USERNAME_SECRET }}
186186
AQUAPI_PASSWORD: ${{ secrets.AQUAPI_PASSWORD_SECRET }}
@@ -202,7 +202,7 @@ jobs:
202202
- name: Install Python Dependencies
203203
run: |
204204
python -m pip install --upgrade pip
205-
pip install pyYAML==5.3.1 conan==1.41.0 conan-package-tools==0.35.1 devpi-client wheel MarkupSafe==2.0.0
205+
pip install pyYAML==5.3.1 conan==1.60.0 conan-package-tools==0.35.1 devpi-client wheel MarkupSafe==2.0.0
206206
python -m pip install -i https://public.aquapi.aquaveo.com/aquaveo/stable/+simple/ "xmsconan>=1.0.4,<2"
207207
# Login to Aquaveo Docker
208208
- name: Login to Aquaveo Docker
@@ -253,7 +253,7 @@ jobs:
253253
run: |
254254
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
255255
- name: Add Artifact
256-
uses: actions/upload-artifact@v1
256+
uses: actions/upload-artifact@v4
257257
with:
258258
name: ${{ matrix.platform }}-Clang${{ matrix.compiler-version }}-${{ matrix.build_type }}
259259
path: ${{ github.workspace }}/${{ matrix.platform }}-GCC${{ matrix.compiler-version }}-${{ matrix.build_type }}.tar.gz
@@ -328,7 +328,7 @@ jobs:
328328
- name: Install Python Dependencies
329329
run: |
330330
python -m pip install --upgrade pip
331-
pip install pyYAML==5.3.1 conan==1.41.0 conan-package-tools==0.35.1 devpi-client wheel MarkupSafe==2.0.0
331+
pip install pyYAML==5.3.1 conan==1.60.0 conan-package-tools==0.35.1 devpi-client wheel MarkupSafe==2.0.0
332332
python -m pip install -i https://public.aquapi.aquaveo.com/aquaveo/stable/+simple/ "xmsconan>=1.0.4,<2"
333333
# Setup Visual Studio
334334
- name: Setup Visual Studio
@@ -376,7 +376,7 @@ jobs:
376376
run: |
377377
tar czf ${{ github.workspace }}/${{ env.MATRIX_NAME }}.tar.gz ${{ env.CONAN_PATH }}/${{ env.LIBRARY_NAME }}/${{ env.XMS_VERSION }}/aquaveo/${{ env.CONAN_CHANNEL}}/package
378378
- name: Add Artifact
379-
uses: actions/upload-artifact@v1
379+
uses: actions/upload-artifact@v4
380380
with:
381381
name: ${{ env.MATRIX_NAME }}
382382
path: ${{ github.workspace }}/${{ env.MATRIX_NAME }}.tar.gz

0 commit comments

Comments
 (0)