From e0c8c34ca8b2212f8058e83b30720cc47f775ad4 Mon Sep 17 00:00:00 2001
From: Ronald Tse <ronald.tse@ribose.com>
Date: Tue, 24 Mar 2020 20:56:44 +0800
Subject: [PATCH] Clean up GHA flow

---
 .github/workflows/macos.yml   | 65 -----------------------------------
 .github/workflows/release.yml |  7 ++--
 .github/workflows/ubuntu.yml  | 21 ++---------
 3 files changed, 5 insertions(+), 88 deletions(-)
 delete mode 100644 .github/workflows/macos.yml

diff --git a/.github/workflows/macos.yml b/.github/workflows/macos.yml
deleted file mode 100644
index bde15d3..0000000
--- a/.github/workflows/macos.yml
+++ /dev/null
@@ -1,65 +0,0 @@
-name: macos
-
-on:
-  push:
-    branches:
-      - master
-  pull_request:
-
-jobs:
-  build:
-    runs-on: macos-latest
-    steps:
-      - name: Set up JDK 1.8
-        uses: actions/setup-java@v1
-        with:
-          java-version: 1.8
-
-      # cabextract for fonts
-      - name: Setup prerequisites
-        run: |
-          # Install Maven
-          brew install maven
-
-          # Install p7zip
-          brew install p7zip
-          # Install cabextract
-          brew install cabextract
-
-      - uses: actions/checkout@master
-
-      - name: Install Microsoft Vista fonts
-        run: |
-          export MN_PDF_FONT_PATH=${GITHUB_WORKSPACE}/fonts
-          export MS_FONT_PATH=${MN_PDF_FONT_PATH}/truetype/vista
-          export RENAME_FONTS=false
-          curl -Ls https://raw.githubusercontent.com/metanorma/vista-fonts-installer/master/vista-fonts-installer.sh | bash
-
-      - name: Install System Fonts
-        run: |
-          export MN_PDF_FONT_PATH=${GITHUB_WORKSPACE}/fonts
-          mkdir -p ${MN_PDF_FONT_PATH}/truetype/msttcorefonts
-          ls -alR /System/Library/Fonts
-          ln -s /System/Library/Fonts/Supplemental/Arial.ttf ${MN_PDF_FONT_PATH}/truetype/msttcorefonts/arial.ttf
-          ln -s /System/Library/Fonts/Supplemental/Arial\ Bold.ttf ${MN_PDF_FONT_PATH}/truetype/msttcorefonts/arialbd.ttf
-          ln -s /System/Library/Fonts/Supplemental/Arial\ Italic.ttf ${MN_PDF_FONT_PATH}/truetype/msttcorefonts/ariali.ttf
-          ln -s /System/Library/Fonts/Supplemental/Arial\ Bold\ Italic.ttf ${MN_PDF_FONT_PATH}/truetype/msttcorefonts/arialbi.ttf
-          ln -s /System/Library/Fonts/Supplemental/Times\ New\ Roman.ttf ${MN_PDF_FONT_PATH}/truetype/msttcorefonts/times.ttf
-          ln -s /System/Library/Fonts/Supplemental/Times\ New\ Roman\ Bold.ttf ${MN_PDF_FONT_PATH}/truetype/msttcorefonts/timesbd.ttf
-          ln -s /System/Library/Fonts/Supplemental/Times\ New\ Roman\ Italic.ttf ${MN_PDF_FONT_PATH}/truetype/msttcorefonts/timesi.ttf
-          ln -s /System/Library/Fonts/Supplemental/Times\ New\ Roman\ Bold\ Italic.ttf ${MN_PDF_FONT_PATH}/truetype/msttcorefonts/timesbi.ttf
-          ln -s /System/Library/Fonts/Supplemental/Courier\ New.ttf ${MN_PDF_FONT_PATH}/truetype/msttcorefonts/cour.ttf
-          ln -s /System/Library/Fonts/Supplemental/Courier\ New\ Bold.ttf ${MN_PDF_FONT_PATH}/truetype/msttcorefonts/courbd.ttf
-          ln -s /System/Library/Fonts/Supplemental/Courier\ New\ Bold\ Italic.ttf ${MN_PDF_FONT_PATH}/truetype/msttcorefonts/courbi.ttf
-          ln -s /System/Library/Fonts/Supplemental/Courier\ New\ Italic.ttf ${MN_PDF_FONT_PATH}/truetype/msttcorefonts/couri.ttf
-          ls -alR ${MN_PDF_FONT_PATH}
-
-      - name: Build
-        run: |
-          make all
-
-      - name: Run tests
-        run: |
-          export MN_PDF_FONT_PATH=${GITHUB_WORKSPACE}/fonts
-          ls -alR ${MN_PDF_FONT_PATH}
-          make test
diff --git a/.github/workflows/release.yml b/.github/workflows/release.yml
index a7461c5..a7ac334 100644
--- a/.github/workflows/release.yml
+++ b/.github/workflows/release.yml
@@ -12,13 +12,12 @@ jobs:
     runs-on: ubuntu-latest
     steps:
 
-      # cabextract for fonts
+      - uses: actions/checkout@master
+
       - name: Setup prerequisites
         run: |
           sudo apt-get update
-          sudo apt-get -y install cabextract p7zip-full libxml2-utils
-
-      - uses: actions/checkout@master
+          sudo apt-get -y install p7zip-full
 
       - name: Build
         run: |
diff --git a/.github/workflows/ubuntu.yml b/.github/workflows/ubuntu.yml
index a5896ae..908da13 100644
--- a/.github/workflows/ubuntu.yml
+++ b/.github/workflows/ubuntu.yml
@@ -10,29 +10,12 @@ jobs:
   build:
     runs-on: ubuntu-latest
     steps:
-      - name: Set up JDK 1.8
-        uses: actions/setup-java@v1
-        with:
-          java-version: 1.8
+      - uses: actions/checkout@master
 
-      # cabextract for fonts
       - name: Setup prerequisites
         run: |
           sudo apt-get update
-          sudo apt-get -y install cabextract p7zip-full libxml2-utils
-
-          # Install fonts
-          sudo apt-get -y install fonts-freefont-ttf
-
-          # If necessary
-          echo ttf-mscorefonts-installer msttcorefonts/accepted-mscorefonts-eula select true | sudo debconf-set-selections
-          sudo apt-get install ttf-mscorefonts-installer
-
-      - name: Setup Cambria fonts
-        run: |
-          curl -Ls https://raw.githubusercontent.com/metanorma/vista-fonts-installer/master/vista-fonts-installer.sh | sudo bash
-
-      - uses: actions/checkout@master
+          sudo apt-get -y install p7zip-full
 
       - name: Build
         run: |