Skip to content

Commit

Permalink
go 1.21 (#536)
Browse files Browse the repository at this point in the history
  • Loading branch information
frostbyte73 authored Nov 10, 2023
1 parent b399be7 commit 2637359
Show file tree
Hide file tree
Showing 5 changed files with 11 additions and 9 deletions.
2 changes: 1 addition & 1 deletion .github/workflows/publish-egress.yaml
Original file line number Diff line number Diff line change
Expand Up @@ -48,7 +48,7 @@ jobs:
- name: Set up Go
uses: actions/setup-go@v4
with:
go-version: 1.20.x
go-version: 1.21.4

- name: Download Go modules
run: go mod download
Expand Down
2 changes: 1 addition & 1 deletion build/chrome/install-chrome
Original file line number Diff line number Diff line change
Expand Up @@ -46,7 +46,7 @@ else
rm google-chrome-stable_current_amd64.deb
fi

wget -N http://chromedriver.storage.googleapis.com/2.46/chromedriver_linux64.zip
wget -N https://chromedriver.storage.googleapis.com/2.46/chromedriver_linux64.zip
unzip chromedriver_linux64.zip
chmod +x chromedriver
mv -f chromedriver /usr/local/bin/chromedriver
Expand Down
4 changes: 2 additions & 2 deletions build/egress/Dockerfile
Original file line number Diff line number Diff line change
Expand Up @@ -20,9 +20,9 @@ WORKDIR /workspace

# install go
RUN if [ "$TARGETPLATFORM" = "linux/arm64" ]; then GOARCH=arm64; else GOARCH=amd64; fi && \
wget https://go.dev/dl/go1.20.7.linux-${GOARCH}.tar.gz && \
wget https://go.dev/dl/go1.21.4.linux-${GOARCH}.tar.gz && \
rm -rf /usr/local/go && \
tar -C /usr/local -xzf go1.20.7.linux-${GOARCH}.tar.gz
tar -C /usr/local -xzf go1.21.4.linux-${GOARCH}.tar.gz
ENV PATH="/usr/local/go/bin:${PATH}"


Expand Down
8 changes: 4 additions & 4 deletions build/test/Dockerfile
Original file line number Diff line number Diff line change
Expand Up @@ -20,9 +20,9 @@ ARG TARGETPLATFORM

# install go
RUN if [ "$TARGETPLATFORM" = "linux/arm64" ]; then GOARCH=arm64; else GOARCH=amd64; fi && \
wget https://go.dev/dl/go1.20.7.linux-${GOARCH}.tar.gz && \
wget https://go.dev/dl/go1.21.4.linux-${GOARCH}.tar.gz && \
rm -rf /usr/local/go && \
tar -C /usr/local -xzf go1.20.7.linux-${GOARCH}.tar.gz
tar -C /usr/local -xzf go1.21.4.linux-${GOARCH}.tar.gz
ENV PATH="/usr/local/go/bin:${PATH}"

# download go modules
Expand Down Expand Up @@ -67,9 +67,9 @@ RUN apt-get update && \

# install go
RUN if [ "$TARGETPLATFORM" = "linux/arm64" ]; then GOARCH=arm64; else GOARCH=amd64; fi && \
wget https://go.dev/dl/go1.20.7.linux-${GOARCH}.tar.gz && \
wget https://go.dev/dl/go1.21.4.linux-${GOARCH}.tar.gz && \
rm -rf /usr/local/go && \
tar -C /usr/local -xzf go1.20.7.linux-${GOARCH}.tar.gz
tar -C /usr/local -xzf go1.21.4.linux-${GOARCH}.tar.gz
ENV PATH="/usr/local/go/bin:${PATH}"

# install chrome
Expand Down
4 changes: 3 additions & 1 deletion go.mod
Original file line number Diff line number Diff line change
@@ -1,6 +1,8 @@
module github.com/livekit/egress

go 1.20
go 1.21

toolchain go1.21.4

require (
cloud.google.com/go/storage v1.31.0
Expand Down

0 comments on commit 2637359

Please sign in to comment.