Skip to content

Commit 4660134

Browse files
clrkrompetsclrkrompets
authored
Merge branch 'prometheus:master' into master
2 parents d5077bf + 14fddfc commit 4660134

Some content is hidden

Large Commits have some content hidden by default. Use the searchbox below for content that may be hidden.

50 files changed

+4177
-884
lines changed

‎.circleci/config.yml‎

Lines changed: 0 additions & 139 deletions
This file was deleted.

‎.dockerignore‎

Lines changed: 2 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -2,7 +2,8 @@
22
.tarballs/
33

44
!.build/linux-amd64
5-
!.build/linux-armv7
65
!.build/linux-arm64
6+
!.build/linux-armv7
77
!.build/linux-ppc64le
8+
!.build/linux-riscv64
89
!.build/linux-s390x

‎.github/dependabot.yml‎

Lines changed: 4 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -8,3 +8,7 @@ updates:
88
directory: "/"
99
schedule:
1010
interval: "monthly"
11+
# Exclude configs synced from upstream prometheus/prometheus.
12+
exclude-paths:
13+
- .github/workflows/container_description.yml
14+
- .github/workflows/golangci-lint.yml

‎.github/workflows/bsd.yml‎

Lines changed: 47 additions & 31 deletions
Original file line numberDiff line numberDiff line change
@@ -13,11 +13,7 @@ permissions:
1313

1414
env:
1515
GNU_TAR_VERSION: "1.35"
16-
GO_VERSION_DRAGONFLY: "1.25.1"
17-
GO_VERSION_FREEBSD: "125"
18-
GO_VERSION_NETBSD: "1.25.1"
19-
GO_VERSION_OPENBSD: "1.25.1"
20-
GO_VERSION_SOLARIS: "1.25.1"
16+
GO_VERSION: "1.26.0"
2117

