Skip to content

Commit fbacf96

Browse files
trisyoungsTristan Youngs
andcommitted
build: Fix Windows and OSX CI builds (#2572)
Co-authored-by: Tristan Youngs <trisyoungs@googlemail.com>
1 parent dc2073a commit fbacf96

3 files changed

Lines changed: 7 additions & 2 deletions

File tree

.github/workflows/_build_and_package.yml

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -41,7 +41,7 @@ jobs:
4141
strategy:
4242
fail-fast: false
4343
matrix:
44-
os: [ "${{ inputs.osxRunner }}", windows-latest ]
44+
os: [ "${{ inputs.osxRunner }}", windows-2022 ]
4545
runs-on: ${{ matrix.os }}
4646
steps:
4747
- name: 'Download Source Tarfiles'

.github/workflows/build/osx/action.yml

Lines changed: 5 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -39,6 +39,11 @@ runs:
3939
brew install gsl
4040
brew uninstall --ignore-dependencies freetype
4141
42+
- name: Install CMake3
43+
uses: jwlawson/actions-setup-cmake@v2.2.0
44+
with:
45+
cmake-version: '3.30'
46+
4247
- name: Get ANTLR
4348
working-directory: ${{ runner.temp }}
4449
shell: bash

.github/workflows/build/windows/action.yml

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -5,7 +5,7 @@ inputs:
55
threading:
66
default: true
77
freeTypeArchive:
8-
default: https://download.savannah.gnu.org/releases/freetype/freetype-2.12.1.tar.gz
8+
default: https://download-mirror.savannah.gnu.org/releases/freetype/freetype-2.12.1.tar.gz
99
ftglRepo:
1010
default: https://github.com/disorderedmaterials/ftgl-2.4.0
1111
cacheOnly:

0 commit comments

Comments
 (0)