Merge branch 'master' into feature/rounded-images

.ci/esy-build-steps.yml

@@ -1,8 +1,8 @@
 # Cross-platform set of build steps for building esy projects
 
 steps:
-  - script: npm install -g [email protected].2
-    displayName: 'npm install -g [email protected].2'
+  - script: npm install -g [email protected].4
+    displayName: 'npm install -g [email protected].4'
   - script: esy install
     displayName: 'esy install'
   - script: esy build
@@ -11,3 +11,13 @@ steps:
     displayName: 'esy @test install'
   - script: esy @test run
     displayName: 'esy @test run'
+  - script: esy @examples install
+    displayName: 'esy @examples install'
+  - script: esy @examples x HarfbuzzCli
+    displayName: 'esy @examples x HarfbuzzCli'
+  - script: esy @examples x FontQuery -family=Arial
+    displayName: 'esy @examples x FontQuery -family=Arial'
+  - script: esy @examples x SkiaCli
+    displayName: '@esy @examples x SkiaCli'
+  - script: esy @examples x SkiaCli.bc
+    displayName: '@esy @examples x SkiaCli.bc'

.ci/esy-check-hygiene.yml

@@ -29,3 +29,5 @@ steps:
     displayName: esy format
   - script: git diff --exit-code
     displayName: 'check that formatting is correct. If this fails, run `esy format` and re-submit PR.'
+  - script: esy b dune build @check
+    displayName: 'esy b dune build @check'

.github/workflows/validate-pr.yml

@@ -7,10 +7,10 @@ jobs:
     name: Lint lockdir, generate opam files, autoformat
     runs-on: macos-latest
     steps:
-      - uses: actions/setup-node@v1
+      - uses: actions/setup-node@v1.4.2
         with:
           node-version: 12
-      - uses: actions/checkout@v1
+      - uses: actions/checkout@v2
       - name: Install esy
         run: npm install -g esy
       - name: Setup Git to push back
@@ -27,23 +27,25 @@ jobs:
           esy install -P bench
           esy install -P doc
           esy install -P js
-          (git diff --exit-code --cached && git diff --exit-code) || (git add *lock; git commit -m "Update lockdir, ")
+          git diff --exit-code || (git add *lock; git commit -m "Update lockdir, ")
       - name: Print esy cache
         id: print_esy_cache
         run: node .github/workflows/print_esy_cache.js
       - name: Try to restore dependencies cache
         id: deps-cache-macos
-        uses: actions/cache@v1
+        uses: actions/cache@v1.1.2
         with:
           path: ${{ steps.print_esy_cache.outputs.esy_cache }}
           key: macos-latest-${{ hashFiles('**/index.json') }}
+          restore-keys: |
+            macos-latest-
       - name: Build dependencies
         if: steps.deps-cache-macos.outputs.cache-hit != 'true'
         run: esy build-dependencies --release
       - name: Generate opam files
         run: |
           esy build dune build @check
-          (git diff --exit-code --cached && git diff --exit-code) || ([[ "$(git log -1 --pretty=format:'%an')" != "Github Runner" ]] && git commit -am "opam, " || git commit --amend -am "$(git log -1 --pretty=format:'%s')opam, ")
+          git diff --exit-code || ([[ "$(git log -1 --pretty=format:'%an')" != "Github Runner" ]] && git commit -am "opam, " || git commit --amend -am "$(git log -1 --pretty=format:'%s')opam, ")
       - name: format sources files
         run: |
           esy format || ([[ "$(git log -1 --pretty=format:'%an')" != "Github Runner" ]] && git commit -am "format, " || git commit --amend -am "$(git log -1 --pretty=format:'%s')format, ")
@@ -58,22 +60,28 @@ jobs:
           git status
           git log -2
           git diff
-      - uses: actions/github-script@0.3.0
+      - uses: actions/github-script@0.9.0
         if: github.event_name == 'pull_request'
         with:
           github-token: ${{secrets.GITHUB_TOKEN}}
           script: |
             if (require("child_process").execSync("git log -1 --pretty=format:'%an'") == "Github Runner")
