diff --git a/.github/workflows/android.yml b/.github/workflows/android.yml index ff8a15c17bd..192cc372319 100644 --- a/.github/workflows/android.yml +++ b/.github/workflows/android.yml @@ -78,7 +78,7 @@ jobs: steps: - name: checkout - uses: actions/checkout@v2.3.3 + uses: actions/checkout@v4 with: submodules: recursive diff --git a/.github/workflows/c.yml b/.github/workflows/c.yml index 5c9fd684d29..c57b0fd19e8 100644 --- a/.github/workflows/c.yml +++ b/.github/workflows/c.yml @@ -25,10 +25,10 @@ jobs: strategy: matrix: - os: [ubuntu-20.04, macos-latest, windows-2019 ] + os: [ubuntu-20.04, macos-latest, windows-2022 ] steps: - - uses: actions/checkout@v2 + - uses: actions/checkout@v4 with: submodules: true @@ -53,7 +53,7 @@ jobs: if: runner.os == 'Windows' shell: cmd run: | - git clone --depth=1 --recurse-submodules -j10 --branch=boost-1.72.0 https://github.com/boostorg/boost.git + git clone --depth=1 --recurse-submodules -j10 --branch=boost-1.78.0 https://github.com/boostorg/boost.git cd boost bootstrap.bat @@ -64,11 +64,6 @@ jobs: cd boost .\b2 headers - - name: install openssl (64 bit) (windows) - if: runner.os == 'Windows' - shell: pwsh - run: choco install openssl --limitoutput - - name: build (windows) if: runner.os == 'Windows' shell: cmd diff --git a/.github/workflows/python.yml b/.github/workflows/python.yml index d3afa6f6efd..2172b845bcd 100644 --- a/.github/workflows/python.yml +++ b/.github/workflows/python.yml @@ -51,7 +51,7 @@ jobs: python-version: 3.8 - os: macos-latest python-version: "3.12" - - os: windows-2019 + - os: windows-2022 python-version: 3.6 steps: @@ -115,16 +115,6 @@ jobs: cd boost .\b2 headers - - name: install openssl (windows) - if: runner.os == 'Windows' - uses: nick-fields/retry@v2 - with: - shell: cmd - timeout_minutes: 5 - retry_wait_seconds: 4 - max_attempts: 3 - command: choco install openssl --limitoutput --no-progress - - name: build/test with tox (windows) if: runner.os == 'Windows' shell: cmd diff --git a/.github/workflows/windows.yml b/.github/workflows/windows.yml index ef13b463ae0..d2721fb9d14 100644 --- a/.github/workflows/windows.yml +++ b/.github/workflows/windows.yml @@ -37,14 +37,6 @@ jobs: with: submodules: true - - name: install openssl (64 bit) - uses: nick-fields/retry@v2 - with: - timeout_minutes: 30 - retry_wait_seconds: 4 - max_attempts: 3 - command: choco install openssl --limitoutput --no-progress - - name: install boost run: | git clone --depth=1 --recurse-submodules -j10 --branch=boost-1.78.0 https://github.com/boostorg/boost.git @@ -82,7 +74,7 @@ jobs: simulations: name: Simulations - runs-on: windows-2019 + runs-on: windows-2022 steps: - name: checkout @@ -130,7 +122,7 @@ jobs: build: name: Build - runs-on: windows-2019 + runs-on: windows-2022 continue-on-error: true strategy: