diff options
| -rw-r--r-- | .github/workflows/os-zoo.yml | 4 | ||||
| -rw-r--r-- | .github/workflows/windows.yml | 9 |
2 files changed, 8 insertions, 5 deletions
diff --git a/.github/workflows/os-zoo.yml b/.github/workflows/os-zoo.yml index 659dd61ea8..3e05b803d8 100644 --- a/.github/workflows/os-zoo.yml +++ b/.github/workflows/os-zoo.yml @@ -40,15 +40,15 @@ jobs: fail-fast: false matrix: os: [ - windows-2016, windows-2019, - #windows-2022, # Perl issues, doesn't finish configure step + windows-2022 ] runs-on: ${{ matrix.os }} steps: - uses: actions/checkout@v2 - uses: ilammy/msvc-dev-cmd@v1 - uses: ilammy/setup-nasm@v1 + - uses: shogo82148/actions-setup-perl@v1 - name: prepare the build directory run: mkdir _build - name: config diff --git a/.github/workflows/windows.yml b/.github/workflows/windows.yml index cb9e84b33d..553e0c3650 100644 --- a/.github/workflows/windows.yml +++ b/.github/workflows/windows.yml @@ -16,7 +16,7 @@ jobs: matrix: os: - windows-latest - - windows-2016 + - windows-2022 platform: - arch: win64 config: VC-WIN64A enable-fips @@ -31,6 +31,7 @@ jobs: - uses: ilammy/setup-nasm@v1 with: platform: ${{ matrix.platform.arch }} + - uses: shogo82148/actions-setup-perl@v1 - name: prepare the build directory run: mkdir _build - name: config @@ -56,11 +57,12 @@ jobs: matrix: os: - windows-latest - - windows-2016 + - windows-2022 runs-on: ${{matrix.os}} steps: - uses: actions/checkout@v2 - uses: ilammy/msvc-dev-cmd@v1 + - uses: shogo82148/actions-setup-perl@v1 - name: prepare the build directory run: mkdir _build - name: config @@ -79,11 +81,12 @@ jobs: matrix: os: - windows-latest - - windows-2016 + - windows-2022 runs-on: ${{matrix.os}} steps: - uses: actions/checkout@v2 - uses: ilammy/msvc-dev-cmd@v1 + - uses: shogo82148/actions-setup-perl@v1 - name: prepare the build directory run: mkdir _build - name: config |