2218
# To spin up one of the VMs below, see the "Debug Shell" section here: https://github.com/vmactions
2319
jobs:
@@ -26,13 +22,13 @@ jobs:
2622
runs-on: ubuntu-latest
2723
steps:
2824
- name: Checkout the repository
29-
uses: actions/checkout@08c6903cd8c0fde910a37f88322edcfb5dd907a8 # v5.0.0
25+
uses: actions/checkout@de0fac2e4500dabe0009e67214ff5f5447ce83dd # v6.0.2
3026
- name: test-e2e
31-
uses: vmactions/freebsd-vm@487ce35b96fae3e60d45b521735f5aa436ecfade # v1.2.4
27+
uses: vmactions/freebsd-vm@7ca82f79fe3078fecded6d3a2bff094995447bbd # v1.4.4
3228
with:
33-
release: "14.3"
29+
release: "15.0"
3430
copyback: false
35-
envs: 'GO_VERSION_FREEBSD GNU_TAR_VERSION'
31+
envs: 'GO_VERSION GNU_TAR_VERSION'
3632
usesh: true
3733
prepare: |
3834
pkg update -f
@@ -41,7 +37,6 @@ jobs:
4137
git \
4238
gmake \
4339
gnugrep \
44-
go${GO_VERSION_FREEBSD} \
4540
gsed \
4641
gtar \
4742
python \
@@ -50,7 +45,12 @@ jobs:
5045
echo "::group::Setup prerequisites"
5146
set -eu
5247
mkdir bin
53-
ln -s $(which go${GO_VERSION_FREEBSD}) $(pwd)/bin/go
48+
GOARCH=$(uname -m)
49+
if [ "${GOARCH}" = "x86_64" ] ; then GOARCH="amd64" ; fi
50+
GOGZ="go${GO_VERSION}.freebsd-${GOARCH}.tar.gz"
51+
wget https://go.dev/dl/${GOGZ}
52+
gtar xzf ${GOGZ}
53+
ln -s $(pwd)/go/bin/go $(pwd)/bin/go
5454
ln -s $(which ggrep) $(pwd)/bin/grep
5555
ln -s $(which gmake) $(pwd)/bin/make
5656
ln -s $(which gsed) $(pwd)/bin/sed
@@ -74,12 +74,12 @@ jobs:
7474
runs-on: ubuntu-latest
7575
steps:
7676
- name: Checkout the repository
77-
uses: actions/checkout@08c6903cd8c0fde910a37f88322edcfb5dd907a8 # v5.0.0
77+
uses: actions/checkout@de0fac2e4500dabe0009e67214ff5f5447ce83dd # v6.0.2
7878
- name: test-e2e
79-
uses: vmactions/openbsd-vm@a254d784d6fad46e22ef73c6ecbb1dc310b04777 # v1.2.3
79+
uses: vmactions/openbsd-vm@9004791062e748d95cc87e499e77485f91888ce1 # v1.3.8
8080
with:
8181
copyback: false
82-
envs: 'GO_VERSION_OPENBSD GNU_TAR_VERSION'
82+
envs: 'GO_VERSION GNU_TAR_VERSION'
8383
usesh: true
8484
prepare: |
8585
pkg_add -u
@@ -88,7 +88,6 @@ jobs:
8888
ggrep \
8989
git \
9090
gmake \
91-
go-${GO_VERSION_OPENBSD} \
9291
gsed \
9392
gtar-${GNU_TAR_VERSION}p1-static \
9493
python \
@@ -97,6 +96,12 @@ jobs:
9796
echo "::group::Setup prerequisites"
9897
set -eu
9998
mkdir bin
99+
GOARCH=$(uname -m)
100+
if [ "${GOARCH}" = "x86_64" ] ; then GOARCH="amd64" ; fi
101+
GOGZ="go${GO_VERSION}.openbsd-${GOARCH}.tar.gz"
102+
wget https://go.dev/dl/${GOGZ}
103+
gtar xzf ${GOGZ}
104+
ln -s $(pwd)/go/bin/go $(pwd)/bin/go
100105
ln -s $(which ggrep) $(pwd)/bin/grep
101106
ln -s $(which gmake) $(pwd)/bin/make
102107
ln -s $(which gsed) $(pwd)/bin/sed
@@ -120,12 +125,12 @@ jobs:
120125
runs-on: ubuntu-latest
121126
steps:
122127
- name: Checkout the repository
123-
uses: actions/checkout@08c6903cd8c0fde910a37f88322edcfb5dd907a8 # v5.0.0
128+
uses: actions/checkout@de0fac2e4500dabe0009e67214ff5f5447ce83dd # v6.0.2
124129
- name: test-e2e
125-
uses: vmactions/netbsd-vm@7aea50f9eb16df034be5d71eb81fea9804505c28 # v1.2.0
130+
uses: vmactions/netbsd-vm@e04aec09540429f9cebb0e7941f7cd0c0fc3b44f # v1.3.6
126131
with:
127132
copyback: false
128-
envs: 'GO_VERSION_NETBSD GNU_TAR_VERSION'
133+
envs: 'GO_VERSION GNU_TAR_VERSION'
129134
usesh: true
130135
prepare: |
131136
/usr/sbin/pkg_add -u \
@@ -140,7 +145,9 @@ jobs:
140145
echo "::group::Setup prerequisites"
141146
set -eu
142147
mkdir bin
143-
GOGZ="go${GO_VERSION_NETBSD}.netbsd-amd64.tar.gz"
148+
GOARCH=$(uname -m)
149+
if [ "${GOARCH}" = "x86_64" ] ; then GOARCH="amd64" ; fi
150+
GOGZ="go${GO_VERSION}.netbsd-${GOARCH}.tar.gz"
144151
wget https://go.dev/dl/${GOGZ}
145152
gtar xzf ${GOGZ}
146153
ln -s $(pwd)/go/bin/go $(pwd)/bin/go
@@ -167,12 +174,12 @@ jobs:
167174
runs-on: ubuntu-latest
168175
steps:
169176
- name: Checkout the repository
170-
uses: actions/checkout@08c6903cd8c0fde910a37f88322edcfb5dd907a8 # v5.0.0
177+
uses: actions/checkout@de0fac2e4500dabe0009e67214ff5f5447ce83dd # v6.0.2
171178
- name: test-e2e
172-
uses: vmactions/dragonflybsd-vm@ff1f01c32b9e82f2ba388d0ff270442bcd6ceddc # v1.1.1
179+
uses: vmactions/dragonflybsd-vm@323497fa680c1856dd1ba5c4fd89182a9194f649 # v1.2.7
173180
with:
174181
copyback: false
175-
envs: 'GO_VERSION_DRAGONFLY'
182+
envs: 'GO_VERSION'
176183
usesh: true
177184
prepare: |
178185
pkg update && pkg upgrade -y
@@ -189,7 +196,9 @@ jobs:
189196
echo "::group::Setup prerequisites"
190197
set -eu
191198
mkdir bin
192-
GOGZ="go${GO_VERSION_DRAGONFLY}.dragonfly-amd64.tar.gz"
199+
GOARCH=$(uname -m)
200+
if [ "${GOARCH}" = "x86_64" ] ; then GOARCH="amd64" ; fi
201+
GOGZ="go${GO_VERSION}.dragonfly-${GOARCH}.tar.gz"
193202
wget https://go.dev/dl/${GOGZ}
194203
gtar xzf ${GOGZ}
195204
ln -s $(pwd)/go/bin/go $(pwd)/bin/go
@@ -217,12 +226,12 @@ jobs:
217226
runs-on: ubuntu-latest
218227
steps:
219228
- name: Checkout the repository
220-
uses: actions/checkout@08c6903cd8c0fde910a37f88322edcfb5dd907a8 # v5.0.0
229+
uses: actions/checkout@de0fac2e4500dabe0009e67214ff5f5447ce83dd # v6.0.2
221230
- name: test-e2e
222-
uses: vmactions/solaris-vm@58cbd70c6e051860f9b8f65908cc582938fbbdba # v1.1.5
231+
uses: vmactions/solaris-vm@0a231b94365d1911cf62097ef342f6b30d95598f # v1.3.2
223232
with:
224233
copyback: false
225-
envs: 'GO_VERSION_SOLARIS'
234+
envs: 'GO_VERSION'
226235
usesh: true
227236
prepare: |
228237
pkg install \
@@ -238,7 +247,9 @@ jobs:
238247
echo "::group::Setup prerequisites"
239248
set -eu
240249
mkdir bin
241-
GOGZ="go${GO_VERSION_SOLARIS}.solaris-amd64.tar.gz"
250+
GOARCH=$(uname -m)
251+
if [ "${GOARCH}" = "i86pc" ] ; then GOARCH="amd64" ; fi
252+
GOGZ="go${GO_VERSION}.solaris-${GOARCH}.tar.gz"
242253
wget https://go.dev/dl/${GOGZ}
243254
gtar xzf ${GOGZ}
244255
ln -s $(pwd)/go/bin/go $(pwd)/bin/go
@@ -247,13 +258,13 @@ jobs:
247258
ln -s $(which gsed) $(pwd)/bin/sed
248259
ln -s $(which gtar) $(pwd)/bin/tar
249260
export PATH=$(pwd)/bin:$PATH
250-
261+
251262
echo ">> building promu as it is not shipped for Solaris"
252263
git clone https://github.com/prometheus/promu.git
253264
cd promu
254265
go build .
255266
cd -
256-
267+
257268
mkdir -p $(go env GOPATH)/bin
258269
ln -s $(pwd)/promu/promu $(go env GOPATH)/bin/promu
259270
export PATH=$(go env GOPATH)/bin:$PATH
@@ -275,7 +286,7 @@ jobs:
275286
runs-on: macos-latest
276287
steps:
277288
- name: Checkout the repository
278-
uses: actions/checkout@08c6903cd8c0fde910a37f88322edcfb5dd907a8 # v5.0.0
289+
uses: actions/checkout@de0fac2e4500dabe0009e67214ff5f5447ce83dd # v6.0.2
279290
- name: Install dependencies
280291
run: |
281292
brew install \
@@ -286,13 +297,18 @@ jobs:
286297
make \
287298
gnu-sed \
288299
gnu-tar \
289-
go \
290300
python3
291301
- name: test-e2e
292302
run: |
293303
echo "::group::Setup prerequisites"
294304
set -eu
295305
mkdir bin
306+
GOARCH=$(uname -m)
307+
if [ "${GOARCH}" = "x86_64" ] ; then GOARCH="amd64" ; fi
308+
GOGZ="go${GO_VERSION}.darwin-${GOARCH}.tar.gz"
309+
wget https://go.dev/dl/${GOGZ}
310+
gtar xzf ${GOGZ}
311+
ln -s $(pwd)/go/bin/go $(pwd)/bin/go
296312
ln -s $(which ggrep) $(pwd)/bin/grep
297313
ln -s $(which gmake) $(pwd)/bin/make
298314
ln -s $(which gsed) $(pwd)/bin/sed

0 commit comments

Comments
 (0)