Skip to content

Commit efb1ae1

Browse files
authored
Merge branch 'master' into fix-multicast-macos
2 parents d070c89 + 60ef52f commit efb1ae1

File tree

260 files changed

+13299
-2820
lines changed

Some content is hidden

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

260 files changed

+13299
-2820
lines changed

.github/workflows/build.yml

Lines changed: 68 additions & 11 deletions
Original file line numberDiff line numberDiff line change
@@ -19,7 +19,7 @@ jobs:
1919

2020
- name: Setup Go
2121
uses: actions/setup-go@v5
22-
with: { go-version: '1.22' }
22+
with: { go-version: '1.25' }
2323

2424
- name: Build go2rtc_win64
2525
env: { GOOS: windows, GOARCH: amd64 }
@@ -102,14 +102,14 @@ jobs:
102102
env: { GOOS: freebsd, GOARCH: amd64 }
103103
run: go build -ldflags "-s -w" -trimpath
104104
- name: Upload go2rtc_freebsd_amd64
105-
uses: actions/upload-artifact@v3
105+
uses: actions/upload-artifact@v4
106106
with: { name: go2rtc_freebsd_amd64, path: go2rtc }
107107

108108
- name: Build go2rtc_freebsd_arm64
109109
env: { GOOS: freebsd, GOARCH: arm64 }
110110
run: go build -ldflags "-s -w" -trimpath
111111
- name: Upload go2rtc_freebsd_arm64
112-
uses: actions/upload-artifact@v3
112+
uses: actions/upload-artifact@v4
113113
with: { name: go2rtc_freebsd_arm64, path: go2rtc }
114114

115115
docker-master:
@@ -124,7 +124,7 @@ jobs:
124124
uses: docker/metadata-action@v5
125125
with:
126126
images: |
127-
${{ github.repository }}
127+
name=${{ github.repository }},enable=${{ github.event.repository.fork == false }}
128128
ghcr.io/${{ github.repository }}
129129
tags: |
130130
type=ref,event=branch
@@ -138,14 +138,14 @@ jobs:
138138
uses: docker/setup-buildx-action@v3
139139

140140
- name: Login to DockerHub
141-
if: github.event_name != 'pull_request'
141+
if: github.event_name == 'push' && github.event.repository.fork == false
142142
uses: docker/login-action@v3
143143
with:
144144
username: ${{ secrets.DOCKERHUB_USERNAME }}
145145
password: ${{ secrets.DOCKERHUB_TOKEN }}
146146

147147
- name: Login to GitHub Container Registry
148-
if: github.event_name != 'pull_request'
148+
if: github.event_name == 'push'
149149
uses: docker/login-action@v3
150150
with:
151151
registry: ghcr.io
@@ -156,9 +156,11 @@ jobs:
156156
uses: docker/build-push-action@v5
157157
with:
158158
context: .
159+
file: docker/Dockerfile
159160
platforms: |
160161
linux/amd64
161162
linux/386
163+
linux/arm/v6
162164
linux/arm/v7
163165
linux/arm64/v8
164166
push: ${{ github.event_name != 'pull_request' }}
@@ -179,7 +181,7 @@ jobs:
179181
uses: docker/metadata-action@v5
180182
with:
181183
images: |
182-
${{ github.repository }}
184+
name=${{ github.repository }},enable=${{ github.event.repository.fork == false }}
183185
ghcr.io/${{ github.repository }}
184186
flavor: |
185187
suffix=-hardware,onlatest=true
@@ -196,14 +198,14 @@ jobs:
196198
uses: docker/setup-buildx-action@v3
197199

