Skip to content

Commit

Permalink
switch to go-1.21 and add clickhouse-server:23.8 for integration and …
Browse files Browse the repository at this point in the history
…testflows tests
  • Loading branch information
Slach committed Sep 6, 2023
1 parent f489801 commit 9a9e807
Show file tree
Hide file tree
Showing 7 changed files with 18 additions and 11 deletions.
6 changes: 4 additions & 2 deletions .github/workflows/build.yaml
Original file line number Diff line number Diff line change
Expand Up @@ -16,7 +16,7 @@ jobs:
strategy:
matrix:
golang-version:
- "1.20"
- "1.21"
steps:
- name: Checkout project
uses: actions/checkout@v3
Expand Down Expand Up @@ -118,6 +118,7 @@ jobs:
- '22.3'
- '22.8'
- '23.3'
- '23.8'
steps:
- name: Checkout project
uses: actions/checkout@v3
Expand Down Expand Up @@ -210,7 +211,7 @@ jobs:
strategy:
matrix:
golang-version:
- "1.20"
- "1.21"
clickhouse:
- '1.1.54394'
- '19.17'
Expand All @@ -221,6 +222,7 @@ jobs:
- '22.3'
- '22.8'
- '23.3'
- '23.8'
steps:
- name: Checkout project
uses: actions/checkout@v3
Expand Down
2 changes: 1 addition & 1 deletion .github/workflows/release.yaml
Original file line number Diff line number Diff line change
Expand Up @@ -12,7 +12,7 @@ jobs:
strategy:
matrix:
golang-version:
- "1.20"
- "1.21"

steps:
- name: Checkout project
Expand Down
5 changes: 5 additions & 0 deletions ChangeLog.md
Original file line number Diff line number Diff line change
@@ -1,3 +1,8 @@
# v2.4.1 (not released yet)
IMPROVEMENTS
- switch to go-1.21
- add clickhouse-server:23.8 for integration and testflows tests

# v2.4.0
IMPROVEMENTS
- first implementation for properly backup S3/GCS/Azure disks, support server-side copy to back up bucket during `clickhouse-backup` create and during `clickhouse-backup restore`, requires add `object_disk_path` to `s3`,`gcs`,`azblob` section, fix [447](https://github.com/Altinity/clickhouse-backup/issues/447)
Expand Down
6 changes: 3 additions & 3 deletions Dockerfile
Original file line number Diff line number Diff line change
Expand Up @@ -14,16 +14,16 @@ RUN rm -fv /etc/apt/sources.list.d/clickhouse.list && \
echo "deb https://ppa.launchpadcontent.net/longsleep/golang-backports/ubuntu ${DISTRIB_CODENAME} main" > /etc/apt/sources.list.d/golang.list && \
echo "deb-src https://ppa.launchpadcontent.net/longsleep/golang-backports/ubuntu ${DISTRIB_CODENAME} main" >> /etc/apt/sources.list.d/golang.list && \
( apt-get update || true ) && \
apt-get install -y --no-install-recommends libc-dev golang-1.20 make git gcc musl-dev musl-tools && \
apt-get install -y --no-install-recommends libc-dev golang-1.21 make git gcc musl-dev musl-tools && \
wget -q -P /root/ https://musl.cc/aarch64-linux-musl-cross.tgz && \
tar -xvf /root/aarch64-linux-musl-cross.tgz -C /root/ && \
mkdir -p /root/go/

RUN ln -nsfv /usr/lib/go-1.20/bin/go /usr/bin/go
RUN ln -nsfv /usr/lib/go-1.21/bin/go /usr/bin/go
VOLUME /root/.cache/go
ENV GOCACHE=/root/.cache/go
ENV GOPATH=/root/go/
ENV GOROOT=/usr/lib/go-1.20/
ENV GOROOT=/usr/lib/go-1.21/
RUN go env
WORKDIR /src/
# cache modules when go.mod go.sum changed
Expand Down
2 changes: 1 addition & 1 deletion Vagrantfile
Original file line number Diff line number Diff line change
Expand Up @@ -101,7 +101,7 @@ Vagrant.configure(2) do |config|
apt-get install --no-install-recommends -y clickhouse-client clickhouse-server
# golang
export GOLANG_VERSION=1.20
export GOLANG_VERSION=1.21
apt-key adv --keyserver keyserver.ubuntu.com --recv-keys 52B59B1571A79DBC054901C0F6BC817356A3D45E
add-apt-repository ppa:longsleep/golang-backports
apt-get install --no-install-recommends -y golang-${GOLANG_VERSION}
Expand Down
2 changes: 1 addition & 1 deletion go.mod
Original file line number Diff line number Diff line change
Expand Up @@ -130,4 +130,4 @@ require (
google.golang.org/protobuf v1.30.0 // indirect
)

go 1.20
go 1.21
6 changes: 3 additions & 3 deletions test/integration/install_delve.sh
Original file line number Diff line number Diff line change
Expand Up @@ -4,16 +4,16 @@ apt-get update && apt-get install -y software-properties-common
apt-key adv --keyserver keyserver.ubuntu.com --recv-keys 52B59B1571A79DBC054901C0F6BC817356A3D45E
add-apt-repository -y ppa:longsleep/golang-backports
apt-get update
apt-get install -y golang-1.20
apt-get install -y golang-1.21

mkdir -p ~/go/
export GOPATH=~/go/
grep -q -F 'export GOPATH=$GOPATH' ~/.bashrc || echo "export GOPATH=$GOPATH" >> ~/.bashrc
grep -q -F 'export GOPATH=$GOPATH' /root/.bashrc || echo "export GOPATH=$GOPATH" >> /root/.bashrc
export GOROOT=/usr/lib/go-1.20/
export GOROOT=/usr/lib/go-1.21/
grep -q -F 'export GOROOT=$GOROOT' ~/.bashrc || echo "export GOROOT=$GOROOT" >> ~/.bashrc
grep -q -F 'export GOROOT=$GOROOT' /root/.bashrc || echo "export GOROOT=$GOROOT" >> /root/.bashrc
ln -nsfv /usr/lib/go-1.20/bin/go /usr/bin/go
ln -nsfv /usr/lib/go-1.21/bin/go /usr/bin/go

CGO_ENABLED=0 GO111MODULE=on go install -ldflags "-s -w -extldflags '-static'" github.com/go-delve/delve/cmd/dlv@latest

Expand Down

0 comments on commit 9a9e807

Please sign in to comment.