Skip to content

Commit

Permalink
build: Bump all non-dependabot dependencies (#1683)
Browse files Browse the repository at this point in the history
Reviewed-by: Alexander Jung <[email protected]>
Approved-by: Alexander Jung <[email protected]>
  • Loading branch information
nderjung authored May 31, 2024
2 parents 8a58900 + 8623775 commit 3d3ee01
Show file tree
Hide file tree
Showing 12 changed files with 37 additions and 36 deletions.
2 changes: 1 addition & 1 deletion .github/workflows/buildenvs.yaml
Original file line number Diff line number Diff line change
Expand Up @@ -22,7 +22,7 @@ jobs:
strategy:
matrix:
include:
- QEMU_VERSION: 8.2.0
- QEMU_VERSION: 8.2.4

steps:
- name: Get changed files
Expand Down
2 changes: 1 addition & 1 deletion .github/workflows/check-static.yaml
Original file line number Diff line number Diff line change
Expand Up @@ -23,7 +23,7 @@ jobs:

- uses: actions/setup-go@v5
with:
go-version: 1.22.0
go-version: 1.22.3
cache: false

- name: Set Go variables
Expand Down
12 changes: 6 additions & 6 deletions .github/workflows/tests-stable.yaml
Original file line number Diff line number Diff line change
Expand Up @@ -9,7 +9,7 @@ jobs:
strategy:
fail-fast: false
matrix:
os: [ubuntu-22.04, ubuntu-20.04, macos-11, macos-12, mac-m2-14]
os: [ubuntu-24.04, ubuntu-22.04, macos-12, macos-13, macos-14, mac-m2-14]
runs-on: ${{ matrix.os }}
steps:
- uses: actions/checkout@v4
Expand All @@ -18,7 +18,7 @@ jobs:

- uses: actions/setup-go@v5
with:
go-version: 1.22.0
go-version: 1.22.3
cache: false

- name: Set Go variables
Expand Down Expand Up @@ -47,7 +47,7 @@ jobs:
strategy:
fail-fast: false
matrix:
os: [ubuntu-22.04, ubuntu-20.04]
os: [ubuntu-24.04, ubuntu-22.04]
runs-on: ${{ matrix.os }}

steps:
Expand All @@ -59,7 +59,7 @@ jobs:
- name: Set up Go
uses: actions/setup-go@v5
with:
go-version: 1.22.0
go-version: 1.22.3
cache: false

- name: Set Go variables
Expand Down Expand Up @@ -98,7 +98,7 @@ jobs:
strategy:
fail-fast: false
matrix:
os: [ubuntu-22.04]
os: [ubuntu-24.04]
runs-on: ${{ matrix.os }}

steps:
Expand All @@ -110,7 +110,7 @@ jobs:
- name: Set up Go
uses: actions/setup-go@v5
with:
go-version: 1.22.0
go-version: 1.22.3
cache: false

- name: Set Go variables
Expand Down
12 changes: 6 additions & 6 deletions .github/workflows/tests.yaml
Original file line number Diff line number Diff line change
Expand Up @@ -14,7 +14,7 @@ jobs:
strategy:
fail-fast: false
matrix:
os: [ubuntu-22.04]
os: [ubuntu-24.04]

runs-on: ${{ matrix.os }}

Expand All @@ -25,7 +25,7 @@ jobs:

- uses: actions/setup-go@v5
with:
go-version: 1.22.0
go-version: 1.22.3
cache: false

- name: Set Go variables
Expand Down Expand Up @@ -54,7 +54,7 @@ jobs:
strategy:
fail-fast: false
matrix:
os: [ubuntu-22.04]
os: [ubuntu-24.04]

runs-on: ${{ matrix.os }}

Expand All @@ -67,7 +67,7 @@ jobs:
- name: Set up Go
uses: actions/setup-go@v5
with:
go-version: 1.22.0
go-version: 1.22.3
cache: false

- name: Set Go variables
Expand Down Expand Up @@ -107,7 +107,7 @@ jobs:
strategy:
fail-fast: false
matrix:
os: [ubuntu-22.04]
os: [ubuntu-24.04]

runs-on: ${{ matrix.os }}

Expand All @@ -120,7 +120,7 @@ jobs:
- name: Set up Go
uses: actions/setup-go@v5
with:
go-version: 1.22.0
go-version: 1.22.3
cache: false

- name: Set Go variables
Expand Down
4 changes: 2 additions & 2 deletions .github/workflows/tools-go-generate-qemu-device.yaml
Original file line number Diff line number Diff line change
Expand Up @@ -22,7 +22,7 @@ jobs:

- uses: actions/setup-go@v5
with:
go-version: 1.22.0
go-version: 1.22.3
cache: false

- name: Set go.mod variable
Expand All @@ -48,7 +48,7 @@ jobs:

- uses: actions/setup-go@v5
with:
go-version: 1.22.0
go-version: 1.22.3
cache: false

- name: Set Go variables
Expand Down
4 changes: 2 additions & 2 deletions .github/workflows/tools-protoc-gen-go-netconn.yaml
Original file line number Diff line number Diff line change
Expand Up @@ -22,7 +22,7 @@ jobs:

- uses: actions/setup-go@v5
with:
go-version: 1.22.0
go-version: 1.22.3
cache: false

- name: Set go.mod variable
Expand All @@ -48,7 +48,7 @@ jobs:

- uses: actions/setup-go@v5
with:
go-version: 1.22.0
go-version: 1.22.3
cache: false

- name: Set Go variables
Expand Down
14 changes: 7 additions & 7 deletions buildenvs/Makefile
Original file line number Diff line number Diff line change
Expand Up @@ -23,7 +23,7 @@ PLATFORM ?= linux/x86_64
WITH_CACHE ?= y

.PHONY: qemu
qemu: QEMU_VERSION ?= 8.2.0
qemu: QEMU_VERSION ?= 8.2.4
qemu: MAKE_NPROC ?= $(shell nproc)
qemu: ENVIRONMENT ?= qemu
qemu: IMAGE ?= $(REGISTRY)/qemu:$(QEMU_VERSION)
Expand All @@ -43,7 +43,7 @@ qemu:
$(DOCKER_BUILD_EXTRA) $(WORKDIR)

.PHONY: myself
myself: GO_VERSION ?= 1.22.0
myself: GO_VERSION ?= 1.22.3
myself: ENVIRONMENT ?= myself
myself: IMAGE ?= $(REGISTRY)/myself:$(IMAGE_TAG)
myself: TARGET ?= kraftkit
Expand All @@ -68,10 +68,10 @@ myself-full:

.PHONY: base
base: ENVIRONMENT ?= base
base: GO_VERSION ?= 1.22.0
base: GO_VERSION ?= 1.22.3
base: IMAGE ?= $(REGISTRY)/base:$(IMAGE_TAG)
base: KRAFTKIT_VERSION ?= latest
base: QEMU_VERSION ?= 8.2.0
base: QEMU_VERSION ?= 8.2.4
ifeq ($(WITH_CACHE),y)
base: _WITH_CACHE := --cache-from $(IMAGE)
else
Expand All @@ -90,10 +90,10 @@ base:

.PHONY: base-golang
base-golang: ENVIRONMENT ?= base-golang
base-golang: GO_VERSION ?= 1.22.0
base-golang: GO_VERSION ?= 1.22.3
base-golang: IMAGE ?= $(REGISTRY)/base-golang:$(IMAGE_TAG)
base-golang: KRAFTKIT_VERSION ?= latest
base-golang: QEMU_VERSION ?= 8.2.0
base-golang: QEMU_VERSION ?= 8.2.4
ifeq ($(WITH_CACHE),y)
base-golang: _WITH_CACHE := --cache-from $(IMAGE)
else
Expand All @@ -113,7 +113,7 @@ base-golang:

.PHONY: github-action
github-action: ENVIRONMENT ?= github-action
github-action: GO_VERSION ?= 1.22.0
github-action: GO_VERSION ?= 1.22.3
github-action: IMAGE ?= $(REGISTRY)/github-action:$(IMAGE_TAG)
github-action: KRAFTKIT_VERSION ?= latest
ifeq ($(WITH_CACHE),y)
Expand Down
2 changes: 1 addition & 1 deletion buildenvs/base-golang.Dockerfile
Original file line number Diff line number Diff line change
Expand Up @@ -3,7 +3,7 @@
# Licensed under the BSD-3-Clause License (the "License").
# You may not use this file except in compliance with the License.
ARG REGISTRY=kraftkit.sh
ARG GO_VERSION=1.22.0
ARG GO_VERSION=1.22.3

FROM golang:${GO_VERSION}-bookworm AS golang
FROM ${REGISTRY}/base:latest
Expand Down
4 changes: 2 additions & 2 deletions buildenvs/base.Dockerfile
Original file line number Diff line number Diff line change
Expand Up @@ -2,9 +2,9 @@
# Copyright (c) 2022, NEC Europe Ltd., Unikraft GmbH, and The KraftKit Authors.
# Licensed under the BSD-3-Clause License (the "License").
# You may not use this file except in compliance with the License.
ARG DEBIAN_VERSION=bookworm-20230725
ARG DEBIAN_VERSION=bookworm-20240513
ARG KRAFTKIT_VERSION=latest
ARG QEMU_VERSION=8.2.0
ARG QEMU_VERSION=8.2.4
ARG REGISTRY=kraftkit.sh

FROM ${REGISTRY}/qemu:${QEMU_VERSION} AS qemu
Expand Down
6 changes: 3 additions & 3 deletions buildenvs/github-action.Dockerfile
Original file line number Diff line number Diff line change
Expand Up @@ -2,10 +2,10 @@
# Copyright (c) 2022, Unikraft GmbH and The KraftKit Authors.
# Licensed under the BSD-3-Clause License (the "License").
# You may not use this file except in compliance with the License.
ARG GO_VERSION=1.22.0
ARG DEBIAN_VERSION=bookworm-20230725
ARG GO_VERSION=1.22.3
ARG DEBIAN_VERSION=bookworm-20240513
ARG KRAFTKIT_VERSION=latest
ARG QEMU_VERSION=8.2.0
ARG QEMU_VERSION=8.2.4
ARG REGISTRY=kraftkit.sh

FROM golang:${GO_VERSION}-bullseye AS build
Expand Down
6 changes: 3 additions & 3 deletions buildenvs/myself.Dockerfile
Original file line number Diff line number Diff line change
Expand Up @@ -3,9 +3,9 @@
# Licensed under the BSD-3-Clause License (the "License").
# You may not use this file except in compliance with the License.

ARG GO_VERSION=1.22.0
ARG GO_VERSION=1.22.3

FROM golang:${GO_VERSION}-bullseye AS kraftkit-full
FROM golang:${GO_VERSION}-bookworm AS kraftkit-full

# Install build dependencies
RUN set -xe; \
Expand Down Expand Up @@ -34,7 +34,7 @@ RUN set -xe; \

WORKDIR /go/src/kraftkit.sh

COPY --from=ghcr.io/goreleaser/goreleaser-cross:v1.22.0 /usr/bin/goreleaser /usr/bin/
COPY --from=ghcr.io/goreleaser/goreleaser-cross:v1.22.3 /usr/bin/goreleaser /usr/bin/

ENV DOCKER=
ENV GOROOT=/usr/local/go
Expand Down
5 changes: 3 additions & 2 deletions buildenvs/qemu.Dockerfile
Original file line number Diff line number Diff line change
Expand Up @@ -3,11 +3,11 @@
# Licensed under the BSD-3-Clause License (the "License").
# You may not use this file except in compliance with the License.

ARG DEBIAN_VERSION=bookworm-20230725
ARG DEBIAN_VERSION=bookworm-20240513

FROM debian:${DEBIAN_VERSION} AS qemu-build

ARG QEMU_VERSION=8.2.0
ARG QEMU_VERSION=8.2.4
ARG WITH_XEN=disable
ARG WITH_KVM=enable

Expand All @@ -26,6 +26,7 @@ RUN set -ex; \
bison \
build-essential \
curl \
git \
flex \
libaio-dev \
libattr1-dev \
Expand Down

0 comments on commit 3d3ee01

Please sign in to comment.