Fix ci.

Author: garretrieger

.github/workflows/ci.yml

@@ -7,12 +7,6 @@ jobs:
     steps:
       - uses: actions/checkout@master
 
-      - name: Mount bazel cache
-        uses: actions/cache@v1
-        with:
-          path: "/home/runner/.cache/bazel"
-          key: bazel
-
       - name: Install bazelisk
         run: |
           curl -LO "https://github.com/bazelbuild/bazelisk/releases/download/v1.1.0/bazelisk-linux-amd64"

ift/client/fontations_client.cc

@@ -115,9 +115,9 @@ Status ToGraph(const Encoder& encoder, const FontData& base, graph& out) {
   return absl::OkStatus();
 }
 
-StatusOr<FontData> Extend(const Encoder& encoder, const FontData& base,
-                          btree_set<uint32_t> codepoints,
-                          flat_hash_map<hb_tag_t, AxisRange> design_space) {
+StatusOr<FontData> ExtendWithDesignSpace(const Encoder& encoder, const FontData& base,
+                                         btree_set<uint32_t> codepoints,
+                                         flat_hash_map<hb_tag_t, AxisRange> design_space) {
   auto font_path_str = WriteFontToDisk(encoder, base);
   if (!font_path_str.ok()) {
     return font_path_str.status();
@@ -139,7 +139,7 @@ StatusOr<FontData> Extend(const Encoder& encoder, const FontData& base,
   std::stringstream ds_ss;
   for (const auto& [tag, range] : design_space) {
     char tag_string[5] = {'a', 'a', 'a', 'a', 0};
-    sprintf(tag_string, "%c%c%c%c", HB_UNTAG(tag));
+    snprintf(tag_string, 5, "%c%c%c%c", HB_UNTAG(tag));
 
     ds_ss << tag_string << "@" << range.start();
     if (range.IsRange()) {
@@ -165,4 +165,11 @@ StatusOr<FontData> Extend(const Encoder& encoder, const FontData& base,
   return FontData(make_hb_blob(hb_blob_create_from_file(output.c_str())));
 }
 
+StatusOr<FontData> Extend(const ift::encoder::Encoder& encoder,
+                          const common::FontData& ift_font,
+                          absl::btree_set<uint32_t> codepoints) {
+  absl::flat_hash_map<hb_tag_t, common::AxisRange> design_space;
+  return ExtendWithDesignSpace(encoder, ift_font, codepoints, design_space);
+}
+
 }  // namespace ift::client

ift/client/fontations_client.h

@@ -28,17 +28,14 @@ absl::Status ToGraph(const ift::encoder::Encoder& encoder,
  * Runs 'ift_extend' on the IFT font created by encoder and returns the
  * resulting extended font.
  */
-absl::StatusOr<common::FontData> Extend(
+absl::StatusOr<common::FontData> ExtendWithDesignSpace(
     const ift::encoder::Encoder& encoder, const common::FontData& ift_font,
     absl::btree_set<uint32_t> codepoints,
     absl::flat_hash_map<hb_tag_t, common::AxisRange> design_space);
 
 absl::StatusOr<common::FontData> Extend(const ift::encoder::Encoder& encoder,
                                         const common::FontData& ift_font,
-                                        absl::btree_set<uint32_t> codepoints) {
-  absl::flat_hash_map<hb_tag_t, common::AxisRange> design_space;
-  return Extend(encoder, ift_font, codepoints, design_space);
-}
+                                        absl::btree_set<uint32_t> codepoints);
 
 }  // namespace ift::client
 

ift/integration_test.cc

@@ -29,6 +29,7 @@ using common::make_hb_blob;
 using common::make_hb_face;
 using common::make_hb_set;
 using ift::client::Extend;
+using ift::client::ExtendWithDesignSpace;
 using ift::encoder::Encoder;
 using ift::proto::PatchEncoding;
 using ift::proto::PatchMap;
@@ -470,7 +471,7 @@ TEST_F(IntegrationTest, SharedBrotli_DesignSpaceAugmentation) {
   };
   ASSERT_EQ(*ds, expected_ds);
 
-  auto extended = Extend(encoder, *encoded, {'b'},
+  auto extended = ExtendWithDesignSpace(encoder, *encoded, {'b'},
                          {{HB_TAG('w', 'd', 't', 'h'), AxisRange::Point(80)}});
   ASSERT_TRUE(extended.ok()) << extended.status();
   auto extended_face = extended->face();