Skip to content

Commit 48d0d88

Browse files
kalleepgithub-vincent-miszczakthampiotrptodev
authored
Prepare patch release v1.8.2 on release branch (#3405)
* Add changelog for v1.8.2 * fix(podlogs): add missing labels (#3334) * fix(otelcol.exporter.prometheus): do not drop valid exemplars (#2602) --------- Co-authored-by: Vincent Miszczak <35925003+github-vincent-miszczak@users.noreply.github.com> Co-authored-by: Piotr <17101802+thampiotr@users.noreply.github.com> Co-authored-by: Paulin Todev <paulin.todev@gmail.com>
1 parent 5143ebe commit 48d0d88

File tree

17 files changed

+672
-95
lines changed

17 files changed

+672
-95
lines changed

‎.github/actions/homebrew-bump-formula/Formula/test-formula-git-revision.rb‎

Lines changed: 21 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,21 @@
1+
class TestFormulaGitRevision < Formula
2+
desc "Formula to test Action"
3+
homepage "https://github.com/Debian/dh-make-golang"
4+
url "https://github.com/Debian/dh-make-golang.git",
5+
tag: "v0.3.2",
6+
revision: "82916c0d56b6319398f635199222dff397fafc12"
7+
license "MIT"
8+
head "https://github.com/Debian/dh-make-golang.git"
9+
10+
def install
11+
(buildpath/"test").write <<~EOS
12+
test
13+
EOS
14+
15+
share.install "test"
16+
end
17+
18+
test do
19+
sleep 1
20+
end
21+
end

‎.github/actions/homebrew-bump-formula/Formula/test-formula-pypi-url.rb‎

Lines changed: 54 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,54 @@
1+
class TestFormulaPypiUrl < Formula
2+
include Language::Python::Virtualenv
3+
4+
desc "Formula to test Action"
5+
homepage "https://commitizen-tools.github.io/commitizen/"
6+
url "https://files.pythonhosted.org/packages/a1/14/3ad1772b81f1e2f7c91ac99987c0ac72a50ebe2a06967cf9a3eea81dd0d0/commitizen-2.14.0.tar.gz"
7+
sha256 "afc68d9d61c8338beeb6145a8276e97a342a16f4f721c8ff654403043240cec0"
8+
license "MIT"
9+
head "https://github.com/commitizen-tools/commitizen.git"
10+
11+
depends_on "python@3.9"
12+
13+
resource "argcomplete" do
14+
url "https://files.pythonhosted.org/packages/cb/53/d2e3d11726367351b00c8f078a96dacb7f57aef2aca0d3b6c437afc56b55/argcomplete-1.12.2.tar.gz"
15+
sha256 "de0e1282330940d52ea92a80fea2e4b9e0da1932aaa570f84d268939d1897b04"
16+
end
17+
18+
resource "colorama" do
19+
url "https://files.pythonhosted.org/packages/1f/bb/5d3246097ab77fa083a61bd8d3d527b7ae063c7d8e8671b1cf8c4ec10cbe/colorama-0.4.4.tar.gz"
20+
sha256 "5941b2b48a20143d2267e95b1c2a7603ce057ee39fd88e7329b0c292aa16869b"
21+
end
22+
23+
resource "decli" do
24+
url "https://files.pythonhosted.org/packages/9f/30/064f53ca7b75c33a892dcc4230f78a1e01bee4b5b9b49c0be1a61601c9bd/decli-0.5.2.tar.gz"
25+
sha256 "f2cde55034a75c819c630c7655a844c612f2598c42c21299160465df6ad463ad"
26+
end
27+
28+
resource "Jinja2" do
29+
url "https://files.pythonhosted.org/packages/4f/e7/65300e6b32e69768ded990494809106f87da1d436418d5f1367ed3966fd7/Jinja2-2.11.3.tar.gz"
30+
sha256 "a6d58433de0ae800347cab1fa3043cebbabe8baa9d29e668f1c768cb87a333c6"
31+
end
32+
33+
resource "MarkupSafe" do
34+
url "https://files.pythonhosted.org/packages/b9/2e/64db92e53b86efccfaea71321f597fa2e1b2bd3853d8ce658568f7a13094/MarkupSafe-1.1.1.tar.gz"
35+
sha256 "29872e92839765e546828bb7754a68c418d927cd064fd4708fab9fe9c8bb116b"
36+
end
37+
38+
resource "packaging" do
39+
url "https://files.pythonhosted.org/packages/86/3c/bcd09ec5df7123abcf695009221a52f90438d877a2f1499453c6938f5728/packaging-20.9.tar.gz"
40+
sha256 "5b327ac1320dc863dca72f4514ecc086f31186744b84a230374cc1fd776feae5"
41+
end
42+
43+
def install
44+
(buildpath/"test").write <<~EOS
45+
test
46+
EOS
47+
48+
share.install "test"
49+
end
50+
51+
test do
52+
sleep 1
53+
end
54+
end

‎.github/actions/homebrew-bump-formula/Formula/test-formula-url.rb‎

Lines changed: 19 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,19 @@
1+
class TestFormulaUrl < Formula
2+
desc "Formula to test Action"
3+
homepage "https://github.com/dawidd6/actions-updater"
4+
url "https://github.com/dawidd6/actions-updater/archive/v0.1.11.tar.gz"
5+
sha256 "b1c83ee9d19289eb403ad0863c235fa9c3b3a980c9b13a43cda9fc9413935df4"
6+
license "MIT"
7+
8+
def install
9+
(buildpath/"test").write <<~EOS
10+
test
11+
EOS
12+
13+
share.install "test"
14+
end
15+
16+
test do
17+
sleep 1
18+
end
19+
end

‎.github/actions/homebrew-bump-formula/LICENSE‎

Lines changed: 21 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,21 @@
1+
The MIT License (MIT)
2+
3+
Copyright (c) 2020 Dawid Dziurla
4+
5+
Permission is hereby granted, free of charge, to any person obtaining a copy
6+
of this software and associated documentation files (the "Software"), to deal
7+
in the Software without restriction, including without limitation the rights
8+
to use, copy, modify, merge, publish, distribute, sublicense, and/or sell
9+
copies of the Software, and to permit persons to whom the Software is
10+
furnished to do so, subject to the following conditions:
11+
12+
The above copyright notice and this permission notice shall be included in
13+
all copies or substantial portions of the Software.
14+
15+
THE SOFTWARE IS PROVIDED "AS IS", WITHOUT WARRANTY OF ANY KIND, EXPRESS OR
16+
IMPLIED, INCLUDING BUT NOT LIMITED TO THE WARRANTIES OF MERCHANTABILITY,
17+
FITNESS FOR A PARTICULAR PURPOSE AND NONINFRINGEMENT. IN NO EVENT SHALL THE
18+
AUTHORS OR COPYRIGHT HOLDERS BE LIABLE FOR ANY CLAIM, DAMAGES OR OTHER
19+
LIABILITY, WHETHER IN AN ACTION OF CONTRACT, TORT OR OTHERWISE, ARISING FROM,
20+
OUT OF OR IN CONNECTION WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN
21+
THE SOFTWARE.

‎.github/actions/homebrew-bump-formula/README.md‎

Lines changed: 6 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,6 @@
1+
This folder is a fork of another GitHub Action:
2+
https://github.com/dawidd6/action-homebrew-bump-formula
3+
4+
The fork is needed in order to incorporate this change:
5+
https://github.com/dawidd6/action-homebrew-bump-formula/pull/90
6+

‎.github/actions/homebrew-bump-formula/action.yml‎

Lines changed: 116 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,116 @@
1+
name: Homebrew bump formula
2+
description: Bump (update) a Homebrew formula on new project release
3+
author: dawidd6
4+
branding:
5+
icon: arrow-up-circle
6+
color: yellow
7+
inputs:
8+
token:
9+
description: GitHub token (not the default one)
10+
required: true
11+
user_name:
12+
description: Git user name to commit by.
13+
required: false
14+
user_email:
15+
description: Git user email to commit by.
16+
required: false
17+
message:
18+
description: |
19+
Additional message to append to created PR.
20+
required: false
21+
org:
22+
description: |
23+
Fork tap repository to selected GitHub organization.
24+
required: false
25+
no_fork:
26+
description: |
27+
Use the origin repository instead of forking.
28+
required: false
29+
tap:
30+
description: |
31+
Formula tap.
32+
33+
In livecheck mode, if formula input is empty,
34+
the Action will check the whole tap.
35+
36+
Example: dawidd6/tap
37+
Example: dawidd6/homebrew-tap
38+
required: false
39+
tap_url:
40+
description: |
41+
Formula tap URL.
42+
43+
Specify this if you don't have the repository named $USER/homebrew-$TAP.
44+
Or if your tap is hosted somewhere else.
45+
If you specify this input, the `tap` input needs to be set too.
46+
47+
Example: https://github.com/dawidd6/action-homebrew-bump-formula.git
48+
required: false
49+
formula:
50+
description: |
51+
Formula name.
52+
53+
In livecheck mode, this could take more than one formula,
54+
separated by commas or spaces or newlines.
55+
56+
Example: lazygit
57+
Example (livecheck): lazygit, lazydocker, lazynpm
58+
required: false
59+
tag:
60+
description: |
61+
Git tag.
62+
63+
It is determined automatically.
64+
65+
Example: v1.0.0
66+
Example: refs/tags/v1.0.0
67+
required: false
68+
default: ${{github.ref}}
69+
revision:
70+
description: |
71+
Git revision.
72+
73+
Only required for formulae that use git to download the source.
74+
75+
It is determined automatically.
76+
77+
Example: 130d3a3af72f66780ae4e24cd143ae7a4d757f9d
78+
required: false
79+
default: ${{github.sha}}
80+
force:
81+
description: Check open PRs or not (will fail if detected)
82+
required: false
83+
livecheck:
84+
description: |
85+
Use `brew livecheck` to determine outdated formulae.
86+
87+
If tap input is specified - check all formulae in this tap.
88+
If formula input is specified - check one or more formulae.
89+
If formula and tap inputs are specified - check one or more formulae in that tap.
90+
required: false
91+
runs:
92+
using: composite
93+
steps:
94+
- run: echo /home/linuxbrew/.linuxbrew/bin >> $GITHUB_PATH
95+
if: ${{runner.os == 'Linux'}}
96+
shell: sh
97+
- run: brew developer on
98+
shell: sh
99+
- run: brew update-reset
100+
shell: sh
101+
- run: brew ruby $GITHUB_ACTION_PATH/main.rb
102+
shell: sh
103+
env:
104+
HOMEBREW_GITHUB_API_TOKEN: ${{inputs.token}}
105+
HOMEBREW_GIT_NAME: ${{inputs.user_name}}
106+
HOMEBREW_GIT_EMAIL: ${{inputs.user_email}}
107+
HOMEBREW_BUMP_MESSAGE: ${{inputs.message}}
108+
HOMEBREW_BUMP_ORG: ${{inputs.org}}
109+
HOMEBREW_BUMP_NO_FORK: ${{inputs.no_fork}}
110+
HOMEBREW_BUMP_TAP: ${{inputs.tap}}
111+
HOMEBREW_BUMP_TAP_URL: ${{inputs.tap_url}}
112+
HOMEBREW_BUMP_FORMULA: ${{inputs.formula}}
113+
HOMEBREW_BUMP_TAG: ${{inputs.tag}}
114+
HOMEBREW_BUMP_REVISION: ${{inputs.revision}}
115+
HOMEBREW_BUMP_FORCE: ${{inputs.force}}
116+
HOMEBREW_BUMP_LIVECHECK: ${{inputs.livecheck}}

‎.github/actions/homebrew-bump-formula/bump-formula-pr.rb.patch‎

Lines changed: 12 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,12 @@
1+
diff --git a/Library/Homebrew/dev-cmd/bump-formula-pr.rb b/Library/Homebrew/dev-cmd/bump-formula-pr.rb
2+
index 167ea9134a..e07aecfe83 100644
3+
--- a/Library/Homebrew/dev-cmd/bump-formula-pr.rb
4+
+++ b/Library/Homebrew/dev-cmd/bump-formula-pr.rb
5+
@@ -472,6 +472,7 @@ module Homebrew
6+
def check_pull_requests(formula, tap_remote_repo, state: nil, version: nil)
7+
tap = formula.tap
8+
return if tap.nil?
9+
+ return if args.force?
10+
11+
# if we haven't already found open requests, try for an exact match across all pull requests
12+
GitHub.check_for_duplicate_pull_requests(

0 commit comments

Comments
 (0)