Skip to content

Commit f0e9beb

Browse files
rustatianrustatian
authored
Merge pull request #2290 from roadrunner-server/release/v2025.1.7
release: v2025.1.7
2 parents a10a71f + 7648df0 commit f0e9beb

File tree

7 files changed

+36
-122
lines changed

7 files changed

+36
-122
lines changed

‎.github/workflows/codeql-analysis.yml‎

Lines changed: 3 additions & 8 deletions
Original file line numberDiff line numberDiff line change
@@ -2,41 +2,36 @@
22
#
33
# You may wish to alter this file to override the set of languages analyzed, or to provide custom queries or build logic.
44
name: "CodeQL"
5-
65
on:
76
push:
8-
branches: [ master, stable ]
7+
branches: [master, stable]
98
pull_request:
10-
branches: [ master, stable ]
9+
branches: [master, stable]
1110
schedule:
1211
- cron: '0 15 * * 6'
13-
1412
jobs:
1513
analyze:
1614
name: Analyze
1715
runs-on: ubuntu-latest
1816
strategy:
1917
fail-fast: false
2018
matrix:
21-
language: [ 'go' ] # Supported options are ['csharp', 'cpp', 'go', 'java', 'javascript', 'python']
19+
language: ['go'] # Supported options are ['csharp', 'cpp', 'go', 'java', 'javascript', 'python']
2220
steps:
2321
- name: Checkout repository
2422
uses: actions/checkout@v6
2523
with:
2624
# We must fetch at least the immediate parents so that if this is a pull request then we can checkout the head
2725
fetch-depth: 2
28-
2926
# Initializes the Golang environment for the CodeQL tools.
3027
# https://github.com/github/codeql-action/issues/1842#issuecomment-1704398087
3128
- name: Install Go
3229
uses: actions/setup-go@v6
3330
with:
3431
go-version-file: go.mod
35-
3632
- name: Initialize CodeQL
3733
uses: github/codeql-action/init@v4
3834
with:
3935
languages: ${{ matrix.language }}
40-
4136
- name: Perform CodeQL Analysis
4237
uses: github/codeql-action/analyze@v4

‎.github/workflows/dependency-review.yml‎

Lines changed: 0 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -6,10 +6,8 @@
66
# Public documentation: https://docs.github.com/en/code-security/supply-chain-security/understanding-your-software-supply-chain/about-dependency-review#dependency-review-enforcement
77
name: 'Dependency Review'
88
on: [pull_request]
9-
109
permissions:
1110
contents: read
12-
1311
jobs:
1412
dependency-review:
1513
runs-on: ubuntu-latest

‎.github/workflows/release.yml‎

