fix windows build

oxen-io · May 4, 2021 · 930c4d5 · 930c4d5
1 parent 1a086db
commit 930c4d5
Show file tree

Hide file tree

Showing 6 changed files with 47 additions and 27 deletions.
diff --git a/.github/workflows/build-binaries.yml b/.github/workflows/build-binaries.yml
@@ -5,10 +5,11 @@ on:
   push:
     branches:
       - master
-      - development
       - clearnet
-      - github-actions
-      - react-refactor
+
+  pull_request:
+    branches:
+      - clearnet
 
 jobs:
   build:
@@ -30,15 +31,24 @@ jobs:
       - name: Install node
         uses: actions/setup-node@v1
         with:
-          node-version: 10.13.0
+          node-version: 10.19.0
+
+      - name: Chocolatey Install Action
+        if: runner.os == 'Windows'
+        uses: crazy-max/ghaction-chocolatey@v1.4.2
+        with:
+          args: install python2 visualcpp-build-tools -y
+
+      - name: Add msbuild to PATH
+        uses: microsoft/setup-msbuild@v1.0.2
+        if: runner.os == 'Windows'
 
       - name: Setup node for windows
         if: runner.os == 'Windows'
         run: |
-          npm install --global --production windows-build-tools@4.0.0
           npm install --global node-gyp@latest
           npm config set python python2.7
-          npm config set msvs_version 2015
+          npm config set msvs_version 2017
 
       - name: Install yarn
         run: npm install yarn --no-save

diff --git a/.github/workflows/pull-request.yml b/.github/workflows/pull-request.yml
@@ -4,10 +4,7 @@ name: Session Test
 on:
   pull_request:
     branches:
-      - development
       - clearnet
-      - github-actions
-      - react-refactor
 
 jobs:
   build:
@@ -28,38 +25,41 @@ jobs:
       - name: Pull git submodules
         run: git submodule update --init
 
-      # 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
         with:
-          node-version: 10.13.0
+          node-version: 10.19.0
+
+      - name: Chocolatey Install Action
+        if: runner.os == 'Windows'
+        uses: crazy-max/ghaction-chocolatey@v1.4.2
+        with:
+          args: install python2 visualcpp-build-tools -y
+
+      #Not having this will break the windows build because the PATH won't be set by msbuild.
+      - name: Add msbuild to PATH
+        uses: microsoft/setup-msbuild@v1.0.2
+        if: runner.os == 'Windows'
 
       - name: Setup node for windows
         if: runner.os == 'Windows'
         run: |
-          npm install --global --production windows-build-tools@4.0.0
           npm install --global node-gyp@latest
           npm config set python python2.7
-          npm config set msvs_version 2015
+          npm config set msvs_version 2017
 
       - uses: actions/cache@v2
         id: yarn-cache
+        if: runner.os != 'Windows'
         with:
           path: '**/node_modules'
           key: ${{ runner.os }}-modules-${{ hashFiles('**/yarn.lock') }}
 
-      - name: Install Dependencies  #skipped if step before set variable to true
+      - name: Install Dependencies #skipped if step before set variable to true
         if: |
           steps.yarn-cache.outputs.cache-hit != 'true'
         run: yarn install --frozen-lockfile --network-timeout 600000
 
-
       - name: Generate and concat files
         run: yarn generate
 

diff --git a/.github/workflows/release.yml b/.github/workflows/release.yml
@@ -26,15 +26,24 @@ jobs:
       - name: Install node
         uses: actions/setup-node@v1
         with:
-          node-version: 10.13.0
+          node-version: 10.19.0
+
+      - name: Chocolatey Install Action
+        if: runner.os == 'Windows'
+        uses: crazy-max/ghaction-chocolatey@v1.4.2
+        with:
+          args: install python2 visualcpp-build-tools -y
+
+      - name: Add msbuild to PATH
+        uses: microsoft/setup-msbuild@v1.0.2
+        if: runner.os == 'Windows'
 
       - name: Setup node for windows
         if: runner.os == 'Windows'
         run: |
-          npm install --global --production windows-build-tools@4.0.0
           npm install --global node-gyp@latest
           npm config set python python2.7
-          npm config set msvs_version 2015
+          npm config set msvs_version 2017
 
       - name: Install yarn
         run: npm install yarn --no-save

diff --git a/.nvmrc b/.nvmrc
@@ -1 +1 @@
-10.13.0
+10.19.0
diff --git a/ts/components/session/conversation/SessionRightPanel.tsx b/ts/components/session/conversation/SessionRightPanel.tsx
@@ -307,6 +307,7 @@ class SessionRightPanel extends React.Component<Props, State> {
 
         <MediaGallery documents={documents} media={media} onItemClick={onItemClick} />
         {isGroup && (
+          // tslint:disable-next-line: use-simple-attributes
           <SessionButton
             text={leaveGroupString}
             buttonColor={SessionButtonColor.Danger}

diff --git a/yarn.lock b/yarn.lock
@@ -229,9 +229,9 @@
   resolved "https://registry.yarnpkg.com/@iconify/react/-/react-1.1.3.tgz#ebe4d3e5f5dea23cd6a9634acd7a0a25c7414a59"
   integrity sha512-ReZNJyr89AfED6XZIXkhsJiNv2taT3j1cTo1HVPHMsrKOz6gAYdXtD2kDWF6+GVoFUxpmnO0fMcA6yCyTf6Tow==
 
-"@journeyapps/sqlcipher@https://github.com/scottnonnenberg-signal/node-sqlcipher.git#b10f232fac62ba7f8775c9e086bb5558fe7d948b":
+"@journeyapps/sqlcipher@https://github.com/Bilb/node-sqlcipher.git#790f8857feb80584f78c52b32eadaf6be2d899a8":
   version "4.0.0"
-  resolved "https://github.com/scottnonnenberg-signal/node-sqlcipher.git#b10f232fac62ba7f8775c9e086bb5558fe7d948b"
+  resolved "https://github.com/Bilb/node-sqlcipher.git#790f8857feb80584f78c52b32eadaf6be2d899a8"
   dependencies:
     nan "^2.12.1"
     node-pre-gyp "^0.11.0"