Skip to content

Commit cab608f

Browse files
deniszhdeniszh
authored
Merge branch 'main' into dependabot/go_modules/github.com/ansel1/merry-1.8.1
2 parents c6af7a8 + 5d78233 commit cab608f

11 files changed

+325
-325
lines changed

‎.github/workflows/codeql.yml‎

Lines changed: 30 additions & 30 deletions
Original file line numberDiff line numberDiff line change
@@ -22,43 +22,43 @@ jobs:
2222
matrix:
2323
# Override automatic language detection by changing the below list
2424
# Supported options are ['csharp', 'cpp', 'go', 'java', 'javascript', 'python']
25-
language: ['go']
25+
language: ["go"]
2626
# Learn more...
2727
# https://docs.github.com/en/github/finding-security-vulnerabilities-and-errors-in-your-code/configuring-code-scanning#overriding-automatic-language-detection
2828

2929
steps:
30-
- name: Checkout repository
31-
uses: actions/checkout@v5
32-
with:
33-
# We must fetch at least the immediate parents so that if this is
34-
# a pull request then we can checkout the head.
35-
fetch-depth: 2
30+
- name: Checkout repository
31+
uses: actions/checkout@v5
32+
with:
33+
# We must fetch at least the immediate parents so that if this is
34+
# a pull request then we can checkout the head.
35+
fetch-depth: 2
3636

37-
# Initializes the CodeQL tools for scanning.
38-
- name: Initialize CodeQL
39-
uses: github/codeql-action/init@v3
40-
with:
41-
languages: ${{ matrix.language }}
42-
# If you wish to specify custom queries, you can do so here or in a config file.
43-
# By default, queries listed here will override any specified in a config file.
44-
# Prefix the list here with "+" to use these queries and those in the config file.
45-
# queries: ./path/to/local/query, your-org/your-repo/queries@main
37+
# Initializes the CodeQL tools for scanning.
38+
- name: Initialize CodeQL
39+
uses: github/codeql-action/init@v3
40+
with:
41+
languages: ${{ matrix.language }}
42+
# If you wish to specify custom queries, you can do so here or in a config file.
43+
# By default, queries listed here will override any specified in a config file.
44+
# Prefix the list here with "+" to use these queries and those in the config file.
45+
# queries: ./path/to/local/query, your-org/your-repo/queries@main
4646

47-
# Autobuild attempts to build any compiled languages (C/C++, C#, or Java).
48-
# If this step fails, then you should remove it and run the build manually (see below)
49-
- name: Autobuild
50-
uses: github/codeql-action/autobuild@v3
47+
# Autobuild attempts to build any compiled languages (C/C++, C#, or Java).
48+
# If this step fails, then you should remove it and run the build manually (see below)
49+
- name: Autobuild
50+
uses: github/codeql-action/autobuild@v3
5151

52-
# ℹ️ Command-line programs to run using the OS shell.
53-
# 📚 https://git.io/JvXDl
52+
# ℹ️ Command-line programs to run using the OS shell.
53+
# 📚 https://git.io/JvXDl
5454

55-
# ✏️ If the Autobuild fails above, remove it and uncomment the following three lines
56-
# and modify them (or add more) to build your code if your project
57-
# uses a compiled language
55+
# ✏️ If the Autobuild fails above, remove it and uncomment the following three lines
56+
# and modify them (or add more) to build your code if your project
57+
# uses a compiled language
5858

59-
#- run: |
60-
# make bootstrap
61-
# make release
59+
#- run: |
60+
# make bootstrap
61+
# make release
6262

63-
- name: Perform CodeQL Analysis
64-
uses: github/codeql-action/analyze@v3
63+
- name: Perform CodeQL Analysis
64+
uses: github/codeql-action/analyze@v3

‎.github/workflows/docker-ghcrio.yml‎

