Skip to content

Commit 2540ad9

Browse files
committed
fix: allow building newer go module versions
1 parent 0a56366 commit 2540ad9

File tree

7 files changed

+10
-10
lines changed

7 files changed

+10
-10
lines changed

CMakeLists.txt

+1-1
Original file line numberDiff line numberDiff line change
@@ -1,5 +1,5 @@
11
cmake_minimum_required(VERSION 3.11)
2-
project(ego VERSION 1.5.1)
2+
project(ego VERSION 1.5.2)
33

44
if(NOT CMAKE_BUILD_TYPE)
55
set(CMAKE_BUILD_TYPE Debug)

_ertgo

dockerfiles/Dockerfile

+2-2
Original file line numberDiff line numberDiff line change
@@ -1,4 +1,4 @@
1-
FROM ghcr.io/edgelesssys/ego/build-base:v1.5.1 AS build
1+
FROM ghcr.io/edgelesssys/ego/build-base:v1.5.2 AS build
22

33
# don't run `apt-get update` because required packages are cached in build-base for reproducibility
44
RUN apt-get install -y --no-install-recommends \
@@ -12,7 +12,7 @@ RUN apt-get install -y --no-install-recommends \
1212
wget
1313

1414
ARG erttag=v0.4.3
15-
ARG egotag=v1.5.1
15+
ARG egotag=v1.5.2
1616
RUN wget -qO- https://go.dev/dl/go1.21.8.linux-amd64.tar.gz | tar -C /usr/local -xz \
1717
&& git clone -b $erttag --depth=1 https://github.com/edgelesssys/edgelessrt \
1818
&& git clone -b $egotag --depth=1 https://github.com/edgelesssys/ego \

dockerfiles/Dockerfile.focal

+2-2
Original file line numberDiff line numberDiff line change
@@ -1,4 +1,4 @@
1-
FROM ghcr.io/edgelesssys/ego/build-base-focal:v1.5.1 AS build
1+
FROM ghcr.io/edgelesssys/ego/build-base-focal:v1.5.2 AS build
22

33
# don't run `apt-get update` because required packages are cached in build-base for reproducibility
44
RUN DEBIAN_FRONTEND=noninteractive apt-get install -y --no-install-recommends \
@@ -12,7 +12,7 @@ RUN DEBIAN_FRONTEND=noninteractive apt-get install -y --no-install-recommends \
1212
wget
1313

1414
ARG erttag=v0.4.3
15-
ARG egotag=v1.5.1
15+
ARG egotag=v1.5.2
1616
RUN wget -qO- https://go.dev/dl/go1.21.8.linux-amd64.tar.gz | tar -C /usr/local -xz \
1717
&& git clone -b $erttag --depth=1 https://github.com/edgelesssys/edgelessrt \
1818
&& git clone -b $egotag --depth=1 https://github.com/edgelesssys/ego \

ego/cmd/newer-go-ver-test/go.mod

+2-2
Original file line numberDiff line numberDiff line change
@@ -2,6 +2,6 @@ module example.com/newer-go-ver-test
22

33
go 1.99
44

5-
replace example.com/testmod => ./testmod
5+
replace github.com/edgelesssys/ego/ego/cmd/newer-go-ver-test/testmod => ./testmod
66

7-
require example.com/testmod v0.0.0-00010101000000-000000000000
7+
require github.com/edgelesssys/ego/ego/cmd/newer-go-ver-test/testmod v0.0.0-00010101000000-000000000000

ego/cmd/newer-go-ver-test/main.go

+1-1
Original file line numberDiff line numberDiff line change
@@ -1,6 +1,6 @@
11
package main
22

3-
import "example.com/testmod"
3+
import "github.com/edgelesssys/ego/ego/cmd/newer-go-ver-test/testmod"
44

55
func main() {
66
testmod.Hello()
+1-1
Original file line numberDiff line numberDiff line change
@@ -1,3 +1,3 @@
1-
module example.com/testmod
1+
module github.com/edgelesssys/ego/ego/cmd/newer-go-ver-test/testmod
22

33
go 1.98

0 commit comments

Comments
 (0)