Lines changed: 14 additions & 28 deletions
Original file line numberDiff line numberDiff line change
@@ -1,22 +1,20 @@
11
name: release
2-
32
on:
43
release: # Docs: <https://help.github.com/en/articles/events-that-trigger-workflows#release-event-release>
54
types:
65
- released
76
- prereleased
8-
97
jobs:
108
build:
119
name: Build for ${{ matrix.os }} (${{ matrix.arch }}, ${{ matrix.compiler }})
1210
runs-on: ubuntu-latest
1311
strategy:
1412
fail-fast: false
1513
matrix:
16-
os: [ windows, darwin ] # linux, darwin, windows
17-
compiler: [ gcc ] # gcc, musl-gcc
18-
archiver: [ zip ] # tar, zip
19-
arch: [ amd64 ] # amd64, 386
14+
os: [windows, darwin] # linux, darwin, windows
15+
compiler: [gcc] # gcc, musl-gcc
16+
archiver: [zip] # tar, zip
17+
arch: [amd64] # amd64, 386
2018
include:
2119
- os: linux
2220
compiler: gcc
@@ -47,17 +45,13 @@ jobs:
4745
uses: actions/setup-go@v6
4846
with:
4947
go-version: stable
50-
5148
- name: Check out code
5249
uses: actions/checkout@v6
53-
5450
- name: Install musl
5551
if: matrix.compiler == 'musl-gcc'
5652
run: sudo apt-get install -y musl-tools
57-
5853
- name: Download dependencies
5954
run: go mod download # `-x` means "verbose" mode
60-
6155
- name: Generate builder values
6256
id: values
6357
run: |
@@ -69,15 +63,13 @@ jobs:
6963
else
7064
echo "sign-cert-name=rr.asc" >> $GITHUB_OUTPUT
7165
fi
72-
7366
- name: Import GPG key
7467
uses: crazy-max/ghaction-import-gpg@v6
7568
with:
7669
gpg_private_key: ${{ secrets.GPG_SIGNING_KEY }}
7770
passphrase: ${{ secrets.GPG_PASS }}
7871
git_user_signingkey: true
7972
git_commit_gpgsign: false
80-
8173
- name: Compile binary file
8274
env:
8375
GOOS: ${{ matrix.os }}
@@ -86,29 +78,34 @@ jobs:
8678
GPG_SIGNING_KEY: ${{ secrets.GPG_SIGNING_KEY }}
8779
GPG_PASS: ${{secrets.GPG_PASS}}
8880
CGO_ENABLED: 0
89-
GOEXPERIMENT: greenteagc
9081
LDFLAGS: >-
91-
-s
92-
-X github.com/roadrunner-server/roadrunner/v2025/internal/meta.version=${{ steps.values.outputs.version }}
93-
-X github.com/roadrunner-server/roadrunner/v2025/internal/meta.buildTime=${{ steps.values.outputs.timestamp }}
82+
-s -X github.com/roadrunner-server/roadrunner/v2025/internal/meta.version=${{ steps.values.outputs.version }} -X github.com/roadrunner-server/roadrunner/v2025/internal/meta.buildTime=${{ steps.values.outputs.timestamp }}
9483
run: |
9584
go build -trimpath -ldflags "$LDFLAGS" -o "./${{ steps.values.outputs.binary-name }}" ./cmd/rr
9685
stat "./${{ steps.values.outputs.binary-name }}"
9786
gpg --detach-sign --armor "./${{ steps.values.outputs.binary-name }}"
98-
9987
- name: Generate distributive directory name
10088
id: dist-dir
10189
run: >
10290
echo "name=$(echo roadrunner-${{ steps.values.outputs.version }}-$(
91+
92+
93+
10394
[ ${{ matrix.os }} != '' ] && echo '${{ matrix.os }}' || echo 'unknown'
10495
)$(
96+
97+
98+
10599
[ ${{ matrix.compiler }} = 'musl-gcc' ] && echo '-musl'
106100
))-${{ matrix.arch }}" >> $GITHUB_OUTPUT
107101
108102
- name: Generate distributive archive name
109103
id: dist-arch
110104
run: >
111105
echo "name=$(echo ${{ steps.dist-dir.outputs.name }}.$(
106+
107+
108+
112109
case ${{ matrix.archiver }} in
113110
zip) echo 'zip';;
114111
tar) echo 'tar.gz';;
@@ -121,63 +118,52 @@ jobs:
121118
mkdir ${{ steps.dist-dir.outputs.name }}
122119
mv "./${{ steps.values.outputs.binary-name }}" "./${{ steps.values.outputs.sign-cert-name }}" ./${{ steps.dist-dir.outputs.name }}/
123120
cp ./README.md ./CHANGELOG.md ./LICENSE ./${{ steps.dist-dir.outputs.name }}
124-
125121
- name: Pack distributive using tar
126122
if: matrix.archiver == 'tar'
127123
run: tar -zcf "${{ steps.dist-arch.outputs.name }}" "${{ steps.dist-dir.outputs.name }}"
128-
129124
- name: Pack distributive using zip
130125
if: matrix.archiver == 'zip'
131126
run: zip -r -q "${{ steps.dist-arch.outputs.name }}" "${{ steps.dist-dir.outputs.name }}"
132-
133127
- name: Upload artifact
134128
uses: actions/upload-artifact@v6
135129
with:
136130
name: ${{ steps.dist-dir.outputs.name }}
137131
path: ${{ steps.dist-arch.outputs.name }}
138132
if-no-files-found: error
139133
retention-days: 30
140-
141134
- name: Upload binaries to release
142135
uses: svenstaro/upload-release-action@v2
143136
with:
144137
repo_token: ${{ secrets.GITHUB_TOKEN }}
145138
file: ${{ steps.dist-arch.outputs.name }}
146139
asset_name: ${{ steps.dist-arch.outputs.name }}
147140
tag: ${{ github.ref }}
148-
149141
docker:
150142
name: Build docker image
151143
runs-on: ubuntu-latest
152144
steps:
153145
- name: Check out code
154146
uses: actions/checkout@v6
155-
156147
- name: Set up QEMU
157148
uses: docker/setup-qemu-action@v3 # Action page: <https://github.com/docker/setup-qemu-action>
158-
159149
- name: Set up Docker Buildx
160150
uses: docker/setup-buildx-action@v3 # Action page: <https://github.com/docker/setup-buildx-action>
161-
162151
- name: Login to Docker Hub
163152
uses: docker/login-action@v3
164153
with:
165154
username: ${{ secrets.DOCKER_LOGIN }}
166155
password: ${{ secrets.DOCKER_PASSWORD }}
167-
168156
- name: Login to GitHub Container Registry
169157
uses: docker/login-action@v3
170158
with:
171159
registry: ghcr.io
172160
username: ${{ secrets.GHCR_LOGIN }}
173161
password: ${{ secrets.GHCR_PASSWORD }}
174-
175162
- name: Generate builder values
176163
id: values
177164
run: |
178165
echo "version_full=$(echo ${GITHUB_REF##*/} | sed -e 's/^[vV ]*//')" >> $GITHUB_OUTPUT
179166
echo "timestamp=$(echo $(date +%FT%T%z))" >> $GITHUB_OUTPUT
180-
181167
- name: Build image
182168
uses: docker/build-push-action@v6 # Action page: <https://github.com/docker/build-push-action>
183169
with:

