From 33d7b7173e39437c6286759c7ef1fc52551e0acf Mon Sep 17 00:00:00 2001
From: "John J. Camilleri" <john@digitalgrammars.com>
Date: Wed, 11 Nov 2020 21:37:12 +0100
Subject: [PATCH 1/7] Add build workflow

---
 .github/workflows/build.yml | 25 +++++++++++++++++++++++++
 1 file changed, 25 insertions(+)
 create mode 100644 .github/workflows/build.yml

diff --git a/.github/workflows/build.yml b/.github/workflows/build.yml
new file mode 100644
index 00000000..8b84ec00
--- /dev/null
+++ b/.github/workflows/build.yml
@@ -0,0 +1,25 @@
+name: Build
+
+on: [push, pull_request]
+
+jobs:
+  build:
+    runs-on: ubuntu-18.04
+
+    steps:
+    - uses: actions/checkout@v2
+
+    - name: Install GF
+      env:
+        GF_VERSION: 3.10-1
+      run: |
+        curl -s https://www.grammaticalframework.org/download/gf_${GF_VERSION}_amd64.deb -o gf.deb
+        dpkg -i gf.deb
+
+    - name: Build RGL
+      run: |
+        bash Setup.sh --dest=dist/ --gf= --verbose
+
+    # - uses: actions/upload-artifact@v2
+    #   with:
+    #     path: dist

From aa8840b61b5b7b4d3ce827fe395de444cf9dc12a Mon Sep 17 00:00:00 2001
From: "John J. Camilleri" <john@digitalgrammars.com>
Date: Wed, 11 Nov 2020 21:38:27 +0100
Subject: [PATCH 2/7] Add sudo to dpkg command

---
 .github/workflows/build.yml | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/.github/workflows/build.yml b/.github/workflows/build.yml
index 8b84ec00..417a1f92 100644
--- a/.github/workflows/build.yml
+++ b/.github/workflows/build.yml
@@ -14,7 +14,7 @@ jobs:
         GF_VERSION: 3.10-1
       run: |
         curl -s https://www.grammaticalframework.org/download/gf_${GF_VERSION}_amd64.deb -o gf.deb
-        dpkg -i gf.deb
+        sudo dpkg -i gf.deb
 
     - name: Build RGL
       run: |

From dd102142f58f1becb7d6ab89e4d66e2b4544ad6f Mon Sep 17 00:00:00 2001
From: "John J. Camilleri" <john@digitalgrammars.com>
Date: Wed, 11 Nov 2020 21:43:46 +0100
Subject: [PATCH 3/7] Specify --gf flag properly. Compress and upload artifact.

---
 .github/workflows/build.yml | 13 +++++++++----
 1 file changed, 9 insertions(+), 4 deletions(-)

diff --git a/.github/workflows/build.yml b/.github/workflows/build.yml
index 417a1f92..da76e6ce 100644
--- a/.github/workflows/build.yml
+++ b/.github/workflows/build.yml
@@ -18,8 +18,13 @@ jobs:
 
     - name: Build RGL
       run: |
-        bash Setup.sh --dest=dist/ --gf= --verbose
+        bash Setup.sh --dest=dist/ --gf=gf --verbose
 
-    # - uses: actions/upload-artifact@v2
-    #   with:
-    #     path: dist
+    - name: Create archive
+      run: |
+        tar --create --gzip --verbose --file dist.tar.gz dist/
+
+    - name: Upload artifact
+      uses: actions/upload-artifact@v2
+      with:
+        path: dist.tar.gz

From 6cedca7f4f050430763e4c15cf813f90e3e6a0e9 Mon Sep 17 00:00:00 2001
From: "John J. Camilleri" <john@digitalgrammars.com>
Date: Wed, 11 Nov 2020 21:50:16 +0100
Subject: [PATCH 4/7] dest cannot be same as dist

---
 .github/workflows/build.yml | 9 +++++----
 1 file changed, 5 insertions(+), 4 deletions(-)

diff --git a/.github/workflows/build.yml b/.github/workflows/build.yml
index da76e6ce..8231fab7 100644
--- a/.github/workflows/build.yml
+++ b/.github/workflows/build.yml
@@ -5,24 +5,25 @@ on: [push, pull_request]
 jobs:
   build:
     runs-on: ubuntu-18.04
