Skip to content

Commit 7ba0dbf

Browse files
authored
Merge branch 'main' into dependabot/go_modules/ci/e2e/github.com/opencontainers/image-spec-1.1.1
Signed-off-by: Yifan Yuan <tuji.yyf@alibaba-inc.com>
2 parents 3869edd + 5197733 commit 7ba0dbf

14 files changed

Lines changed: 177 additions & 64 deletions

File tree

.github/workflows/check.yml

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -29,7 +29,7 @@ jobs:
2929
- "" # empty; fall back on go-version-file (use go.mod); see https://github.com/actions/setup-go/issues/450#issuecomment-3620402646
3030
- 1.26
3131
steps:
32-
- uses: actions/checkout@v6
32+
- uses: actions/checkout@v7
3333
with:
3434
persist-credentials: false
3535
- name: install Go
@@ -54,7 +54,7 @@ jobs:
5454
timeout-minutes: 5
5555

5656
steps:
57-
- uses: actions/checkout@v6
57+
- uses: actions/checkout@v7
5858
with:
5959
path: src/github.com/containerd/accelerated-container-image
6060
fetch-depth: 100

.github/workflows/ci-build-image.yml

Lines changed: 3 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -34,7 +34,7 @@ jobs:
3434

3535
steps:
3636
- name: Checkout
37-
uses: actions/checkout@v6
37+
uses: actions/checkout@v7
3838
with:
3939
ref: ${{ inputs.commit-hash }}
4040
fetch-depth: 0
@@ -44,7 +44,7 @@ jobs:
4444
uses: docker/setup-buildx-action@v2
4545

4646
- name: Login ghcr.io
47-
uses: docker/login-action@v2
47+
uses: docker/login-action@v4
4848
with:
4949
registry: ghcr.io
5050
username: ${{ github.actor }}
@@ -59,7 +59,7 @@ jobs:
5959
echo "RELEASE_VERSION=${releasever}" >> $GITHUB_ENV
6060
6161
- name: Build and Push
62-
uses: docker/build-push-action@v4
62+
uses: docker/build-push-action@v7
6363
with:
6464
tags: ghcr.io/${{ inputs.github-repository }}/overlaybd-ci-images:${{ inputs.image-tag }}
6565
push: true

.github/workflows/ci-unit-test.yml

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -27,7 +27,7 @@ jobs:
2727
- "" # empty; fall back on go-version-file (use go.mod); see https://github.com/actions/setup-go/issues/450#issuecomment-3620402646
2828
- 1.26
2929
steps:
30-
- uses: actions/checkout@v6
30+
- uses: actions/checkout@v7
3131
with:
3232
fetch-depth: 100
3333
persist-credentials: false

.github/workflows/ci-userspace-convertor.yml

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -47,7 +47,7 @@ jobs:
4747

4848
steps:
4949
- name: Checkout
50-
uses: actions/checkout@v6
50+
uses: actions/checkout@v7
5151
with:
5252
ref: ${{ inputs.commit-hash }}
5353
fetch-depth: 0

.github/workflows/codeql.yml

Lines changed: 3 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -29,7 +29,7 @@ jobs:
2929

3030
steps:
3131
- name: Checkout repository
32-
uses: actions/checkout@v6
32+
uses: actions/checkout@v7
3333
with:
3434
persist-credentials: false
3535

@@ -40,10 +40,10 @@ jobs:
4040

4141
# Initializes the CodeQL tools for scanning.
4242
- name: Initialize CodeQL
43-
uses: github/codeql-action/init@v3
43+
uses: github/codeql-action/init@v4
4444

4545
- run: |
4646
make
4747
4848
- name: Perform CodeQL Analysis
49-
uses: github/codeql-action/analyze@v3
49+
uses: github/codeql-action/analyze@v4

.github/workflows/release.yml