Lines changed: 7 additions & 7 deletions
Original file line numberDiff line numberDiff line change
@@ -65,16 +65,17 @@ jobs:
6565
uses: actions/checkout@v5
6666
with:
6767
fetch-tags: true
68+
ref: ${{ github.ref }}
6869

6970
- name: Docker meta
7071
id: meta
7172
uses: docker/metadata-action@v5
7273
with:
7374
images: ghcr.io/${{ github.repository }}
74-
75+
7576
- name: Set up Docker Buildx
7677
uses: docker/setup-buildx-action@v3
77-
78+
7879
- name: Build
7980
uses: docker/build-push-action@v6
8081
with:
@@ -121,23 +122,24 @@ jobs:
121122
uses: actions/checkout@v5
122123
with:
123124
fetch-tags: true
125+
ref: ${{ github.ref }}
124126

125127
- name: Docker meta
126128
id: meta
127129
uses: docker/metadata-action@v5
128130
with:
129131
images: ghcr.io/${{ github.repository }}
130-
132+
131133
- name: Set up QEMU
132134
uses: docker/setup-qemu-action@v3
133135
if: ${{ matrix.platform.qemu }}
134136
with:
135137
platforms: ${{ matrix.platform.qemu }}
136138
cache-image: false
137-
139+
138140
- name: Set up Docker Buildx
139141
uses: docker/setup-buildx-action@v3
140-
142+
141143
- name: Login to GitHub Container Registry
142144
if: needs.prepare.outputs.publish_image
143145
uses: docker/login-action@v3
@@ -230,5 +232,3 @@ jobs:
230232
231233
- name: Inspect image
232234
run: docker buildx imagetools inspect ghcr.io/${{ needs.prepare.outputs.github_repository }}:${{ steps.meta.outputs.version }}
233-
234-

‎.github/workflows/packages-centos-7.yaml‎

Lines changed: 32 additions & 32 deletions
Original file line numberDiff line numberDiff line change
@@ -3,7 +3,7 @@ name: Build packages for CentOS 7
33
on:
44
workflow_run:
55
workflows: ["Tests"]
6-
branches: [ main ]
6+
branches: [main]
77
types:
88
- completed
99
push:
@@ -19,34 +19,34 @@ jobs:
1919
go:
2020
- ^1
2121
steps:
22-
- name: Set up Go
23-
uses: actions/setup-go@v6
24-
with:
25-
go-version: ${{ matrix.go }}
26-
- name: Set up Ruby for package_cloud uploader to work
27-
uses: ruby/setup-ruby@v1
28-
with:
29-
ruby-version: '2.7' # Version range or exact version of a Ruby version to use, using semvers version range syntax.
30-
- name: Install packaging dependencies
31-
run: |
32-
sudo apt-get install libcairo2-dev mercurial pkg-config wget -y
33-
gem install package_cloud
34-
- name: Check out code into the Go module directory
35-
uses: actions/checkout@v5
36-
with:
37-
fetch-depth: 0
38-
- name: Set up QEMU
39-
uses: docker/setup-qemu-action@v3
40-
- name: Log in to GitHub Docker Registry
41-
uses: docker/login-action@v3
42-
with:
43-
registry: ghcr.io
44-
username: ${{ github.actor }}
45-
password: ${{ secrets.GITHUB_TOKEN }}
46-
- name: Create packages
47-
env:
48-
BUILD_PACKAGES: true
49-
PACKAGECLOUD_TOKEN: ${{ secrets.PACKAGECLOUD_TOKEN }}
50-
run: |
51-
wget "https://raw.githubusercontent.com/go-graphite/helper-scripts/main/build.sh" && chmod +x ./build.sh
52-
./build.sh carbonapi "centos:7"
22+
- name: Set up Go
23+
uses: actions/setup-go@v6
24+
with:
25+
go-version: ${{ matrix.go }}
26+
- name: Set up Ruby for package_cloud uploader to work
27+
uses: ruby/setup-ruby@v1
28+
with:
29+
ruby-version: "2.7" # Version range or exact version of a Ruby version to use, using semvers version range syntax.
30+
- name: Install packaging dependencies
31+
run: |
32+
sudo apt-get install libcairo2-dev mercurial pkg-config wget -y
33+
gem install package_cloud
34+
- name: Check out code into the Go module directory
35+
uses: actions/checkout@v5
36+
with:
37+
fetch-depth: 0
38+
- name: Set up QEMU
39+
uses: docker/setup-qemu-action@v3
40+
- name: Log in to GitHub Docker Registry
41+
uses: docker/login-action@v3
42+
with:
43+
registry: ghcr.io
44+
username: ${{ github.actor }}
45+
password: ${{ secrets.GITHUB_TOKEN }}
46+
- name: Create packages
47+
env:
48+
BUILD_PACKAGES: true
49+
PACKAGECLOUD_TOKEN: ${{ secrets.PACKAGECLOUD_TOKEN }}
50+
run: |
51+
wget "https://raw.githubusercontent.com/go-graphite/helper-scripts/main/build.sh" && chmod +x ./build.sh
52+
./build.sh carbonapi "centos:7"

