Skip to content

Commit

Permalink
Update Go version to 1.21 in build and test workflows and Dockerfiles
Browse files Browse the repository at this point in the history
  • Loading branch information
skrashevich committed Aug 23, 2023
1 parent 357e7c1 commit 0822326
Show file tree
Hide file tree
Showing 5 changed files with 7 additions and 7 deletions.
2 changes: 1 addition & 1 deletion .github/workflows/build.yml
Original file line number Diff line number Diff line change
Expand Up @@ -19,7 +19,7 @@ jobs:

- name: Setup Go
uses: actions/setup-go@v4
with: { go-version: '1.20' }
with: { go-version: '1.21' }

- name: Build go2rtc_win64
env: { GOOS: windows, GOARCH: amd64 }
Expand Down
2 changes: 1 addition & 1 deletion .github/workflows/test.yml
Original file line number Diff line number Diff line change
Expand Up @@ -26,7 +26,7 @@ jobs:
- name: Setup Go
uses: actions/setup-go@v2
with:
go-version: '1.20'
go-version: '1.21'

- name: Build Go binary
run: go build -ldflags "-s -w" -trimpath -o ./go2rtc
Expand Down
2 changes: 1 addition & 1 deletion Dockerfile
Original file line number Diff line number Diff line change
Expand Up @@ -2,7 +2,7 @@

# 0. Prepare images
ARG PYTHON_VERSION="3.11"
ARG GO_VERSION="1.20"
ARG GO_VERSION="1.21"
ARG NGROK_VERSION="3"

FROM python:${PYTHON_VERSION}-alpine AS base
Expand Down
2 changes: 1 addition & 1 deletion go.mod
Original file line number Diff line number Diff line change
@@ -1,6 +1,6 @@
module github.com/AlexxIT/go2rtc

go 1.20
go 1.21

require (
github.com/gorilla/websocket v1.5.0
Expand Down
6 changes: 3 additions & 3 deletions hardware.Dockerfile
Original file line number Diff line number Diff line change
Expand Up @@ -2,8 +2,8 @@

# 0. Prepare images
# only debian 12 (bookworm) has latest ffmpeg
ARG DEBIAN_VERSION="bookworm-slim"
ARG GO_VERSION="1.20-buster"
ARG DEBIAN_VERSION="bullseye-slim"
ARG GO_VERSION="1.21-bullseye"
ARG NGROK_VERSION="3"

FROM debian:${DEBIAN_VERSION} AS base
Expand Down Expand Up @@ -46,7 +46,7 @@ RUN rm -f /etc/apt/apt.conf.d/docker-clean \
# non-free for Intel QSV support (not used by go2rtc, just for tests)
# libasound2-plugins for ALSA support
RUN --mount=type=cache,target=/var/cache/apt,sharing=locked --mount=type=cache,target=/var/lib/apt,sharing=locked \
echo 'deb http://deb.debian.org/debian bookworm non-free' > /etc/apt/sources.list.d/debian-non-free.list && \
echo 'deb http://deb.debian.org/debian bullseye non-free' > /etc/apt/sources.list.d/debian-non-free.list && \
apt-get -y update && apt-get -y install tini ffmpeg \
python3 curl jq \
intel-media-va-driver-non-free \
Expand Down

0 comments on commit 0822326

Please sign in to comment.