-              github.issues.createComment({...context.issue, body: `I have updated your lock dirs and formatted the code. Please @${context.actor} pull the last commit before pushing any more changes.`});
+              github.issues.createComment({
+                issue_number: context.issue.number,
+                owner: context.repo.owner,
+                repo: context.repo.repo,
+                body: "I have updated your lock dirs and formatted the code.\n" +
+                  "Please @" + context.actor + " pull the last commit before pushing any more changes."
+              });
 
   doc:
     name: Push docs to GitHub's Pages
-    runs-on: [macos-latest]
+    runs-on: macos-latest
     steps:
-      - uses: actions/setup-node@v1
+      - uses: actions/setup-node@v1.4.2
         with:
           node-version: 12
-      - uses: actions/checkout@v1
+      - uses: actions/checkout@v2
       - name: Install esy
         run: npm install -g esy
       - run: brew install coreutils
@@ -84,10 +92,12 @@ jobs:
         run: node .github/workflows/print_esy_cache.js
       - name: Try to restore dependencies cache
         id: deps-cache-macos
-        uses: actions/cache@v1
+        uses: actions/cache@v1.1.2
         with:
           path: ${{ steps.print_esy_cache.outputs.esy_cache }}
-          key: macos-latest-4.08-${{ hashFiles('doc.esy.lock/index.json') }}
+          key: macos-latest-${{ hashFiles('**/index.json') }}
+          restore-keys: |
+            macos-latest-
       - name: Install doc dependencies
         if: steps.deps-cache-macos.outputs.cache-hit != 'true'
         run: esy @doc build-dependencies --release
@@ -128,10 +138,10 @@ jobs:
       matrix:
         os: [ubuntu-latest, macos-latest]
     steps:
-      - uses: actions/setup-node@v1
+      - uses: actions/setup-node@v1.4.2
         with:
           node-version: 12
-      - uses: actions/checkout@v1
+      - uses: actions/checkout@v2
       - name: Install esy
         run: npm install -g esy
       - name: Install native dependencies on ubuntu-latest
@@ -147,22 +157,29 @@ jobs:
       - name: Try to restore dependencies cache
         if: matrix.os != 'windows-latest'
         id: deps-cache-non-win
-        uses: actions/cache@v1
+        uses: actions/cache@v1.1.2
         with:
           path: ${{ steps.print_esy_cache.outputs.esy_cache }}
           key: ${{ matrix.os }}-${{ hashFiles('**/index.json') }}
+          restore-keys: |
+            ${{ matrix.os }}-
       - name: Try to restore dependencies cache
         if: matrix.os == 'windows-latest'
         id: deps-cache-win
-        uses: actions/cache@v1
+        uses: actions/cache@v1.1.2
         with:
           path: ${{ steps.print_esy_cache.outputs.esy_cache }}
           key: ${{ matrix.os }}-${{ hashFiles('**\index.json') }}
+          restore-keys: |
+            ${{ matrix.os }}-
       - name: Build dependencies
         if: steps.deps-cache-win.outputs.cache-hit != 'true' && steps.deps-cache-non-win.outputs.cache-hit != 'true'
         run: esy build-dependencies --release
       - name: Build
         run: esy build --release
       - name: Build test/dev dependencies
         if: steps.deps-cache-win.outputs.cache-hit != 'true' && steps.deps-cache-non-win.outputs.cache-hit != 'true'
-        run: esy build-dependencies
+        run: |
+          esy build-dependencies
+          # We might have used restore-keys
+          esy cleanup .

ReveryExamples.opam

@@ -0,0 +1,7 @@
+opam-version: "1.2"
+version: "dev"
+maintainer: "[email protected]"
+author: ["Bryan Phelps"]
+build: [
+
+]

azure-pipelines.yml

@@ -4,6 +4,21 @@
 # https://aka.ms/yaml
 
 name: $(Build.SourceVersion)
+
+# Master build triggers
+trigger: 
+- master
+
+# PR Triggers
+pr:
+  autoCancel: true
+  branches:
+    include: 
+    - master
+  paths:
+    exclude: 
+    - README.md
+
 jobs:
 - job: Linux
   timeoutInMinutes: 0