Skip to content

Commit

Permalink
Merge pull request #494 from bookingcom/dzhdanov/tests
Browse files Browse the repository at this point in the history
Refreshing tests
  • Loading branch information
deniszh authored Sep 4, 2023
2 parents 73996ff + a23b5bf commit 3f6e8dd
Show file tree
Hide file tree
Showing 3 changed files with 18 additions and 9 deletions.
23 changes: 16 additions & 7 deletions .github/workflows/ci.yml
Original file line number Diff line number Diff line change
Expand Up @@ -6,27 +6,36 @@ on:
pull_request:
jobs:
test:
runs-on: ubuntu-latest
strategy:
matrix:
go-version: [1.20.x]
os: [ubuntu-latest]
runs-on: ${{ matrix.os }}
go-version: [ 1.20.x, 1.21.x, tip ]
steps:
- name: install Go
- name: Set up Go stable
if: matrix.go-version != 'tip'
uses: actions/setup-go@v4
with:
go-version: ${{ matrix.go-version }}
- name: Set up Go tip
if: matrix.go-version == 'tip'
run: |
curl -sL https://storage.googleapis.com/go-build-snap/go/linux-amd64/$(git ls-remote https://github.com/golang/go.git HEAD | awk '{print $1;}').tar.gz -o gotip.tar.gz
ls -lah gotip.tar.gz
mkdir -p ~/sdk/gotip
tar -C ~/sdk/gotip -xzf gotip.tar.gz
~/sdk/gotip/bin/go version
echo "PATH=$HOME/go/bin:$HOME/sdk/gotip/bin/:$PATH" >> $GITHUB_ENV
- name: install cairo
run: sudo apt-get install libcairo2-dev -y
- name: setup linter
run: curl -sSfL https://raw.githubusercontent.com/golangci/golangci-lint/master/install.sh | sudo sh -s -- -b /usr/local/bin v1.52.2
- name: checkout code
uses: actions/checkout@v3
- name: test
run: make test
- name: golangci-lint
if: matrix.go-version == '1.21.x'
uses: golangci/golangci-lint-action@v3
with:
version: v1.52.2
version: v1.54.2
- name: integration test
if: matrix.go-version == '1.21.x'
run: tests/system_test.sh
2 changes: 1 addition & 1 deletion docker/carbonapi/Dockerfile
Original file line number Diff line number Diff line change
@@ -1,4 +1,4 @@
FROM golang:1.20
FROM golang:1.21

RUN apt-get update
RUN apt-get install -y libcairo2-dev
Expand Down
2 changes: 1 addition & 1 deletion docker/go-carbon/Dockerfile
Original file line number Diff line number Diff line change
@@ -1,4 +1,4 @@
FROM golang:1.20
FROM golang:1.21

RUN mkdir -p /data/graphite/whisper/
COPY ./docker/go-carbon/*.conf /etc/
Expand Down

0 comments on commit 3f6e8dd

Please sign in to comment.