Skip to content
Merged
Show file tree
Hide file tree
Changes from all commits
Commits
File filter

Filter by extension

Filter by extension


Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
2 changes: 1 addition & 1 deletion .github/workflows/build-and-test.yml
Original file line number Diff line number Diff line change
Expand Up @@ -56,7 +56,7 @@ jobs:
strategy:
fail-fast: false
matrix:
os: [windows-2019]
os: [windows-2025]
build_type: [Debug, Release]
steps:
- uses: actions/checkout@v4
Expand Down
5 changes: 3 additions & 2 deletions .github/workflows/upload-conan-pkgs.yml
Original file line number Diff line number Diff line change
Expand Up @@ -29,7 +29,7 @@ jobs:
run: |
mkdir /tmp/proxyfmu-builder-docker
cat <<'EOF' >/tmp/proxyfmu-builder-docker/Dockerfile
FROM conanio/gcc${{ matrix.compiler_version }}-ubuntu16.04
FROM conanio/gcc${{ matrix.compiler_version }}:2.9.1
ENV CONAN_LOGIN_USERNAME_OSP=${{ secrets.osp_artifactory_usr }}
ENV CONAN_PASSWORD_OSP=${{ secrets.osp_artifactory_pwd }}
ENV LIBCOSIM_RUN_TESTS_ON_CONAN_BUILD=1
Expand All @@ -43,6 +43,7 @@ jobs:
set -eu
cd /mnt/source
conan remote add osp https://osp.jfrog.io/artifactory/api/conan/conan-local --force
conan profile detect --force
REFNAME="${GITHUB_REF#refs/*/}"
VERSION="v$(<version.txt)"
if [[ $GITHUB_REF == refs/tags/* ]] && [[ $REFNAME == $VERSION ]]; then CHANNEL="stable"
Expand Down Expand Up @@ -76,7 +77,7 @@ jobs:
strategy:
fail-fast: false
matrix:
os: [windows-2019]
os: [windows-2025]
build_type: [Debug, Release]
timeout-minutes: 120

Expand Down
Loading