198200
- name: Login to DockerHub
199-
if: github.event_name != 'pull_request'
201+
if: github.event_name == 'push' && github.event.repository.fork == false
200202
uses: docker/login-action@v3
201203
with:
202204
username: ${{ secrets.DOCKERHUB_USERNAME }}
203205
password: ${{ secrets.DOCKERHUB_TOKEN }}
204-
206+
205207
- name: Login to GitHub Container Registry
206-
if: github.event_name != 'pull_request'
208+
if: github.event_name == 'push'
207209
uses: docker/login-action@v3
208210
with:
209211
registry: ghcr.io
@@ -214,10 +216,65 @@ jobs:
214216
uses: docker/build-push-action@v5
215217
with:
216218
context: .
217-
file: hardware.Dockerfile
219+
file: docker/hardware.Dockerfile
218220
platforms: linux/amd64
219221
push: ${{ github.event_name != 'pull_request' }}
220222
tags: ${{ steps.meta-hw.outputs.tags }}
221223
labels: ${{ steps.meta-hw.outputs.labels }}
222224
cache-from: type=gha
223225
cache-to: type=gha,mode=max
226+
227+
docker-rockchip:
228+
name: Build docker rockchip
229+
runs-on: ubuntu-latest
230+
steps:
231+
- name: Checkout
232+
uses: actions/checkout@v4
233+
234+
- name: Docker meta
235+
id: meta-rk
236+
uses: docker/metadata-action@v5
237+
with:
238+
images: |
239+
name=${{ github.repository }},enable=${{ github.event.repository.fork == false }}
240+
ghcr.io/${{ github.repository }}
241+
flavor: |
242+
suffix=-rockchip,onlatest=true
243+
latest=auto
244+
tags: |
245+
type=ref,event=branch
246+
type=semver,pattern={{version}},enable=false
247+
type=match,pattern=v(.*),group=1
248+
249+
- name: Set up QEMU
250+
uses: docker/setup-qemu-action@v3
251+
252+
- name: Set up Docker Buildx
253+
uses: docker/setup-buildx-action@v3
254+
255+
- name: Login to DockerHub
256+
if: github.event_name == 'push' && github.event.repository.fork == false
257+
uses: docker/login-action@v3
258+
with:
259+
username: ${{ secrets.DOCKERHUB_USERNAME }}
260+
password: ${{ secrets.DOCKERHUB_TOKEN }}
261+
262+
- name: Login to GitHub Container Registry
263+
if: github.event_name == 'push'
264+
uses: docker/login-action@v3
265+
with:
266+
registry: ghcr.io
267+
username: ${{ github.actor }}
268+
password: ${{ secrets.GITHUB_TOKEN }}
269+
270+
- name: Build and push
271+
uses: docker/build-push-action@v5
272+
with:
273+
context: .
274+
file: docker/rockchip.Dockerfile
275+
platforms: linux/arm64
276+
push: ${{ github.event_name != 'pull_request' }}
277+
tags: ${{ steps.meta-rk.outputs.tags }}
278+
labels: ${{ steps.meta-rk.outputs.labels }}
279+
cache-from: type=gha
280+
cache-to: type=gha,mode=max

.github/workflows/test.yml

Lines changed: 3 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -26,7 +26,7 @@ jobs:
2626
- name: Setup Go
2727
uses: actions/setup-go@v5
2828
with:
29-
go-version: '1.22'
29+
go-version: '1.24'
3030

3131
- name: Build Go binary
3232
run: go build -ldflags "-s -w" -trimpath -o ./go2rtc
@@ -79,6 +79,7 @@ jobs:
7979
uses: docker/build-push-action@v5
8080
with:
8181
context: .
82+
file: docker/Dockerfile
8283
platforms: linux/${{ matrix.platform }}
8384
push: false
8485
load: true
@@ -92,7 +93,7 @@ jobs:
9293
uses: docker/build-push-action@v5
9394
with:
9495
context: .
95-
file: hardware.Dockerfile
96+
file: docker/hardware.Dockerfile
9697
platforms: linux/amd64
9798
push: false
9899
load: true

.gitignore

Lines changed: 1 addition & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -4,6 +4,7 @@
44
go2rtc.yaml
55
go2rtc.json
66

7+
go2rtc_freebsd*
78
go2rtc_linux*
89
go2rtc_mac*
910
go2rtc_win*

0 commit comments

Comments
 (0)