+    env:
+      GF_VERSION: 3.10-1
+      DEST: out/
 
     steps:
     - uses: actions/checkout@v2
 
     - name: Install GF
-      env:
-        GF_VERSION: 3.10-1
       run: |
         curl -s https://www.grammaticalframework.org/download/gf_${GF_VERSION}_amd64.deb -o gf.deb
         sudo dpkg -i gf.deb
 
     - name: Build RGL
       run: |
-        bash Setup.sh --dest=dist/ --gf=gf --verbose
+        bash Setup.sh --dest=${DEST} --gf=gf --verbose
 
     - name: Create archive
       run: |
-        tar --create --gzip --verbose --file dist.tar.gz dist/
+        tar --create --gzip --verbose --file dist.tar.gz ${DEST}
 
     - name: Upload artifact
       uses: actions/upload-artifact@v2

From 7505813fa5f4d36274130c92be7e573b4aedb763 Mon Sep 17 00:00:00 2001
From: "John J. Camilleri" <john@digitalgrammars.com>
Date: Wed, 11 Nov 2020 21:58:45 +0100
Subject: [PATCH 5/7] Must make dest directory before copying to it

---
 .github/workflows/build.yml | 1 +
 Setup.sh                    | 2 +-
 2 files changed, 2 insertions(+), 1 deletion(-)

diff --git a/.github/workflows/build.yml b/.github/workflows/build.yml
index 8231fab7..616911cb 100644
--- a/.github/workflows/build.yml
+++ b/.github/workflows/build.yml
@@ -19,6 +19,7 @@ jobs:
 
     - name: Build RGL
       run: |
+        mkdir -p ${DEST}
         bash Setup.sh --dest=${DEST} --gf=gf --verbose
 
     - name: Create archive
diff --git a/Setup.sh b/Setup.sh
index 6e8c5e1f..7141f68f 100755
--- a/Setup.sh
+++ b/Setup.sh
@@ -97,4 +97,4 @@ done
 
 # Copy
 echo "Copying to ${dest}"
-cp -R -p "${dist}"/* "${dest}"
+cp -R "${dist}"/* "${dest}"

From 2d102d2549caee49d390a4262971ee840c82ccb4 Mon Sep 17 00:00:00 2001
From: "John J. Camilleri" <john@digitalgrammars.com>
Date: Wed, 11 Nov 2020 22:08:15 +0100
Subject: [PATCH 6/7] Don't archive files first, give a name to artifact

---
 .github/workflows/build.yml | 8 +++-----
 1 file changed, 3 insertions(+), 5 deletions(-)

diff --git a/.github/workflows/build.yml b/.github/workflows/build.yml
index 616911cb..53c66078 100644
--- a/.github/workflows/build.yml
+++ b/.github/workflows/build.yml
@@ -22,11 +22,9 @@ jobs:
         mkdir -p ${DEST}
         bash Setup.sh --dest=${DEST} --gf=gf --verbose
 
-    - name: Create archive
-      run: |
-        tar --create --gzip --verbose --file dist.tar.gz ${DEST}
-
     - name: Upload artifact
       uses: actions/upload-artifact@v2
       with:
-        path: dist.tar.gz
+        name: gf-rgl-${{ env.GITHUB_SHA }}
+        path: ${{ env.DEST }}
+        if-no-files-found: error

From aa3b6648f3589089b6825a4bc0e53caa4f6b6fe5 Mon Sep 17 00:00:00 2001
From: "John J. Camilleri" <john@digitalgrammars.com>
Date: Wed, 11 Nov 2020 22:11:16 +0100
Subject: [PATCH 7/7] Get SHA from github context, not environment

---
 .github/workflows/build.yml | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/.github/workflows/build.yml b/.github/workflows/build.yml
index 53c66078..e195c34e 100644
--- a/.github/workflows/build.yml
+++ b/.github/workflows/build.yml
@@ -25,6 +25,6 @@ jobs:
     - name: Upload artifact
       uses: actions/upload-artifact@v2
       with:
-        name: gf-rgl-${{ env.GITHUB_SHA }}
+        name: gf-rgl-${{ github.sha }}
         path: ${{ env.DEST }}
         if-no-files-found: error