‎.github/workflows/packages-debian-bookworm.yaml‎

Lines changed: 32 additions & 32 deletions
Original file line numberDiff line numberDiff line change
@@ -3,7 +3,7 @@ name: Build packages for Debian Bookworm
33
on:
44
workflow_run:
55
workflows: ["Tests"]
6-
branches: [ main ]
6+
branches: [main]
77
types:
88
- completed
99
push:
@@ -19,34 +19,34 @@ jobs:
1919
go:
2020
- ^1
2121
steps:
22-
- name: Set up Go
23-
uses: actions/setup-go@v6
24-
with:
25-
go-version: ${{ matrix.go }}
26-
- name: Set up Ruby for package_cloud uploader to work
27-
uses: ruby/setup-ruby@v1
28-
with:
29-
ruby-version: '2.7' # Version range or exact version of a Ruby version to use, using semvers version range syntax.
30-
- name: Install packaging dependencies
31-
run: |
32-
sudo apt-get install libcairo2-dev mercurial pkg-config wget -y
33-
gem install package_cloud
34-
- name: Check out code into the Go module directory
35-
uses: actions/checkout@v5
36-
with:
37-
fetch-depth: 0
38-
- name: Set up QEMU
39-
uses: docker/setup-qemu-action@v3
40-
- name: Log in to GitHub Docker Registry
41-
uses: docker/login-action@v3
42-
with:
43-
registry: ghcr.io
44-
username: ${{ github.actor }}
45-
password: ${{ secrets.GITHUB_TOKEN }}
46-
- name: Create packages
47-
env:
48-
BUILD_PACKAGES: true
49-
PACKAGECLOUD_TOKEN: ${{ secrets.PACKAGECLOUD_TOKEN }}
50-
run: |
51-
wget "https://raw.githubusercontent.com/go-graphite/helper-scripts/main/build.sh" && chmod +x ./build.sh
52-
./build.sh carbonapi "debian:bookworm"
22+
- name: Set up Go
23+
uses: actions/setup-go@v6
24+
with:
25+
go-version: ${{ matrix.go }}
26+
- name: Set up Ruby for package_cloud uploader to work
27+
uses: ruby/setup-ruby@v1
28+
with:
29+
ruby-version: "2.7" # Version range or exact version of a Ruby version to use, using semvers version range syntax.
30+
- name: Install packaging dependencies
31+
run: |
32+
sudo apt-get install libcairo2-dev mercurial pkg-config wget -y
33+
gem install package_cloud
34+
- name: Check out code into the Go module directory
35+
uses: actions/checkout@v5
36+
with:
37+
fetch-depth: 0
38+
- name: Set up QEMU
39+
uses: docker/setup-qemu-action@v3
40+
- name: Log in to GitHub Docker Registry
41+
uses: docker/login-action@v3
42+
with:
43+
registry: ghcr.io
44+
username: ${{ github.actor }}
45+
password: ${{ secrets.GITHUB_TOKEN }}
46+
- name: Create packages
47+
env:
48+
BUILD_PACKAGES: true
49+
PACKAGECLOUD_TOKEN: ${{ secrets.PACKAGECLOUD_TOKEN }}
50+
run: |
51+
wget "https://raw.githubusercontent.com/go-graphite/helper-scripts/main/build.sh" && chmod +x ./build.sh
52+
./build.sh carbonapi "debian:bookworm"

