Skip to content

Commit

Permalink
Merge branch 'master' into gconf2
Browse files Browse the repository at this point in the history
  • Loading branch information
marcaurele authored Jul 30, 2024
2 parents bdc2f09 + 5fd6376 commit 9639c72
Show file tree
Hide file tree
Showing 5 changed files with 39 additions and 5 deletions.
19 changes: 18 additions & 1 deletion .github/workflows/flowzone.yml
Original file line number Diff line number Diff line change
Expand Up @@ -18,7 +18,24 @@ jobs:
(github.event.pull_request.head.repo.full_name != github.repository && github.event_name == 'pull_request_target')
secrets: inherit
with:
custom_runs_on: '[["ubuntu-20.04"],["windows-2019"],["macos-12"],["macos-latest-xlarge"]]'
custom_test_matrix: >
{
"os": [
["ubuntu-20.04"],
["windows-2019"],
["macos-12"],
["macos-latest-xlarge"]
]
}
custom_publish_matrix: >
{
"os": [
["ubuntu-20.04"],
["windows-2019"],
["macos-12"],
["macos-latest-xlarge"]
]
}
restrict_custom_actions: false
github_prerelease: true
cloudflare_website: "etcher"
12 changes: 12 additions & 0 deletions .versionbot/CHANGELOG.yml
Original file line number Diff line number Diff line change
@@ -1,3 +1,15 @@
- commits:
- subject: Replace deprecated Flowzone inputs
hash: 52d396aa7ea9ae1ef6d68151f582f04f57191b14
body: ""
footer:
Change-type: patch
change-type: patch
author: Kyle Harding
nested: []
version: 1.19.22
title: ""
date: 2024-07-18T18:12:56.368Z
- commits:
- subject: "patch: fix missing windows dependency"
hash: 8dad81ae34b8d71f3d4f7151ee60717e6207ccd8
Expand Down
5 changes: 5 additions & 0 deletions CHANGELOG.md
Original file line number Diff line number Diff line change
Expand Up @@ -3,6 +3,11 @@
All notable changes to this project will be documented in this file.
This project adheres to [Semantic Versioning](http://semver.org/).

# v1.19.22
## (2024-07-18)

* Replace deprecated Flowzone inputs [Kyle Harding]

# v1.19.21
## (2024-05-30)

Expand Down
4 changes: 2 additions & 2 deletions npm-shrinkwrap.json

Some generated files are not rendered by default. Learn more about how customized files appear on GitHub.

4 changes: 2 additions & 2 deletions package.json
Original file line number Diff line number Diff line change
Expand Up @@ -3,7 +3,7 @@
"private": true,
"displayName": "balenaEtcher",
"productName": "balenaEtcher",
"version": "1.19.21",
"version": "1.19.22",
"packageType": "local",
"main": ".webpack/main",
"description": "Flash OS images to SD cards and USB drives, safely and easily.",
Expand Down Expand Up @@ -144,7 +144,7 @@
"node": ">=20 <21"
},
"versionist": {
"publishedAt": "2024-05-30T15:00:36.294Z"
"publishedAt": "2024-07-18T18:12:56.823Z"
},
"optionalDependencies": {
"bufferutil": "^4.0.8",
Expand Down

0 comments on commit 9639c72

Please sign in to comment.