Skip to content

Commit

Permalink
Fix Linux font installation with proper NotoColorEmoji-Regular.ttf
Browse files Browse the repository at this point in the history
* remove package caching
* fix test case to be windows dependent
  • Loading branch information
lahma authored and tonyqus committed Aug 31, 2023
1 parent 40bdeef commit 79ba9e7
Show file tree
Hide file tree
Showing 5 changed files with 11 additions and 35 deletions.
14 changes: 0 additions & 14 deletions .github/workflows/CI.yml
Original file line number Diff line number Diff line change
Expand Up @@ -29,13 +29,6 @@ jobs:
timeout-minutes: 20
steps:
- uses: actions/checkout@v3
- name: 'Cache: .nuke/temp, ~/.nuget/packages'
uses: actions/cache@v3
with:
path: |
.nuke/temp
~/.nuget/packages
key: ${{ runner.os }}-${{ hashFiles('**/global.json', '**/*.csproj', '**/Directory.Packages.props') }}
- name: 'Run: Clean, Test, Pack'
run: ./build.cmd Clean Test Pack
- name: 'Publish: artifacts'
Expand All @@ -49,13 +42,6 @@ jobs:
timeout-minutes: 20
steps:
- uses: actions/checkout@v3
- name: 'Cache: .nuke/temp, ~/.nuget/packages'
uses: actions/cache@v3
with:
path: |
.nuke/temp
~/.nuget/packages
key: ${{ runner.os }}-${{ hashFiles('**/global.json', '**/*.csproj', '**/Directory.Packages.props') }}
- name: 'Run: Clean, Test, Pack'
run: ./build.cmd Clean Test Pack
- name: 'Publish: artifacts'
Expand Down
14 changes: 0 additions & 14 deletions .github/workflows/PR.yml
Original file line number Diff line number Diff line change
Expand Up @@ -25,13 +25,6 @@ jobs:
timeout-minutes: 20
steps:
- uses: actions/checkout@v3
- name: 'Cache: .nuke/temp, ~/.nuget/packages'
uses: actions/cache@v3
with:
path: |
.nuke/temp
~/.nuget/packages
key: ${{ runner.os }}-${{ hashFiles('**/global.json', '**/*.csproj', '**/Directory.Packages.props') }}
- name: 'Run: Clean, Test, Pack'
run: ./build.cmd Clean Test Pack
- name: 'Publish: artifacts'
Expand All @@ -45,13 +38,6 @@ jobs:
timeout-minutes: 20
steps:
- uses: actions/checkout@v3
- name: 'Cache: .nuke/temp, ~/.nuget/packages'
uses: actions/cache@v3
with:
path: |
.nuke/temp
~/.nuget/packages
key: ${{ runner.os }}-${{ hashFiles('**/global.json', '**/*.csproj', '**/Directory.Packages.props') }}
- name: 'Run: Clean, Test, Pack'
run: ./build.cmd Clean Test Pack
- name: 'Publish: artifacts'
Expand Down
7 changes: 5 additions & 2 deletions build/Build.GitHubAction.cs
Original file line number Diff line number Diff line change
@@ -1,18 +1,21 @@
using System;
using Nuke.Common.CI.GitHubActions;

[GitHubActions("CI",
GitHubActionsImage.WindowsLatest,
GitHubActionsImage.UbuntuLatest,
OnPushBranches = new[] { "main", "master" },
InvokedTargets = new[] { nameof(Clean), nameof(Test), nameof(Pack) },
TimeoutMinutes = 20
TimeoutMinutes = 20,
CacheKeyFiles = new string[0]
)]
[GitHubActions("PR",
GitHubActionsImage.WindowsLatest,
GitHubActionsImage.UbuntuLatest,
On = new [] { GitHubActionsTrigger.PullRequest },
InvokedTargets = new[] { nameof(Clean), nameof(Test), nameof(Pack) },
TimeoutMinutes = 20
TimeoutMinutes = 20,
CacheKeyFiles = new string[0]
)]
partial class Build
{
Expand Down
10 changes: 5 additions & 5 deletions build/Build.cs
Original file line number Diff line number Diff line change
Expand Up @@ -103,11 +103,11 @@ static void DeleteCompilationArtifacts()
.OnlyWhenDynamic(() => RuntimeInformation.IsOSPlatform(OSPlatform.Linux) && Host is GitHubActions)
.Executes(() =>
{
ProcessTasks.StartProcess("sudo", "apt install -y fonts-noto-color-emoji");
ProcessTasks.StartProcess("mkdir", "-p /usr/local/share/fonts");
ProcessTasks.StartProcess("cp", "/usr/share/fonts/truetype/noto/NotoColorEmoji.ttf /usr/local/share/fonts/");
ProcessTasks.StartProcess("chmod", "644 /usr/local/share/fonts/NotoColorEmoji.ttf");
ProcessTasks.StartProcess("fc-cache", "-fv");
static void StartSudoProcess(string arguments) => ProcessTasks.StartProcess("sudo", arguments).WaitForExit();

// replace broken font - the one coming from APT doesn't contain all expected tables
StartSudoProcess("rm /usr/share/fonts/truetype/noto/NotoColorEmoji.ttf");
StartSudoProcess("curl -sS -L -o /usr/share/fonts/truetype/noto/NotoColorEmoji-Regular.ttf https://fonts.gstatic.com/s/notocoloremoji/v25/Yq6P-KqIXTD0t4D9z1ESnKM3-HpFab5s79iz64w.ttf");
});

Target Pack => _ => _
Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -142,6 +142,7 @@ public void isAllColumnsTracked() {
}

[Test]
[Platform("Win")]
public void updateColumnWidths_and_getBestFitColumnWidth() {
tracker.TrackAllColumns();
IRow row1 = sheet.CreateRow(0);
Expand Down

0 comments on commit 79ba9e7

Please sign in to comment.