Skip to content

Commit 93022d8

Browse files
authored
Merge pull request containerd#9735 from dmcgowan/prepare-v2.0.0-rc.0
Prepare release notes for v2.0.0-rc.0
2 parents d3a77cb + 0d0850a commit 93022d8

File tree

4 files changed

+9
-5
lines changed

4 files changed

+9
-5
lines changed

.mailmap

Lines changed: 3 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -11,14 +11,14 @@ Alex Ellis <[email protected]>
1111
1212
1313
14+
Amir M. Ghazanfari <[email protected]>
1415
1516
1617
Andrey Kolomentsev <[email protected]>
1718
Arnaud Porterie <[email protected]>
1819
1920
Bob Mader <[email protected]>
2021
Boris Popovschi <[email protected]>
21-
bot <49699333+dependabot[bot]@users.noreply.github.com>
2222
Bowen Yan <[email protected]>
2323
Brent Baude <[email protected]>
2424
Cao Zhihao <[email protected]>
@@ -89,6 +89,7 @@ Kenfe-Mickaël Laventure <[email protected]>
8989
Kevin Kern <[email protected]>
9090
9191
92+
Kirtana Ashok <[email protected]>
9293
9394
9495
Kohei Tokunaga <[email protected]>
@@ -126,6 +127,7 @@ Phil Estes <[email protected]> <[email protected]>
126127
Qian Zhang <[email protected]>
127128
128129
Robin Winkelewski <[email protected]>
130+
129131
Ross Boucher <[email protected]>
130132
Ruediger Maass <[email protected]>
131133

contrib/v2-migrate.sh

Lines changed: 4 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -2,10 +2,11 @@
22
set -e
33
for GOFILE in $(find . -name "*.go" | grep -v "./vendor/" ); do
44
#First migrate containerd imports to v2 module
5-
perl -pi -e 's/([\t]|[ ]{2,8}|import )([_\.a-zA-Z0-9]+ )?"github\.com\/containerd\/containerd(?!\/v2)(\/\S+)?"/$1$2"github.com\/containerd\/containerd\/v2$3"/g' $GOFILE
5+
perl -pi -e 's/([\t]|[ ]{2,8}|import )([_\.a-zA-Z0-9]+ )?"github\.com\/containerd\/containerd(?!\/v2)(\/\S+)?"( \/\/.*)?$/$1$2"github.com\/containerd\/containerd\/v2$3"$4/g' $GOFILE
66

77
#Migrate moved packages
8-
perl -pi -e 's/([\t]|[ ]{2,8}|import )([_\.a-zA-Z0-9]+ )?"github\.com\/containerd\/containerd\/v2"/$1$2"github.com\/containerd\/containerd\/v2\/client"/g' $GOFILE
8+
perl -pi -e 's/([\t]|[ ]{2,8}|import )"github\.com\/containerd\/containerd\/v2"/$1containerd "github.com\/containerd\/containerd\/v2\/client"/g' $GOFILE
9+
perl -pi -e 's/([\t]|[ ]{2,8}|import )([_\.a-zA-Z0-9]+ )"github\.com\/containerd\/containerd\/v2"/$1$2"github.com\/containerd\/containerd\/v2\/client"/g' $GOFILE
910
perl -pi -e 's/([\t]|[ ]{2,8}|import )([_a-zA-Z0-9]+ )?"github\.com\/containerd\/containerd\/v2\/content\/local/$1$2"github.com\/containerd\/containerd\/v2\/plugins\/content\/local/g' $GOFILE
1011
perl -pi -e 's/([\t]|[ ]{2,8}|import )([_a-zA-Z0-9]+ )?"github\.com\/containerd\/containerd\/v2\/content/$1$2"github.com\/containerd\/containerd\/v2\/core\/content/g' $GOFILE
1112
perl -pi -e 's/([\t]|[ ]{2,8}|import )([_a-zA-Z0-9]+ )?"github\.com\/containerd\/containerd\/v2\/containers/$1$2"github.com\/containerd\/containerd\/v2\/core\/containers/g' $GOFILE
@@ -68,6 +69,7 @@ for GOFILE in $(find . -name "*.go" | grep -v "./vendor/" ); do
6869
# Migrate packages split out to their own repository
6970
perl -pi -e 's/([\t]|[ ]{2,8}|import )([_a-zA-Z0-9]+ )?"github\.com\/containerd\/containerd\/v2\/platforms/$1$2"github.com\/containerd\/platforms/g' $GOFILE
7071
perl -pi -e 's/([\t]|[ ]{2,8}|import )([_a-zA-Z0-9]+ )?"github\.com\/containerd\/containerd\/v2\/pkg\/errdefs/$1$2"github.com\/containerd\/errdefs/g' $GOFILE
72+
perl -pi -e 's/([\t]|[ ]{2,8}|import )([_a-zA-Z0-9]+ )?"github\.com\/containerd\/containerd\/v2\/plugin(\/|")/$1$2"github.com\/containerd\/plugin$3/g' $GOFILE
7173

7274
gofmt -s -w $GOFILE
7375
done

releases/v2.0.0-beta.toml renamed to releases/v2.0.0-rc.toml

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -34,4 +34,4 @@ See also the [Getting Started](https://github.com/containerd/containerd/blob/mai
3434
override_deps."github.com/containerd/log".previous = "cf9777876edf6a4aa230c739bc7eec5ab8349e9c"
3535
override_deps."github.com/containerd/plugin".previous = "497c49344a4b9894a7e26497420cb7fa817facba"
3636
override_deps."github.com/containerd/platforms".previous = "f18f3c661f7de73d5569f61ff72d98dae1c1700a"
37-
override_deps."github.com/containerd/errdefs".previous = "f18f3c661f7de73d5569f61ff72d98dae1c1700a"
37+
override_deps."github.com/containerd/errdefs".previous = "e0d1732a5c38bb3b899832b4e66e7bbb2216559f"

version/version.go

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -23,7 +23,7 @@ var (
2323
Package = "github.com/containerd/containerd/v2"
2424

2525
// Version holds the complete version number. Filled in at linking time.
26-
Version = "2.0.0-beta.2+unknown"
26+
Version = "2.0.0-rc.0+unknown"
2727

2828
// Revision is filled with the VCS (e.g. git) revision being used to build
2929
// the program at linking time.

0 commit comments

Comments
 (0)