mirrors/maddy
1
0
Fork 0
mirror of https://github.com/foxcpp/maddy.git synced 2025-04-04 13:37:41 +03:00
Code Issues Projects Releases Packages Wiki Activity

Bump required Go version to 1.18

Browse source
This commit is contained in:
fox.cpp 2023-01-08 18:00:55 +03:00
parent 44dc130e43
commit 2dab873f50
No known key found for this signature in database
GPG key ID: 5B991F6215D2FCC0
4 changed files with 8 additions and 8 deletions
Download patch file Download diff file Expand all files Collapse all files

2
.github/workflows/cicd.yml vendored
View file

@ -24,7 +24,7 @@ jobs:
restore-keys: ${{ runner.os }}-go- restore-keys: ${{ runner.os }}-go-
- uses: actions/setup-go@v2 - uses: actions/setup-go@v2
with: with:
go-version: 1.17.11 go-version: 1.18.9
- name: "Verify build.sh" - name: "Verify build.sh"
run: | run: |
./build.sh ./build.sh

4
Dockerfile
View file

@ -1,4 +1,4 @@
FROM golang:1.17-alpine AS build-env FROM golang:1.18-alpine AS build-env
RUN set -ex && \ RUN set -ex && \
apk upgrade --no-cache --available && \ apk upgrade --no-cache --available && \
@ -14,7 +14,7 @@ RUN mkdir -p /pkg/data && \
cp maddy.conf.docker /pkg/data/maddy.conf && \ cp maddy.conf.docker /pkg/data/maddy.conf && \
./build.sh --builddir /tmp --destdir /pkg/ --tags docker build install ./build.sh --builddir /tmp --destdir /pkg/ --tags docker build install
FROM alpine:3.16.0 FROM alpine:3.17.0
LABEL maintainer="fox.cpp@disroot.org" LABEL maintainer="fox.cpp@disroot.org"
LABEL org.opencontainers.image.source=https://github.com/foxcpp/maddy LABEL org.opencontainers.image.source=https://github.com/foxcpp/maddy

8
docs/tutorials/building-from-source.md
View file

@ -6,12 +6,12 @@ You need C toolchain, Go toolchain and Make:
On Debian-based system this should work: On Debian-based system this should work:
``` ```
apt-get install golang-1.17 gcc libc6-dev make apt-get install golang-1.18 gcc libc6-dev make
``` ```
Additionally, if you want manual pages, you should also have scdoc installed. Additionally, if you want manual pages, you should also have scdoc installed.
Figuring out the appropriate way to get scdoc is left as an exercise for Figuring out the appropriate way to get scdoc is left as an exercise for
reader (for Ubuntu 19.10 it is in repositories). reader (for Ubuntu 22.04 LTS it is in repositories).
## Recent Go toolchain ## Recent Go toolchain
@ -20,8 +20,8 @@ available in some distributions (*cough* Debian *cough*).
It should not be hard to grab a recent built toolchain from golang.org: It should not be hard to grab a recent built toolchain from golang.org:
``` ```
wget "https://dl.google.com/go/go1.17.11.linux-amd64.tar.gz" wget "https://dl.google.com/go/go1.18.9.linux-amd64.tar.gz"
tar xf "go1.17.11.linux-amd64.tar.gz" tar xf "go1.18.19.linux-amd64.tar.gz"
export GOROOT="$PWD/go" export GOROOT="$PWD/go"
export PATH="$PWD/go/bin:$PATH" export PATH="$PWD/go/bin:$PATH"
``` ```

2
go.mod
View file

@ -1,6 +1,6 @@
module github.com/foxcpp/maddy module github.com/foxcpp/maddy
go 1.17 go 1.18
require ( require (
blitiri.com.ar/go/spf v1.5.1 blitiri.com.ar/go/spf v1.5.1