remove win-arm64 experiments

balena-io · Jan 5, 2023 · 19df114 · 19df114
1 parent 81355b6
commit 19df114
Show file tree

Hide file tree

Showing 8 changed files with 125 additions and 152 deletions.
diff --git a/.github/actions/publish/action.yml b/.github/actions/publish/action.yml
@@ -15,10 +15,10 @@ inputs:
     default: "accounts+apple@balena.io"
   NODE_VERSION:
     type: string
-    default: "16.19.0"
+    default: "16.x"
   VERBOSE:
     type: string
-    default: "true"
+    default: "false"
 
 runs:
   # https://docs.github.com/en/actions/creating-actions/creating-a-composite-action
@@ -91,8 +91,6 @@ runs:
       run: |
         set -ea
 
-        [[ '${{ inputs.VERBOSE }}' =~ on|On|Yes|yes|true|True ]] && set -x
-
         branch="$(echo '${{ github.event.pull_request.head.ref }}' | sed 's/[^[:alnum:]]/-/g')"
 
         stdout="$(resinci-deploy store sentry \
@@ -102,6 +100,7 @@ runs:
           --org="$(yq e '.sentry.org' repo.yml)" \
           --type="$(yq e '.sentry.type' repo.yml)")"
 
+        echo "::add-mask::${stdout}"
         echo "dsn=$(echo "${stdout}" | tail -n 1)" >> $GITHUB_OUTPUT
 
       env:
@@ -180,22 +179,13 @@ runs:
             for arch in ${archs[*]}; do
                 # (re)build|pack for all non-x64 architectures
                 if ! [[ "$arch" =~ x64 ]]; then
-                    # FIXME: remove when Node.js win-arm64 support ships
-                    # https://github.com/nodejs/build/issues/2450#issuecomment-1367786829
-                    if [[ "$runner_os" =~ win ]] && [[ "$arch" =~ arm64 ]]; then
-                        find "$(dirname $(which node))/.." -type f -name node-gyp.js \
-                          | xargs -I{} node {} install \
-                          --dist-url=https://unofficial-builds.nodejs.org/download/release
-                    fi
-
                     npm ci
-
-                    find node_modules -type d \( -name 'prebuilds' -o -name 'deps' \) \
-                      | xargs -L1 -I{} find {} -type f
-
                     npm run build
                 fi
 
+                find node_modules -type d \( -name 'prebuilds' -o -name 'deps' \) \
+                  | xargs -L1 -I{} find {} -type f
+
                 electron-builder "--${ELECTRON_BUILDER_OS}" "${target}" "--${arch}" \
                   --c.extraMetadata.analytics.sentry.token='${{ steps.sentry.outputs.dsn }}' \
                   --c.extraMetadata.analytics.mixpanel.token='balena-etcher' \
@@ -214,9 +204,6 @@ runs:
         # https://github.blog/2020-08-03-github-actions-improvements-for-fork-and-pull-request-workflows/#improvements-for-public-repository-forks
         # https://docs.github.com/en/actions/managing-workflow-runs/approving-workflow-runs-from-public-forks#about-workflow-runs-from-public-forks
         CSC_FOR_PULL_REQUEST: true
-        # https://www.electron.build/#debug
-        DEBUG: electron-builder
-        NPM_CONFIG_loglevel: verbose
 
     # https://www.electron.build/auto-update.html#staged-rollouts
     - name: Configure staged rollout(s)

diff --git a/.github/actions/test/action.yml b/.github/actions/test/action.yml
@@ -12,10 +12,10 @@ inputs:
   # --- custom environment
   NODE_VERSION:
     type: string
-    default: "16.19.0"
+    default: "16.x"
   VERBOSE:
     type: string
-    default: "true"
+    default: "false"
 
 runs:
   # https://docs.github.com/en/actions/creating-actions/creating-a-composite-action
@@ -54,7 +54,6 @@ runs:
       env:
         # https://www.electronjs.org/docs/latest/api/environment-variables
         ELECTRON_NO_ATTACH_CONSOLE: true
-        NPM_CONFIG_loglevel: verbose
 
     - name: Compress custom source
       shell: pwsh