Skip to content

Commit 371894c

Browse files
authored
Merge branch 'main' into rv64
2 parents 8568880 + edaf1aa commit 371894c

38 files changed

+414
-592
lines changed

.chloggen/add-prw2.yaml

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

.chloggen/add_textencoding_extension.yaml

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

.chloggen/chore-add-tinybird-exporter-to-contrib-distro.yaml

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

.chloggen/grpcnotrace.yaml

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

.chloggen/remove-loki.yml

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

.github/workflows/base-ci-goreleaser.yaml

Lines changed: 0 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -28,9 +28,6 @@ on:
2828
required: false
2929
type: string
3030

31-
permissions:
32-
contents: read
33-
3431
env:
3532
# renovate: datasource=github-releases depName=goreleaser/goreleaser-pro
3633
GORELEASER_PRO_VERSION: v2.11.0

.github/workflows/base-package-tests.yaml

Lines changed: 0 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -15,9 +15,6 @@ on:
1515
default: false
1616
description: "Set to true if a GH issue should be generated upon failure"
1717

18-
permissions:
19-
contents: read
20-
2118
jobs:
2219
package-tests:
2320
name: Package Tests

.github/workflows/base-release.yaml

Lines changed: 8 additions & 9 deletions
Original file line numberDiff line numberDiff line change
@@ -17,9 +17,6 @@ on:
1717
type: string
1818
default: ubuntu-24.04
1919

20-
permissions:
21-
contents: read
22-
2320
env:
2421
# renovate: datasource=github-releases depName=goreleaser/goreleaser-pro
2522
GORELEASER_PRO_VERSION: v2.11.0
@@ -42,6 +39,8 @@ jobs:
4239
- GOOS: darwin
4340
GOARCH: riscv64
4441
runs-on: ${{ inputs.runner_os }}
42+
permissions:
43+
packages: write
4544

4645
steps:
4746
- uses: actions/checkout@11bd71901bbe5b1630ceea73d27597364c9af683 # v4.2.2
@@ -81,8 +80,8 @@ jobs:
8180
- name: Log into Docker.io
8281
uses: docker/login-action@74a5d142397b4f367a81961eba4e8cd7edddf772 # v3.4.0
8382
with:
84-
username: ${{ vars.DOCKER_USERNAME }}
85-
password: ${{ secrets.DOCKER_TOKEN_COLLECTOR_RELEASES }}
83+
username: ${{ secrets.DOCKER_USERNAME }}
84+
password: ${{ secrets.DOCKER_PASSWORD }}
8685

8786
- name: Login to GitHub Package Registry
8887
uses: docker/login-action@74a5d142397b4f367a81961eba4e8cd7edddf772 # v3.4.0
@@ -112,7 +111,7 @@ jobs:
112111
GOAMD64: v1
113112
GOPPC64: power8
114113
GORELEASER_KEY: ${{ secrets.GORELEASER_KEY }}
115-
GITHUB_TOKEN: ${{ secrets.GH_PAT }}
114+
GITHUB_TOKEN: ${{ secrets.GITHUB_TOKEN }}
116115
COSIGN_YES: true
117116

118117
- name: Move built artifacts
@@ -135,7 +134,7 @@ jobs:
135134
GOOS: ${{ matrix.GOOS }}
136135
GOARCH: ${{ matrix.GOARCH }}
137136
GOARM: 7 # Default is 6
138-
GITHUB_TOKEN: ${{ secrets.GH_PAT }}
137+
GITHUB_TOKEN: ${{ secrets.GITHUB_TOKEN }}
139138
COSIGN_YES: true
140139
GORELEASER_KEY: ${{ secrets.GORELEASER_KEY }}
141140

@@ -215,8 +214,8 @@ jobs:
215214
- name: Log into Docker.io
216215
uses: docker/login-action@74a5d142397b4f367a81961eba4e8cd7edddf772 # v3.4.0
217216
with:
218-
username: ${{ vars.DOCKER_USERNAME }}
219-
password: ${{ secrets.DOCKER_TOKEN_COLLECTOR_RELEASES }}
217+
username: ${{ secrets.DOCKER_USERNAME }}
218+
password: ${{ secrets.DOCKER_PASSWORD }}
220219

221220
- name: Login to GitHub Package Registry
222221
uses: docker/login-action@74a5d142397b4f367a81961eba4e8cd7edddf772 # v3.4.0

.github/workflows/changelog.yml

Lines changed: 0 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -11,9 +11,6 @@ on:
1111
branches:
1212
- main
1313

14-
permissions:
15-
contents: read
16-
1714
env:
1815
# Make sure to exit early if cache segment download times out after 2 minutes.
1916
# We limit cache download as a whole to 5 minutes.

.github/workflows/ci-builder.yaml

Lines changed: 0 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -23,9 +23,6 @@ on:
2323
- "go.mod"
2424
- "go.sum"
2525

26-
permissions:
27-
contents: read
28-
2926
env:
3027
# renovate: datasource=github-releases depName=goreleaser/goreleaser-pro
3128
GORELEASER_PRO_VERSION: v2.11.0

0 commit comments

Comments
 (0)