Skip to content

Commit c74e57c

Browse files
authored
Bugfix/windows runner (#102)
* Updated Windows runner to 2025
1 parent f3b0073 commit c74e57c

File tree

2 files changed

+4
-3
lines changed

2 files changed

+4
-3
lines changed

.github/workflows/build-and-test.yml

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -56,7 +56,7 @@ jobs:
5656
strategy:
5757
fail-fast: false
5858
matrix:
59-
os: [windows-2019]
59+
os: [windows-2025]
6060
build_type: [Debug, Release]
6161
steps:
6262
- uses: actions/checkout@v4

.github/workflows/upload-conan-pkgs.yml

Lines changed: 3 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -29,7 +29,7 @@ jobs:
2929
run: |
3030
mkdir /tmp/proxyfmu-builder-docker
3131
cat <<'EOF' >/tmp/proxyfmu-builder-docker/Dockerfile
32-
FROM conanio/gcc${{ matrix.compiler_version }}-ubuntu16.04
32+
FROM conanio/gcc${{ matrix.compiler_version }}:2.9.1
3333
ENV CONAN_LOGIN_USERNAME_OSP=${{ secrets.osp_artifactory_usr }}
3434
ENV CONAN_PASSWORD_OSP=${{ secrets.osp_artifactory_pwd }}
3535
ENV LIBCOSIM_RUN_TESTS_ON_CONAN_BUILD=1
@@ -43,6 +43,7 @@ jobs:
4343
set -eu
4444
cd /mnt/source
4545
conan remote add osp https://osp.jfrog.io/artifactory/api/conan/conan-local --force
46+
conan profile detect --force
4647
REFNAME="${GITHUB_REF#refs/*/}"
4748
VERSION="v$(<version.txt)"
4849
if [[ $GITHUB_REF == refs/tags/* ]] && [[ $REFNAME == $VERSION ]]; then CHANNEL="stable"
@@ -76,7 +77,7 @@ jobs:
7677
strategy:
7778
fail-fast: false
7879
matrix:
79-
os: [windows-2019]
80+
os: [windows-2025]
8081
build_type: [Debug, Release]
8182
timeout-minutes: 120
8283

0 commit comments

Comments
 (0)