Skip to content

Commit

Permalink
Update actions and base image to support go 1.20
Browse files Browse the repository at this point in the history
Signed-off-by: Petr Fedchenkov <[email protected]>
  • Loading branch information
giggsoff committed May 29, 2024
1 parent 3f6a4f3 commit a657ac0
Show file tree
Hide file tree
Showing 9 changed files with 16 additions and 15 deletions.
2 changes: 1 addition & 1 deletion .github/actions/setup-environment/action.yml
Original file line number Diff line number Diff line change
Expand Up @@ -21,7 +21,7 @@ runs:
- name: Setup go
uses: actions/setup-go@v3
with:
go-version: '1.18'
go-version: '1.20'
- name: Check
run: |
for addr in $(ip addr list|sed -En -e 's/.*inet ([0-9.]+).*/\1/p')
Expand Down
2 changes: 1 addition & 1 deletion .github/workflows/eden_gcp.yml
Original file line number Diff line number Diff line change
Expand Up @@ -34,7 +34,7 @@ jobs:
- name: setup go
uses: actions/setup-go@v3
with:
go-version: '1.18'
go-version: '1.20'
- name: Check
run: |
for addr in $(ip addr list|sed -En -e 's/.*inet ([0-9.]+).*/\1/p')
Expand Down
4 changes: 2 additions & 2 deletions .github/workflows/eden_setup.yml
Original file line number Diff line number Diff line change
Expand Up @@ -24,7 +24,7 @@ jobs:
- name: setup go
uses: actions/setup-go@v3
with:
go-version: '1.18'
go-version: '1.20'
- name: build docker images
run: |
make LINUXKIT_TARGET=build DOCKER_PLATFORM=linux/arm64 build-docker
Expand All @@ -48,7 +48,7 @@ jobs:
- name: setup go
uses: actions/setup-go@v3
with:
go-version: '1.18'
go-version: '1.20'
- name: build eden
run: |
make clean
Expand Down
2 changes: 1 addition & 1 deletion .github/workflows/unit.yml
Original file line number Diff line number Diff line change
Expand Up @@ -13,7 +13,7 @@ jobs:
- name: setup go
uses: actions/setup-go@v3
with:
go-version: '1.18'
go-version: '1.20'
- name: run tests
run: go test -json $(go list ./... | grep -v /eden/tests/) > test.json
- name: Annotate tests
Expand Down
2 changes: 1 addition & 1 deletion Dockerfile
Original file line number Diff line number Diff line change
@@ -1,4 +1,4 @@
FROM lfedge/eve-alpine:8.12.0 as build
FROM lfedge/eve-alpine:12.1.0 as build
ENV BUILD_PKGS go make qemu-img git
RUN eve-alpine-deploy.sh

Expand Down
2 changes: 1 addition & 1 deletion eserver/Dockerfile
Original file line number Diff line number Diff line change
@@ -1,4 +1,4 @@
FROM lfedge/eve-alpine:8.12.0 AS build
FROM lfedge/eve-alpine:12.1.0 AS build
ENV BUILD_PKGS go git openssh-keygen
RUN eve-alpine-deploy.sh

Expand Down
2 changes: 1 addition & 1 deletion processing/Dockerfile
Original file line number Diff line number Diff line change
@@ -1,4 +1,4 @@
FROM lfedge/eve-alpine:8.12.0 as build
FROM lfedge/eve-alpine:12.1.0 as build
ENV BUILD_PKGS git
ENV PKGS perl gawk git
RUN eve-alpine-deploy.sh
Expand Down
2 changes: 1 addition & 1 deletion sdn/vm/Dockerfile
Original file line number Diff line number Diff line change
@@ -1,4 +1,4 @@
FROM lfedge/eve-alpine:8.12.0 as build
FROM lfedge/eve-alpine:12.1.0 as build

ENV BUILD_PKGS git gcc go make wget libc-dev linux-headers
ENV PKGS bash iptables ip6tables iproute2 dhcpcd ipset curl radvd ethtool jq tcpdump \
Expand Down
13 changes: 7 additions & 6 deletions sdn/vm/api/endpoints.go
Original file line number Diff line number Diff line change
Expand Up @@ -365,12 +365,13 @@ func (e TransparentProxy) ReferencesFromItem() []LogicalLabelRef {
// iPXE-enabled client).
//
// Example config for dnsmasq:
// # Boot for iPXE. The idea is to send two different
// # filenames, the first loads iPXE, and the second tells iPXE what to
// # load. The dhcp-match sets the ipxe tag for requests from iPXE.
// #dhcp-boot=undionly.kpxe
// #dhcp-match=set:ipxe,175 # iPXE sends a 175 option.
// #dhcp-boot=tag:ipxe,http://boot.ipxe.org/demo/boot.php
//
// # Boot for iPXE. The idea is to send two different
// # filenames, the first loads iPXE, and the second tells iPXE what to
// # load. The dhcp-match sets the ipxe tag for requests from iPXE.
// #dhcp-boot=undionly.kpxe
// #dhcp-match=set:ipxe,175 # iPXE sends a 175 option.
// #dhcp-boot=tag:ipxe,http://boot.ipxe.org/demo/boot.php
//
// [1] https://ipxe.org/howto/chainloading
type NetbootServer struct {
Expand Down

0 comments on commit a657ac0

Please sign in to comment.