Skip to content

Commit

Permalink
Merge branch 'master' into renovate/layers-meta-balena-digest
Browse files Browse the repository at this point in the history
  • Loading branch information
floion authored Jul 28, 2023
2 parents 50f6ffc + a73fdec commit 505d716
Show file tree
Hide file tree
Showing 4 changed files with 43 additions and 2 deletions.
2 changes: 1 addition & 1 deletion .github/workflows/build_and_deploy.yml
Original file line number Diff line number Diff line change
Expand Up @@ -11,7 +11,7 @@ on:

jobs:
release-on-tag:
uses: balena-os/github-workflows/.github/workflows/[email protected].12
uses: balena-os/github-workflows/.github/workflows/[email protected].19
with:
deployTo: "production"
secrets: inherit
35 changes: 35 additions & 0 deletions .versionbot/CHANGELOG.yml
Original file line number Diff line number Diff line change
@@ -1,3 +1,38 @@
- commits:
- subject: Update balena-os/github-workflows to
hash: f451e66ca9af969967b39a5a2fa6fac1e6d06ab2
body: Update balena-os/github-workflows
footer:
Changelog-entry: Update balena-os/github-workflows to
changelog-entry: Update balena-os/github-workflows to
author: Self-hosted Renovate Bot
nested: []
- subject: Remove pull_request_target event run for ESR targets
hash: 2267ebd1363d3445e469e69a59378d1adae13b94
body: >
Backporting to ESR branches hits a flowzone error as both pull_request

and pull_request_target run and this only works for master.


Removing the pull_request_target run for ESR branches fixes this, but

also removes the possibility of external pull requests into ESR branches,

which we don't actually need.


[skip ci]
footer:
Changelog-entry: Remove pull_request_target event run for ESR targets
changelog-entry: Remove pull_request_target event run for ESR targets
Signed-off-by: Alex Gonzalez <[email protected]>
signed-off-by: Alex Gonzalez <[email protected]>
author: Alex Gonzalez
nested: []
version: 2.114.23+rev1
title: ""
date: 2023-06-26T12:30:44.897Z
- commits:
- subject: Update layers/meta-balena to 3f2f215e39c39fc3ef227db665c99fb8ad77ee08
hash: ec590c8617e2d4f2df08c099e713b27f5f02e2b3
Expand Down
6 changes: 6 additions & 0 deletions CHANGELOG.md
Original file line number Diff line number Diff line change
@@ -1,6 +1,12 @@
Change log
-----------

# v2.114.23+rev1
## (2023-06-26)

* Update balena-os/github-workflows to [Self-hosted Renovate Bot]
* Remove pull_request_target event run for ESR targets [Alex Gonzalez]

# v2.114.23
## (2023-05-09)

Expand Down
2 changes: 1 addition & 1 deletion VERSION
Original file line number Diff line number Diff line change
@@ -1 +1 @@
2.114.23
2.114.23+rev1

0 comments on commit 505d716

Please sign in to comment.