Skip to content

Update GitHub CI runners #5328

New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Merged
skef merged 5 commits into from
Dec 29, 2023
Merged

Update GitHub CI runners #5328

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
5 commits
Select commit Hold shift + click to select a range
c639ea1
Bump GitHub CI runner to ubuntu-20.04
iorsh Dec 28, 2023
aee844b
AppImage dependencies are linked against /lib
iorsh Dec 28, 2023
8285c33
Bump GitHub CI runner to macos-11
iorsh Dec 28, 2023
e24b175
Fix fontconfig.rb path on Mac
iorsh Dec 28, 2023
d29dcee
Bump Coverity runner to ubuntu-20.04
iorsh Dec 28, 2023
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/coverity.yml
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -7,7 +7,7 @@ env:
PYTHON: python3.10
jobs:
build:
runs-on: ubuntu-18.04
runs-on: ubuntu-20.04
steps:
- uses: actions/checkout@v3
with:
Expand Down
6 changes: 3 additions & 3 deletions .github/workflows/main.yml
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -16,7 +16,7 @@ jobs:
os: ["ubuntu-latest"]
target: ["NoUI", "Debug"]
include:
- os: ubuntu-18.04
- os: ubuntu-20.04
target: Release
steps:
- uses: actions/checkout@v3
Expand Down Expand Up @@ -74,7 +74,7 @@ jobs:
name: appimage
path: repo/build/FontForge-*-x86_64.AppImage
mac:
runs-on: macos-10.15
runs-on: macos-11
env:
PYTHON: python3
steps:
Expand All @@ -84,7 +84,7 @@ jobs:
- name: Install dependencies
run: |
# Disable fc-cache on fontconfig install. Because it's slow.
sed -i.bak '/fc-cache/d' "$(brew --prefix)/Homebrew/Library/Taps/homebrew/homebrew-core/Formula/fontconfig.rb"
sed -i.bak '/fc-cache/d' "$(brew --prefix)/Homebrew/Library/Taps/homebrew/homebrew-core/Formula/f/fontconfig.rb"
brew install pkg-config ruby cmake ninja
brew install cairo coreutils fontconfig gettext giflib gtk+3 jpeg libpng libspiro libtiff libtool libuninameslist python@3 wget woff2
PREFIX=$GITHUB_WORKSPACE/target
Expand Down
2 changes: 1 addition & 1 deletion .github/workflows/scripts/ffappimagebuild.sh
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -45,6 +45,6 @@ export PATH=$(readlink -f ./squashfs-root/usr/bin):$PATH
rm $APPDIR/AppRun
install -m 755 $SCRIPT_BASE/../../../Packaging/AppDir/AppRun $APPDIR/AppRun # custom AppRun
ARCH=x86_64 ./squashfs-root/usr/bin/appimagetool -g $APPDIR/
find $APPDIR -executable -type f -exec ldd {} \; | grep " => /usr" | cut -d " " -f 2-3 | sort | uniq
find $APPDIR -executable -type f -exec ldd {} \; | grep " => /lib" | cut -d " " -f 2-3 | sort | uniq

mv FontForge*.AppImage FontForge-$(date +%Y-%m-%d)-$VERSION-x86_64.AppImage