Lines changed: 3 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -29,7 +29,7 @@ jobs:
2929
releasever="${releasever#refs/tags/}"
3030
echo "RELEASE_VERSION=${releasever}" >> $GITHUB_ENV
3131
- name: Checkout
32-
uses: actions/checkout@v6
32+
uses: actions/checkout@v7
3333
with:
3434
fetch-depth: 100
3535
persist-credentials: false
@@ -80,7 +80,7 @@ jobs:
8080
needs: [build]
8181
steps:
8282
- name: Download builds and release notes
83-
uses: actions/download-artifact@v6
83+
uses: actions/download-artifact@v8
8484
with:
8585
name: releases
8686
path: releases
@@ -106,7 +106,7 @@ jobs:
106106
needs: [build]
107107
steps:
108108
- name: Download builds and release notes
109-
uses: actions/download-artifact@v6
109+
uses: actions/download-artifact@v8
110110
with:
111111
name: releases
112112
path: releases

Dockerfile

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -3,7 +3,7 @@ ARG GO_VERSION=latest
33
ARG GOLANG_IMAGE=golang:${GO_VERSION}
44
FROM ${GOLANG_IMAGE} AS golang
55

6-
FROM ubuntu:22.04 AS builder
6+
FROM ubuntu:26.04 AS builder
77

88
WORKDIR /go/src/github.com
99
ARG TARGETARCH
@@ -24,7 +24,7 @@ RUN export PATH=$PATH:/usr/local/go/bin && \
2424
cd overlaybd && rm -rf build && mkdir build && cd build && cmake ../ && make -j && make install && cd ../.. && \
2525
cd accelerated-container-image && make -j && make install
2626

27-
FROM ubuntu:22.04
27+
FROM ubuntu:26.04
2828

2929
COPY --from=builder /opt/overlaybd /opt/overlaybd
3030
COPY --from=builder /etc/overlaybd /etc/overlaybd

ci/build_image/Dockerfile

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -37,7 +37,7 @@ RUN make && \
3737
nfpm pkg --packager rpm --target /tmp/
3838

3939
# build image
40-
FROM ubuntu:22.04 AS release
40+
FROM ubuntu:26.04 AS release
4141
ARG OBD_VERSION
4242
ARG RELEASE_VERSION
4343
SHELL ["/bin/bash", "-c"]

ci/e2e/go.mod

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -3,7 +3,7 @@ module github.com/containerd/accelerated-container-image/ci/e2e
33
go 1.26.0
44

55
require (
6-
github.com/containerd/containerd/v2 v2.0.9
6+
github.com/containerd/containerd/v2 v2.0.10
77
github.com/opencontainers/image-spec v1.1.1
88
github.com/stretchr/testify v1.10.0
99
oras.land/oras-go/v2 v2.5.0

ci/e2e/go.sum

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -1,5 +1,5 @@
1-
github.com/containerd/containerd/v2 v2.0.9 h1:BtjYFk0SHtDQs8SXRQhPT+WZia18rLaHobekf5YFmrQ=
2-
github.com/containerd/containerd/v2 v2.0.9/go.mod h1:YdMdboz+mhlo+CQYGaLyUuqJBGlaz2OV2SA6dEMjvuo=
1+
github.com/containerd/containerd/v2 v2.0.10 h1:l2ueLbt1HN1/WRl2pQvHM+7eEodjknAsXv1HLJ2Mz0Q=
2+
github.com/containerd/containerd/v2 v2.0.10/go.mod h1:YdMdboz+mhlo+CQYGaLyUuqJBGlaz2OV2SA6dEMjvuo=
33
github.com/containerd/errdefs v1.0.0 h1:tg5yIfIlQIrxYtu9ajqY42W3lpS19XqdxRQeEwYG8PI=
44
github.com/containerd/errdefs v1.0.0/go.mod h1:+YBYIdtsnF4Iw6nWZhJcqGSg/dwvV7tyJ/kCkyJ2k+M=
55
github.com/containerd/log v0.1.0 h1:TCJt7ioM2cr/tfR8GPbGf9/VRAX8D2B4PjzCpfX540I=

0 commit comments

Comments
 (0)