Skip to content
New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Use Go 1.21.2 #653

Merged
merged 5 commits into from
Oct 6, 2023
Merged

Use Go 1.21.2 #653

Show file tree
Hide file tree
Changes from 4 commits
Commits
Show all changes
5 commits
Select commit Hold shift + click to select a range
45e4ede
.tool-versions: use 1.21.2
abitrolly Oct 6, 2023
c83c9c8
Dockerfile: build with Go 1.21.2 and Alpine 3.18
abitrolly Oct 6, 2023
1f5d8a1
ci.yml: allow manual CI trigger (for non-main branches)
abitrolly Oct 6, 2023
32407ec
Dockerfile.webserver: use Alpine 3.18
abitrolly Oct 6, 2023
e705982
Dockerfile.indexserver: use Alpine 3.18
abitrolly Oct 6, 2023
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
1 change: 1 addition & 0 deletions .github/workflows/ci.yml
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -3,6 +3,7 @@ on:
branches:
- main
pull_request:
workflow_dispatch:
Copy link
Member

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

why was this added?

Copy link
Contributor Author

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

To make it possible to run tests in branches in forks.

name: CI
jobs:
test:
Expand Down
2 changes: 1 addition & 1 deletion .tool-versions
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -1 +1 @@
golang 1.20.3
golang 1.21.2
8 changes: 4 additions & 4 deletions Dockerfile
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -1,8 +1,8 @@
FROM golang:1.20.3-alpine3.17 AS builder
FROM golang:1.21.2-alpine3.18 AS builder

RUN apk add --no-cache ca-certificates

ENV CGO_ENABLED=0 GO111MODULE=on
ENV CGO_ENABLED=0
WORKDIR /go/src/github.com/sourcegraph/zoekt

# Cache dependencies
Expand All @@ -13,7 +13,7 @@ COPY . ./
ARG VERSION
RUN go install -ldflags "-X github.com/sourcegraph/zoekt.Version=$VERSION" ./cmd/...

FROM rust:alpine3.17 AS rust-builder
FROM rust:alpine3.18 AS rust-builder

RUN apk update --no-cache && apk upgrade --no-cache && \
apk add --no-cache git wget musl-dev>=1.1.24-r10 build-base
Expand All @@ -27,7 +27,7 @@ RUN cd sourcegraph/docker-images/syntax-highlighter && /sourcegraph/cmd/symbols/

RUN cargo install --path sourcegraph/docker-images/syntax-highlighter --root /syntect_server --bin scip-ctags

FROM alpine:3.17.3 AS zoekt
FROM alpine:3.18 AS zoekt

RUN apk update --no-cache && apk upgrade --no-cache && \
apk add --no-cache git ca-certificates bind-tools tini jansson wget
Expand Down
2 changes: 1 addition & 1 deletion Dockerfile.webserver
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -1,4 +1,4 @@
FROM alpine:3.17.3
FROM alpine:3.18

RUN apk update --no-cache && apk upgrade --no-cache && \
apk add --no-cache ca-certificates bind-tools tini
Expand Down
Loading