‎.github/workflows/packages-debian-bullseye.yaml‎

Lines changed: 32 additions & 32 deletions
Original file line numberDiff line numberDiff line change
@@ -3,7 +3,7 @@ name: Build packages for Debian Bullseye
33
on:
44
workflow_run:
55
workflows: ["Tests"]
6-
branches: [ main ]
6+
branches: [main]
77
types:
88
- completed
99
push:
@@ -19,34 +19,34 @@ jobs:
1919
go:
2020
- ^1
2121
steps:
22-
- name: Set up Go
23-
uses: actions/setup-go@v6
24-
with:
25-
go-version: ${{ matrix.go }}
26-
- name: Set up Ruby for package_cloud uploader to work
27-
uses: ruby/setup-ruby@v1
28-
with:
29-
ruby-version: '2.7' # Version range or exact version of a Ruby version to use, using semvers version range syntax.
30-
- name: Install packaging dependencies
31-
run: |
32-
sudo apt-get install libcairo2-dev mercurial pkg-config wget -y
33-
gem install package_cloud
34-
- name: Check out code into the Go module directory
35-
uses: actions/checkout@v5
36-
with:
37-
fetch-depth: 0
38-
- name: Set up QEMU
39-
uses: docker/setup-qemu-action@v3
40-
- name: Log in to GitHub Docker Registry
41-
uses: docker/login-action@v3
42-
with:
43-
registry: ghcr.io
44-
username: ${{ github.actor }}
45-
password: ${{ secrets.GITHUB_TOKEN }}
46-
- name: Create packages
47-
env:
48-
BUILD_PACKAGES: true
49-
PACKAGECLOUD_TOKEN: ${{ secrets.PACKAGECLOUD_TOKEN }}
50-
run: |
51-
wget "https://raw.githubusercontent.com/go-graphite/helper-scripts/main/build.sh" && chmod +x ./build.sh
52-
./build.sh carbonapi "debian:bullseye"
22+
- name: Set up Go
23+
uses: actions/setup-go@v6
24+
with:
25+
go-version: ${{ matrix.go }}
26+
- name: Set up Ruby for package_cloud uploader to work
27+
uses: ruby/setup-ruby@v1
28+
with:
29+
ruby-version: "2.7" # Version range or exact version of a Ruby version to use, using semvers version range syntax.
30+
- name: Install packaging dependencies
31+
run: |
32+
sudo apt-get install libcairo2-dev mercurial pkg-config wget -y
33+
gem install package_cloud
34+
- name: Check out code into the Go module directory
35+
uses: actions/checkout@v5
36+
with:
37+
fetch-depth: 0
38+
- name: Set up QEMU
39+
uses: docker/setup-qemu-action@v3
40+
- name: Log in to GitHub Docker Registry
41+
uses: docker/login-action@v3
42+
with:
43+
registry: ghcr.io
44+
username: ${{ github.actor }}
45+
password: ${{ secrets.GITHUB_TOKEN }}
46+
- name: Create packages
47+
env:
48+
BUILD_PACKAGES: true
49+
PACKAGECLOUD_TOKEN: ${{ secrets.PACKAGECLOUD_TOKEN }}
50+
run: |
51+
wget "https://raw.githubusercontent.com/go-graphite/helper-scripts/main/build.sh" && chmod +x ./build.sh
52+
./build.sh carbonapi "debian:bullseye"

0 commit comments

Comments
 (0)