‎.github/workflows/release_dep.yml‎

Lines changed: 4 additions & 19 deletions
Original file line numberDiff line numberDiff line change
@@ -1,77 +1,63 @@
11
name: release_dep
2-
32
on:
43
release: # Docs: <https://help.github.com/en/articles/events-that-trigger-workflows#release-event-release>
54
types:
65
- released
76
- prereleased
8-
97
jobs:
108
build:
119
name: Build for ${{ matrix.os }} (${{ matrix.arch }}, ${{ matrix.compiler }})
1210
runs-on: ubuntu-latest
1311
strategy:
1412
fail-fast: false
1513
matrix:
16-
os: [ linux ]
17-
compiler: [ gcc ]
18-
arch: [ amd64 ]
19-
14+
os: [linux]
15+
compiler: [gcc]
16+
arch: [amd64]
2017
steps:
2118
- name: Check out code
2219
uses: actions/checkout@v6
23-
2420
- name: Set up Go
2521
uses: actions/setup-go@v6
2622
with:
2723
go-version: stable
28-
2924
- name: Download dependencies
3025
run: go mod download
31-
3226
- name: Generate builder values
3327
id: values
3428
run: |
3529
echo "version=$(echo ${GITHUB_REF##*/} | sed -e 's/^[vV ]*//')" >> $GITHUB_OUTPUT
3630
echo "timestamp=$(echo $(date +%FT%T%z))" >> $GITHUB_OUTPUT
3731
echo "binary-name=rr" >> $GITHUB_OUTPUT
3832
echo "sign-cert-name=rr.asc" >> $GITHUB_OUTPUT
39-
4033
- name: Import GPG key
4134
uses: crazy-max/ghaction-import-gpg@v6
4235
with:
4336
gpg_private_key: ${{ secrets.GPG_SIGNING_KEY }}
4437
passphrase: ${{ secrets.GPG_PASS }}
4538
git_user_signingkey: true
4639
git_commit_gpgsign: false
47-
4840
- name: Compile binary file
4941
env:
5042
GOOS: ${{ matrix.os }}
5143
GOARCH: ${{ matrix.arch }}
5244
CC: ${{ matrix.compiler }}
5345
GPG_SIGNING_KEY: ${{ secrets.GPG_SIGNING_KEY }}
5446
GPG_PASS: ${{secrets.GPG_PASS}}
55-
GOEXPERIMENT: greenteagc
5647
CGO_ENABLED: 0
5748
LDFLAGS: >-
58-
-s
59-
-X github.com/roadrunner-server/roadrunner/v2025/internal/meta.version=${{ steps.values.outputs.version }}
60-
-X github.com/roadrunner-server/roadrunner/v2025/internal/meta.buildTime=${{ steps.values.outputs.timestamp }}
49+
-s -X github.com/roadrunner-server/roadrunner/v2025/internal/meta.version=${{ steps.values.outputs.version }} -X github.com/roadrunner-server/roadrunner/v2025/internal/meta.buildTime=${{ steps.values.outputs.timestamp }}
6150
run: |
6251
go build -trimpath -ldflags "$LDFLAGS" -o "./${{ steps.values.outputs.binary-name }}" ./cmd/rr
6352
stat "./${{ steps.values.outputs.binary-name }}"
6453
gpg --detach-sign --armor "./${{ steps.values.outputs.binary-name }}"
65-
6654
- name: Create DEB dirs
6755
run: |
6856
mkdir -p dist/ubuntu/roadrunner-${{ steps.values.outputs.version }}-linux-amd64/DEBIAN
6957
mkdir -p dist/ubuntu/roadrunner-${{ steps.values.outputs.version }}-linux-amd64/usr/bin
7058
ls -la dist/ubuntu/roadrunner-${{ steps.values.outputs.version }}-linux-amd64
71-
7259
- name: Create DEB control file
7360
run: touch dist/ubuntu/roadrunner-${{ steps.values.outputs.version }}-linux-amd64/DEBIAN/control
74-
7561
- name: Build Debian package
7662
run: |
7763
echo "Package: roadrunner-${{ steps.values.outputs.version }}-linux-amd64.deb" >> dist/ubuntu/roadrunner-${{ steps.values.outputs.version }}-linux-amd64/DEBIAN/control
@@ -86,7 +72,6 @@ jobs:
8672
8773
cp "./${{ steps.values.outputs.binary-name }}" dist/ubuntu/roadrunner-${{ steps.values.outputs.version }}-linux-amd64/usr/bin/
8874
dpkg --build dist/ubuntu/roadrunner-${{ steps.values.outputs.version }}-linux-amd64
89-
9075
- name: Upload dep to release
9176
uses: svenstaro/upload-release-action@v2
9277
with:

