Merge branch 'master' into i18n-conflict-resolve

RoderickQiu · Dec 6, 2022 · 81150c0 · 81150c0
2 parents e84d5cf + 14aeb00
commit 81150c0
Show file tree

Hide file tree

Showing 11 changed files with 204 additions and 172 deletions.
diff --git a/.github/actions/always/action.yml b/.github/actions/always/action.yml
diff --git a/.github/actions/finalize/action.yml b/.github/actions/finalize/action.yml
diff --git a/.github/actions/publish/action.yml b/.github/actions/publish/action.yml
@@ -172,6 +172,7 @@ runs:
         for target in ${TARGETS}; do
             electron-builder ${ELECTRON_BUILDER_OS} ${target} ${ARCHITECTURE_FLAGS} \
               --c.extraMetadata.analytics.sentry.token='${{ steps.sentry.outputs.dsn }}' \
+              --c.extraMetadata.analytics.mixpanel.token='balena-etcher' \
               --c.extraMetadata.packageType="${target}"
 
             find dist -type f -maxdepth 1
@@ -205,33 +206,9 @@ runs:
           -name "latest*.yml" \
           -exec yq -i e .stagingPercentage=\"$percentage\" {} \;
 
-    # https://github.com/softprops/action-gh-release#-customizing
-    - name: Create draft GitHub (pre)release
-      uses: softprops/action-gh-release@v1
-      with:
-        # use PR branch name for draft releases
-        name: ${{ github.event.pull_request.head.ref }}
-        tag_name: ${{ github.event.pull_request.head.ref }}
-        draft: true
-        prerelease: true
-        token: ${{ fromJSON(inputs.secrets).FLOWZONE_TOKEN }}
-        files: |
-          dist/*.AppImage
-          dist/*.blockmap
-          dist/*.deb
-          dist/*.dmg
-          dist/*.exe
-          dist/*.rpm
-          dist/*.zip
-          dist/latest*.yml
-
-    - name: Compress custom source
-      shell: pwsh
-      run: tar -acf ${{ runner.temp }}/custom.tgz .
-
-    - name: Upload custom artifact
+    - name: Upload artifacts
       uses: actions/upload-artifact@v3
       with:
-        name: custom-${{ github.event.pull_request.head.sha || github.event.head_commit.id }}-${{ runner.os }}
-        path: ${{ runner.temp }}/custom.tgz
+        name: gh-release-${{ github.event.pull_request.head.sha || github.event.head_commit.id }}
+        path: dist
         retention-days: 1
diff --git a/.github/actions/test/action.yml b/.github/actions/test/action.yml
@@ -21,19 +21,6 @@ runs:
   # https://docs.github.com/en/actions/creating-actions/creating-a-composite-action
   using: "composite"
   steps:
-    - name: Delete previous draft release
-      if: runner.os == 'Linux'
-      shell: bash --noprofile --norc -eo pipefail -x {0}
-      run: |
-        set -ea
-
-        [[ '${{ inputs.VERBOSE }}' =~ on|On|Yes|yes|true|True ]] && set -x
-
-        gh release delete --yes '${{ github.event.pull_request.head.ref }}' || true
-
-      env:
-        GITHUB_TOKEN: ${{ fromJSON(inputs.secrets).FLOWZONE_TOKEN }}
-
     # https://github.com/actions/setup-node#caching-global-packages-data
     - name: Setup Node.js
       uses: actions/setup-node@v3

diff --git a/.github/workflows/flowzone.yml b/.github/workflows/flowzone.yml
@@ -3,14 +3,28 @@ name: Flowzone
 on:
   pull_request:
     types: [opened, synchronize, closed]
-    branches:
-      - "main"
-      - "master"
+    branches: [main, master]
+  # allow external contributions to use secrets within trusted code
+  pull_request_target:
+    types: [opened, synchronize, closed]
+    branches: [main, master]
 
 jobs:
   flowzone:
     name: Flowzone
     uses: product-os/flowzone/.github/workflows/flowzone.yml@master
+    # prevent duplicate workflows and only allow one `pull_request` or `pull_request_target` for
+    # internal or external contributions respectively
+    if: |
+      (github.event.pull_request.head.repo.full_name == github.repository && github.event_name == 'pull_request') ||
+      (github.event.pull_request.head.repo.full_name != github.repository && github.event_name == 'pull_request_target')
     secrets: inherit
     with:
-      tests_run_on: '["ubuntu-latest","macos-latest","windows-2019"]'
+      tests_run_on: '["ubuntu-18.04","macos-latest","windows-2019"]'
+      restrict_custom_actions: false
+      github_prerelease: true
+#      repo_config: true
+#      repo_description: |
+#        Flash OS images to SD cards & USB drives, safely and easily.
+#      repo_homepage: https://etcher.io/
+#      repo_enable_wiki: true
diff --git a/.versionbot/CHANGELOG.yml b/.versionbot/CHANGELOG.yml
@@ -1,3 +1,113 @@
+- commits:
+    - subject: Update dependency chai to 4.3.7
+      hash: 4ed30027162365a68f26264f7574ac9eaf752926
+      body: |
+        Update chai to 4.3.7
+
+        Update chai from 4.2.0 to 4.3.7
+      footer:
+        Change-type: patch
+        change-type: patch
+      author: Renovate Bot
+      nested: []
+  version: 1.10.8
+  title: ""
+  date: 2022-12-05T21:38:41.964Z
+- commits:
+    - subject: Use core workflow for GitHub publish
+      hash: f3844d56e2bb317e9360f34f5054c91eb0fb8910
+      body: ""
+      footer:
+        Change-type: patch
+        change-type: patch
+      author: ab77
+      nested: []
+  version: 1.10.7
+  title: ""
+  date: 2022-12-05T19:39:07.247Z
+- commits:
+    - subject: Dummy update to fix asset version issue
+      hash: 03d6a011db5fd4dad3d25fde86cf2b434c8192e8
+      body: |
+        Due to a race between two patch, 1.10.5 assets are labelled 1.10.3.
+        This dummy PR should fix this.
+      footer:
+        Change-type: patch
+        change-type: patch
+      author: Edwin Joassart
+      nested: []
+  version: 1.10.6
+  title: ""
+  date: 2022-12-02T14:04:57.766Z
+- commits:
+    - subject: "Patch: run linux build on ubuntu-18.04"
+      hash: 57a6ceff0e28d06063679a7a8b14671416ba46c5
+      body: >-
+        Running on ubuntu-latest means you need a more recent version of glibc
+        which breaks on older ubuntu.
+
+
+        Thanks to @theofficialgman for suggesting the fix.
+      footer: {}
+      author: Edwin Joassart
+      nested: []
+  version: 1.10.5
+  title: ""
+  date: 2022-12-02T12:41:19.841Z
+- commits:
+    - subject: "patch: remove Homebrew instructions in README"
+      hash: 0d1cfffa5c7c084d9f48d60c1abbf7e2974abb28
+      body: |
+        Homebrew no longer supports etcher, so removing install instructions.
+      footer:
+        Change-type: patch
+        change-type: patch
+      author: Patrick Linnane
+      nested: []
+  version: 1.10.4
+  title: ""
+  date: 2022-12-01T23:27:55.910Z
+- commits:
+    - subject: Allow external contributors
+      hash: 156b9314b5786e943256974d5344383ae1f0650d
+      body: ""
+      footer:
+        Change-type: patch
+        change-type: patch
+      author: ab77
+      nested: []
+  version: 1.10.3
+  title: ""
+  date: 2022-12-01T22:31:25.592Z
+- commits:
+    - subject: Fix missing analytics token
+      hash: 831339bd2cbe73dd441cdd77d85b34e98f68a6a6
+      body: ""
+      footer:
+        Change-type: patch
+        change-type: patch
+        Signed-off-by: Edwin Joassart edwin.joassart@balena.io
+        signed-off-by: Edwin Joassart edwin.joassart@balena.io
+      author: Edwin Joassart
+      nested: []
+  version: 1.10.2
+  title: ""
+  date: 2022-11-25T19:22:49.679Z
+- commits:
+    - subject: Fixing call to electron block screensaver methods invocation
+      hash: 1b5b64713505dfb69448bc2184839b4c23bd677b
+      body: >
+        Replacing `send` calls to `invoke` for `enable/disable-screensaver` calls.
+      footer:
+        Change-type: patch
+        change-type: patch
+        Signed-off-by: Aurelien VALADE <aurelien.valade@balena.io>
+        signed-off-by: Aurelien VALADE <aurelien.valade@balena.io>
+      author: Aurelien VALADE
+      nested: []
+  version: 1.10.1
+  title: ""
+  date: 2022-11-21T16:50:14.797Z
 - commits:
     - subject: testing renovate
       hash: 306e087ec6daed9e736a8918cde07159dd9298dc

diff --git a/CHANGELOG.md b/CHANGELOG.md
@@ -3,6 +3,46 @@
 All notable changes to this project will be documented in this file.
 This project adheres to [Semantic Versioning](http://semver.org/).
 
+# v1.10.8
+## (2022-12-05)
+
+* Update dependency chai to 4.3.7 [Renovate Bot]
+
+# v1.10.7
+## (2022-12-05)
+
+* Use core workflow for GitHub publish [ab77]
+
+# v1.10.6
+## (2022-12-02)
+
+* Dummy update to fix asset version issue [Edwin Joassart]
+
+# v1.10.5
+## (2022-12-02)
+
+* Patch: run linux build on ubuntu-18.04 [Edwin Joassart]
+
+# v1.10.4
+## (2022-12-01)
+
+* patch: remove Homebrew instructions in README [Patrick Linnane]
+
+# v1.10.3
+## (2022-12-01)
+
+* Allow external contributors [ab77]
+
+# v1.10.2
+## (2022-11-25)
+
+* Fix missing analytics token [Edwin Joassart]
+
+# v1.10.1
+## (2022-11-21)
+
+* Fixing call to electron block screensaver methods invocation [Aurelien VALADE]
+
 # v1.10.0
 ## (2022-11-10)
 

diff --git a/README.md b/README.md
@@ -170,22 +170,6 @@ yay -S balena-etcher
 yay -R balena-etcher
 ```
 
-#### Brew (macOS)
-
-**Note**: Etcher has to be updated manually to point to new versions,
-so it might not refer to the latest version immediately after an Etcher
-release.
-
-```sh
-brew install balenaetcher
-```
-
-##### Uninstall
-
-```sh
-brew uninstall balenaetcher
-```
-
 #### Chocolatey (Windows)
 
 This package is maintained by [@majkinetor](https://github.com/majkinetor), and
@@ -220,3 +204,5 @@ the [license].
 [milestones]: https://github.com/balena-io/etcher/milestones
 [newissue]: https://github.com/balena-io/etcher/issues/new
 [license]: https://github.com/balena-io/etcher/blob/master/LICENSE
+
+
diff --git a/lib/gui/app/models/flash-state.ts b/lib/gui/app/models/flash-state.ts
@@ -47,7 +47,7 @@ export function isFlashing(): boolean {
  */
 export function setFlashingFlag() {
 	// see https://github.com/balenablocks/balena-electron-env/blob/4fce9c461f294d4a768db8f247eea6f75d7b08b0/README.md#remote-methods
-	electron.ipcRenderer.send('disable-screensaver');
+	electron.ipcRenderer.invoke('disable-screensaver');
 	store.dispatch({
 		type: Actions.SET_FLASHING_FLAG,
 		data: {},
@@ -70,7 +70,7 @@ export function unsetFlashingFlag(results: {
 		data: results,
 	});
 	// see https://github.com/balenablocks/balena-electron-env/blob/4fce9c461f294d4a768db8f247eea6f75d7b08b0/README.md#remote-methods
-	electron.ipcRenderer.send('enable-screensaver');
+	electron.ipcRenderer.invoke('enable-screensaver');
 }
 
 export function setDevicePaths(devicePaths: string[]) {