Skip to content

Commit

Permalink
fix: allow building newer go module versions
Browse files Browse the repository at this point in the history
  • Loading branch information
thomasten committed May 11, 2024
1 parent 0a56366 commit 29320c1
Show file tree
Hide file tree
Showing 7 changed files with 10 additions and 10 deletions.
2 changes: 1 addition & 1 deletion CMakeLists.txt
Original file line number Diff line number Diff line change
@@ -1,5 +1,5 @@
cmake_minimum_required(VERSION 3.11)
project(ego VERSION 1.5.1)
project(ego VERSION 1.5.2)

if(NOT CMAKE_BUILD_TYPE)
set(CMAKE_BUILD_TYPE Debug)
Expand Down
2 changes: 1 addition & 1 deletion _ertgo
Submodule _ertgo updated 2 files
+11 −0 README.md
+ bin/go
4 changes: 2 additions & 2 deletions dockerfiles/Dockerfile
Original file line number Diff line number Diff line change
@@ -1,4 +1,4 @@
FROM ghcr.io/edgelesssys/ego/build-base:v1.5.1 AS build
FROM ghcr.io/edgelesssys/ego/build-base:v1.5.2 AS build

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

ARG erttag=v0.4.3
ARG egotag=v1.5.1
ARG egotag=v1.5.2
RUN wget -qO- https://go.dev/dl/go1.21.8.linux-amd64.tar.gz | tar -C /usr/local -xz \
&& git clone -b $erttag --depth=1 https://github.com/edgelesssys/edgelessrt \
&& git clone -b $egotag --depth=1 https://github.com/edgelesssys/ego \
Expand Down
4 changes: 2 additions & 2 deletions dockerfiles/Dockerfile.focal
Original file line number Diff line number Diff line change
@@ -1,4 +1,4 @@
FROM ghcr.io/edgelesssys/ego/build-base-focal:v1.5.1 AS build
FROM ghcr.io/edgelesssys/ego/build-base-focal:v1.5.2 AS build

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

ARG erttag=v0.4.3
ARG egotag=v1.5.1
ARG egotag=v1.5.2
RUN wget -qO- https://go.dev/dl/go1.21.8.linux-amd64.tar.gz | tar -C /usr/local -xz \
&& git clone -b $erttag --depth=1 https://github.com/edgelesssys/edgelessrt \
&& git clone -b $egotag --depth=1 https://github.com/edgelesssys/ego \
Expand Down
4 changes: 2 additions & 2 deletions ego/cmd/newer-go-ver-test/go.mod
Original file line number Diff line number Diff line change
Expand Up @@ -2,6 +2,6 @@ module example.com/newer-go-ver-test

go 1.99

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

require example.com/testmod v0.0.0-00010101000000-000000000000
require github.com/edgelesssys/ego/ego/cmd/newer-go-ver-test/testmod v0.0.0-00010101000000-000000000000
2 changes: 1 addition & 1 deletion ego/cmd/newer-go-ver-test/main.go
Original file line number Diff line number Diff line change
@@ -1,6 +1,6 @@
package main

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

func main() {
testmod.Hello()
Expand Down
2 changes: 1 addition & 1 deletion ego/cmd/newer-go-ver-test/testmod/go.mod
Original file line number Diff line number Diff line change
@@ -1,3 +1,3 @@
module example.com/testmod
module github.com/edgelesssys/ego/ego/cmd/newer-go-ver-test/testmod

go 1.98

0 comments on commit 29320c1

Please sign in to comment.