Skip to content

Commit fa0734c

Browse files
committed
Update GHA
1 parent d23f2ab commit fa0734c

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
@@ -129,7 +129,7 @@ jobs:
129129
run: |
130130
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
131131
- name: Add Artifact
132-
uses: actions/upload-artifact@v1
132+
uses: actions/upload-artifact@v4
133133
with:
134134
name: ${{ matrix.platform }}-Clang${{ matrix.compiler-version }}-${{ matrix.build_type }}
135135
path: ${{ github.workspace }}/${{ matrix.platform }}-Clang${{ matrix.compiler-version }}-${{ matrix.build_type }}.tar.gz
@@ -184,7 +184,7 @@ jobs:
184184
CONAN_GCC_VERSIONS: ${{ matrix.compiler-version }}
185185
CONAN_DOCKER_IMAGE: docker.aquaveo.com/aquaveo/conan-docker/conan-gcc${{ matrix.compiler-version }}-py${{ matrix.python-version }}:latest
186186
CONAN_PIP_INSTALL: 'conan-package-tools==0.35.1'
187-
CONAN_PIP_PACKAGE: 'conan==1.41.0'
187+
CONAN_PIP_PACKAGE: 'conan==1.60.0'
188188
# Aquapi Variables
189189
AQUAPI_USERNAME: ${{ secrets.AQUAPI_USERNAME_SECRET }}
190190
AQUAPI_PASSWORD: ${{ secrets.AQUAPI_PASSWORD_SECRET }}
@@ -206,7 +206,7 @@ jobs:
206206
- name: Install Python Dependencies
207207
run: |
208208
python -m pip install --upgrade pip
209-
pip install pyYAML==5.3.1 conan==1.41.0 conan-package-tools==0.35.1 devpi-client wheel MarkupSafe==2.0.0
209+
pip install pyYAML==5.3.1 conan==1.60.0 conan-package-tools==0.35.1 devpi-client wheel MarkupSafe==2.0.0
210210
python -m pip install -i https://public.aquapi.aquaveo.com/aquaveo/stable/+simple/ "xmsconan>=1.0.4,<2"
211211
# Login to Aquaveo Docker
212212
- name: Login to Aquaveo Docker
@@ -257,7 +257,7 @@ jobs:
257257
run: |
258258
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
259259
- name: Add Artifact
260-
uses: actions/upload-artifact@v1
260+
uses: actions/upload-artifact@v4
261261
with:
262262
name: ${{ matrix.platform }}-Clang${{ matrix.compiler-version }}-${{ matrix.build_type }}
263263
path: ${{ github.workspace }}/${{ matrix.platform }}-GCC${{ matrix.compiler-version }}-${{ matrix.build_type }}.tar.gz
@@ -332,7 +332,7 @@ jobs:
332332
- name: Install Python Dependencies
333333
run: |
334334
python -m pip install --upgrade pip
335-
pip install pyYAML==5.3.1 conan==1.41.0 conan-package-tools==0.35.1 devpi-client wheel MarkupSafe==2.0.0
335+
pip install pyYAML==5.3.1 conan==1.60.0 conan-package-tools==0.35.1 devpi-client wheel MarkupSafe==2.0.0
336336
python -m pip install -i https://public.aquapi.aquaveo.com/aquaveo/stable/+simple/ "xmsconan>=1.0.4,<2"
337337
# Setup Visual Studio
338338
- name: Setup Visual Studio
@@ -380,7 +380,7 @@ jobs:
380380
run: |
381381
tar czf ${{ github.workspace }}/${{ env.MATRIX_NAME }}.tar.gz ${{ env.CONAN_PATH }}/${{ env.LIBRARY_NAME }}/${{ env.XMS_VERSION }}/aquaveo/${{ env.CONAN_CHANNEL}}/package
382382
- name: Add Artifact
383-
uses: actions/upload-artifact@v1
383+
uses: actions/upload-artifact@v4
384384
with:
385385
name: ${{ env.MATRIX_NAME }}
386386
path: ${{ github.workspace }}/${{ env.MATRIX_NAME }}.tar.gz

0 commit comments

Comments
 (0)