‎.github/workflows/release_dep_aarch64.yml‎

Lines changed: 4 additions & 19 deletions
Original file line numberDiff line numberDiff line change
@@ -1,50 +1,42 @@
11
name: release_dep_arm64
2-
32
on:
43
release: # Docs: <https://help.github.com/en/articles/events-that-trigger-workflows#release-event-release>
54
types:
65
- released
76
- prereleased
8-
97
jobs:
108
build:
119
name: Build for ${{ matrix.os }} (${{ matrix.arch }}, ${{ matrix.compiler }})
1210
runs-on: ubuntu-latest
1311
strategy:
1412
fail-fast: false
1513
matrix:
16-
os: [ linux ]
17-
compiler: [ gcc ]
18-
arch: [ arm64 ]
19-
14+
os: [linux]
15+
compiler: [gcc]
16+
arch: [arm64]
2017
steps:
2118
- name: Check out code
2219
uses: actions/checkout@v6
23-
2420
- name: Set up Go
2521
uses: actions/setup-go@v6
2622
with:
2723
go-version: stable
28-
2924
- name: Download dependencies
3025
run: go mod download
31-
3226
- name: Generate builder values
3327
id: values
3428
run: |
3529
echo "version=$(echo ${GITHUB_REF##*/} | sed -e 's/^[vV ]*//')" >> $GITHUB_OUTPUT
3630
echo "timestamp=$(echo $(date +%FT%T%z))" >> $GITHUB_OUTPUT
3731
echo "binary-name=rr" >> $GITHUB_OUTPUT
3832
echo "sign-cert-name=rr.asc" >> $GITHUB_OUTPUT
39-
4033
- name: Import GPG key
4134
uses: crazy-max/ghaction-import-gpg@v6
4235
with:
4336
gpg_private_key: ${{ secrets.GPG_SIGNING_KEY }}
4437
passphrase: ${{ secrets.GPG_PASS }}
4538
git_user_signingkey: true
4639
git_commit_gpgsign: false
47-
4840
- name: Compile binary file
4941
env:
5042
GOOS: ${{ matrix.os }}
@@ -53,25 +45,19 @@ jobs:
5345
GPG_SIGNING_KEY: ${{ secrets.GPG_SIGNING_KEY }}
5446
GPG_PASS: ${{secrets.GPG_PASS}}
5547
CGO_ENABLED: 0
56-
GOEXPERIMENT: greenteagc
5748
LDFLAGS: >-
58-
-s
59-
-X github.com/roadrunner-server/roadrunner/v2025/internal/meta.version=${{ steps.values.outputs.version }}
60-
-X github.com/roadrunner-server/roadrunner/v2025/internal/meta.buildTime=${{ steps.values.outputs.timestamp }}
49+
-s -X github.com/roadrunner-server/roadrunner/v2025/internal/meta.version=${{ steps.values.outputs.version }} -X github.com/roadrunner-server/roadrunner/v2025/internal/meta.buildTime=${{ steps.values.outputs.timestamp }}
6150
run: |
6251
go build -trimpath -ldflags "$LDFLAGS" -o "./${{ steps.values.outputs.binary-name }}" ./cmd/rr
6352
stat "./${{ steps.values.outputs.binary-name }}"
6453
gpg --detach-sign --armor "./${{ steps.values.outputs.binary-name }}"
65-
6654
- name: Create DEB dirs
6755
run: |
6856
mkdir -p dist/ubuntu/roadrunner-${{ steps.values.outputs.version }}-linux-arm64/DEBIAN
6957
mkdir -p dist/ubuntu/roadrunner-${{ steps.values.outputs.version }}-linux-arm64/usr/bin
7058
ls -la dist/ubuntu/roadrunner-${{ steps.values.outputs.version }}-linux-arm64
71-
7259
- name: Create DEB control file
7360
run: touch dist/ubuntu/roadrunner-${{ steps.values.outputs.version }}-linux-arm64/DEBIAN/control
74-
7561
- name: Build Debian package
7662
run: |
7763
echo "Package: roadrunner-${{ steps.values.outputs.version }}-linux-arm64.deb" >> dist/ubuntu/roadrunner-${{ steps.values.outputs.version }}-linux-arm64/DEBIAN/control
@@ -86,7 +72,6 @@ jobs:
8672
8773
cp "./${{ steps.values.outputs.binary-name }}" dist/ubuntu/roadrunner-${{ steps.values.outputs.version }}-linux-arm64/usr/bin/
8874
dpkg --build dist/ubuntu/roadrunner-${{ steps.values.outputs.version }}-linux-arm64
89-
9075
- name: Upload dep to release
9176
uses: svenstaro/upload-release-action@v2
9277
with:

0 commit comments

Comments
 (0)