From 59c0d4205e15b8ca7d7fa4b1ddc77825eaf71f06 Mon Sep 17 00:00:00 2001
From: Nick Schonning <nschonni@gmail.com>
Date: Fri, 11 Dec 2020 01:38:06 -0500
Subject: [PATCH] chore: Windows x86 on GitHub Actions

---
 .github/workflows/windows.yml |   9 ++-
 appveyor.yml                  | 137 ----------------------------------
 2 files changed, 7 insertions(+), 139 deletions(-)
 delete mode 100644 appveyor.yml

diff --git a/.github/workflows/windows.yml b/.github/workflows/windows.yml
index 799ca57df..f53c4891f 100644
--- a/.github/workflows/windows.yml
+++ b/.github/workflows/windows.yml
@@ -19,6 +19,10 @@ jobs:
           - 15
           - 16
 
+        architecture:
+          - x64
+          - x86
+
         include:
           - node: 12
             os: windows-2016
@@ -36,9 +40,10 @@ jobs:
         uses: actions/setup-node@v2.4.0
         with:
           node-version: ${{ matrix.node }}
+          architecture: ${{ matrix.architecture }}
 
       - name: Install packages
-        run: npm install --unsafe-perm
+        run: npm install
         env:
           SKIP_SASS_BINARY_DOWNLOAD_FOR_CI: true
 
@@ -48,7 +53,7 @@ jobs:
       - uses: actions/upload-artifact@v2
         if: github.repository_owner == 'sass' && github.event_name != 'pull_request'
         with:
-          name: ${{ matrix.node }}
+          name: ${{ matrix.node }}-${{ matrix.architecture }}
           path: |
             vendor/**/binding.node
             build/Release/binding.pdb
diff --git a/appveyor.yml b/appveyor.yml
deleted file mode 100644
index 540a5f61e..000000000
--- a/appveyor.yml
+++ /dev/null
@@ -1,137 +0,0 @@
--
-  branches:
-    only:
-      - release
-      - /v\d\.\d\.\d/
-    except:
-      - master
-
-  os: Visual Studio 2017
-
-  configuration: release
-
-  platform:
-    - x86
-
-  version: "{build}"
-
-  build: off
-
-  clone_folder: c:\projects\node_modules\node-sass
-
-  # http://www.wintellect.com/devcenter/jrobbins/pdb-files-what-every-developer-must-know
-  # http://help.appveyor.com/discussions/kb/32-how-to-build-on-logical-drive-created-by-subst
-  init:
-    - cmd: >-
-        subst s: c:\projects
-    - ps: set-location -path s:\node_modules\node-sass
-
-  cache:
-    - '%userprofile%\.node-gyp'
-    - '%AppData%\npm-cache'
-
-  environment:
-    SKIP_SASS_BINARY_DOWNLOAD_FOR_CI: true
-    matrix:
-      - nodejs_version: 12
-        GYP_MSVS_VERSION: 2017
-        APPVEYOR_BUILD_WORKER_IMAGE: Visual Studio 2017
-      - nodejs_version: 14
-        GYP_MSVS_VERSION: 2017
-        APPVEYOR_BUILD_WORKER_IMAGE: Visual Studio 2017
-      - nodejs_version: 15
-        GYP_MSVS_VERSION: 2019
-        APPVEYOR_BUILD_WORKER_IMAGE: Visual Studio 2019
-      - nodejs_version: 16
-        GYP_MSVS_VERSION: 2019
-        APPVEYOR_BUILD_WORKER_IMAGE: Visual Studio 2019
-
-  install:
-    # https://www.appveyor.com/docs/lang/nodejs-iojs/#installing-any-version-of-nodejs-or-iojs
-    - ps: Update-NodeJsInstallation (Get-NodeJsLatestBuild $env:nodejs_version) $env:platform
-    - node --version
-    - npm --version
-    - npm install
-
-  test: off
-
-  before_deploy:
-    # Save artifacts with full qualified names of binding.node and binding.pdb
-    # (which we use in node-sass-binaries repo)
-    - ps: >-
-        Get-ChildItem .\vendor\**\*.node | % {
-           ( $BindingName = $_.FullName ).Split('\\') |
-             Select-Object -Last 2 | Select-Object -First 1 } |
-               .{ process { (
-                  @( $BindingName,
-                       ( ( $_, "binding.node" ) -join '_' ) ),
-                  @( ".\build\Release\binding.pdb",
-                       ( ( $_, "binding.pdb" ) -join '_' ) )
-               ) } } | % { Push-AppveyorArtifact $_[0] -FileName $_[1] }
-
-  deploy:
-    - provider: GitHub
-      description: $(APPVEYOR_REPO_COMMIT_MESSAGE_EXTENDED)
-      artifact:
-      auth_token:
-        secure: IZIifH990iABY3PQUtkRscTU/NOyYYwptGB6B1y2b618vpphV/2KD/4IWJzSAYAi
-      on:
-        appveyor_repo_tag: true       # deploy on tag push only
-
--
-  branches:
-    except:
-      - release
-      - /v\d\.\d\.\d/
-
-  skip_branch_with_pr: true
-  skip_tags: true
-
-  os: Visual Studio 2017
-
-  configuration: testing
-
-  platform:
-    - x86
-
-  version: "{build}"
-
-  build: off
-
-  clone_folder: c:\projects\node_modules\node-sass
-
-  init:
-    - cmd: >-
-        subst s: c:\projects
-    - ps: set-location -path s:\node_modules\node-sass
-
-  cache:
-    - '%userprofile%\.node-gyp'
-    - '%AppData%\npm-cache'
-
-  environment:
-    SKIP_SASS_BINARY_DOWNLOAD_FOR_CI: true
-    matrix:
-      - nodejs_version: 12
-        GYP_MSVS_VERSION: 2017
-        APPVEYOR_BUILD_WORKER_IMAGE: Visual Studio 2017
-      - nodejs_version: 14
-        GYP_MSVS_VERSION: 2017
-        APPVEYOR_BUILD_WORKER_IMAGE: Visual Studio 2017
-      - nodejs_version: 15
-        GYP_MSVS_VERSION: 2019
-        APPVEYOR_BUILD_WORKER_IMAGE: Visual Studio 2019
-      - nodejs_version: 16
-        GYP_MSVS_VERSION: 2019
-        APPVEYOR_BUILD_WORKER_IMAGE: Visual Studio 2019
-
-  install:
-    # https://www.appveyor.com/docs/lang/nodejs-iojs/#installing-any-version-of-nodejs-or-iojs
-    - ps: Update-NodeJsInstallation (Get-NodeJsLatestBuild $env:nodejs_version) $env:platform
-    - node --version
-    - npm --version
-    - npm install
-
-  test_script:
-    - ps: set-location -path c:\projects\node_modules\node-sass
-    - npm test