Merge branch 'clearnet' into react-refactor

winter0019 · Oct 8, 2020 · 4d991d3 · 4d991d3
2 parents 599b2e6 + dfff6c2
commit 4d991d3
Show file tree

Hide file tree

Showing 291 changed files with 10,665 additions and 27,711 deletions.
diff --git a/.github/workflows/pull-request.yml b/.github/workflows/pull-request.yml
@@ -28,11 +28,12 @@ jobs:
       - name: Pull git submodules
         run: git submodule update --init
 
-      - name: Install file server dependency
-        run: |
-          cd session-file-server
-          yarn install;
-          cd -
+      # file server dependencies are not needed for now
+      # - name: Install file server dependency
+      #   run: |
+      #     cd session-file-server
+      #     yarn install;
+      #     cd -
 
       - name: Install node
         uses: actions/setup-node@v1
@@ -47,19 +48,24 @@ jobs:
           npm config set python python2.7
           npm config set msvs_version 2015
 
-      - name: Install yarn
-        run: npm install yarn --no-save
+      - uses: actions/cache@v2
+        id: yarn-cache
+        with:
+          path: '**/node_modules'
+          key: ${{ runner.os }}-modules-${{ hashFiles('**/yarn.lock') }}
 
-      - name: Install Dependencies
-        run: yarn install --frozen-lockfile
+      - name: Install Dependencies  #skipped if step before set variable to true
+        if: |
+          steps.yarn-cache.outputs.cache-hit != 'true'
+        run: yarn install --frozen-lockfile --prefer-offline
 
       - name: Generate and concat files
         run: yarn generate
 
       - name: Lint Files
         if: runner.os != 'Windows'
         run: |
-          yarn format-full
+          yarn format-full-check
           yarn eslint
           yarn tslint
 

diff --git a/CONTRIBUTING.md b/CONTRIBUTING.md
@@ -40,7 +40,7 @@ Then you need `git`, if you don't have that yet: https://git-scm.com/
       https://www.microsoft.com/en-us/download/details.aspx?id=40773
     * Install Windows SDK version 8.1: https://developer.microsoft.com/en-us/windows/downloads/sdk-archive
 1.  Install _Windows Build Tools_: Open the [Command Prompt (`cmd.exe`) as Administrator](<https://technet.microsoft.com/en-us/library/cc947813(v=ws.10).aspx>)
-    and run: `npm install --global --production --add-python-to-path windows-build-tools`
+    and run: `npm install --vs2015 --global --production --add-python-to-path windows-build-tools`
 
 ### Linux