Skip to content

Commit 462b2fe

Browse files
Changes:
- fix incorrect buildkit version bump for ubuntu-deps - fix update-container-runtime fetching nerdctl rc tags Signed-off-by: Swapnanil-Gupta <[email protected]>
1 parent c06c39b commit 462b2fe

File tree

2 files changed

+18
-20
lines changed

2 files changed

+18
-20
lines changed

.github/workflows/update-dependencies.yaml

Lines changed: 6 additions & 8 deletions
Original file line numberDiff line numberDiff line change
@@ -62,13 +62,6 @@ jobs:
6262
tag: ${{ steps.fetch-tag.outputs.tag }}
6363

6464
steps:
65-
- name: Checkout nerdctl
66-
uses: actions/checkout@08c6903cd8c0fde910a37f88322edcfb5dd907a8 # v5.0.0
67-
with:
68-
repository: containerd/nerdctl
69-
fetch-depth: 0
70-
fetch-tags: true
71-
7265
- name: Fetch tag for latest release
7366
id: fetch-tag
7467
env:
@@ -78,7 +71,12 @@ jobs:
7871
echo "tag=$OVERRIDE_TAG" >> $GITHUB_OUTPUT
7972
echo "Override tag: $OVERRIDE_TAG"
8073
else
81-
latest_tag="$(git tag --sort=-version:refname | head -n 1)"
74+
latest_tag="$(\
75+
curl -s "https://api.github.com/repos/containerd/nerdctl/releases/latest" | \
76+
grep '"tag_name":' | \
77+
head -1 | \
78+
cut -d'"' -f4 \
79+
)"
8280
echo "tag=$latest_tag" >> $GITHUB_OUTPUT
8381
echo "Latest tag is ${latest_tag}"
8482
fi

bin/update-debian-dependencies.sh

Lines changed: 12 additions & 12 deletions
Original file line numberDiff line numberDiff line change
@@ -98,6 +98,14 @@ NERDCTL_LATEST=$(get_latest_tag "containerd/nerdctl")
9898
NERDCTL_COMMIT=$(get_commit_for_tag "containerd/nerdctl" "$NERDCTL_LATEST")
9999
update_dependency "NERDCTL" "$NERDCTL_LATEST" "$NERDCTL_COMMIT"
100100

101+
# Get nerdctl dockerfile content
102+
echo "Getting nerdctl dockerfile content..."
103+
NERDCTL_DOCKERFILE=$(get_nerdctl_dockerfile "$NERDCTL_LATEST")
104+
105+
# Get BuildKit version from nerdctl Dockerfile
106+
echo "Getting BuildKit version from nerdctl Dockerfile..."
107+
BUILDKIT_VERSION=$(get_buildkit_version "$NERDCTL_DOCKERFILE")
108+
101109
# Update buildkit with version from nerdctl
102110
echo "Updating buildkit to version $BUILDKIT_VERSION..."
103111
BUILDKIT_COMMIT=$(get_commit_for_tag "moby/buildkit" "$BUILDKIT_VERSION")
@@ -109,24 +117,16 @@ SOCI_LATEST=$(get_latest_tag "awslabs/soci-snapshotter")
109117
SOCI_COMMIT=$(get_commit_for_tag "awslabs/soci-snapshotter" "$SOCI_LATEST")
110118
update_dependency "SOCI" "$SOCI_LATEST" "$SOCI_COMMIT"
111119

112-
# Get nerdctl dockerfile content
113-
echo "Getting nerdctl dockerfile content..."
114-
NERDCTL_DOCKERFILE=$(get_nerdctl_dockerfile "$NERDCTL_LATEST")
115-
116-
# Get BuildKit version from nerdctl Dockerfile
117-
echo "Getting BuildKit version from nerdctl Dockerfile..."
118-
BUILDKIT_VERSION=$(get_buildkit_version "$NERDCTL_DOCKERFILE")
119-
120-
# Get Cosign version from nerdctl Dockerfile
121-
echo "Getting Cosign version from nerdctl Dockerfile..."
122-
COSIGN_VERSION=$(get_cosign_version "$NERDCTL_DOCKERFILE")
123-
124120
# Update CNI plugins
125121
echo "Updating CNI plugins..."
126122
CNI_LATEST=$(get_cni_plugin_version "$NERDCTL_DOCKERFILE")
127123
CNI_COMMIT=$(get_commit_for_tag "containernetworking/plugins" "$CNI_LATEST")
128124
update_dependency "CNI" "$CNI_LATEST" "$CNI_COMMIT"
129125

126+
# Get Cosign version from nerdctl Dockerfile
127+
echo "Getting Cosign version from nerdctl Dockerfile..."
128+
COSIGN_VERSION=$(get_cosign_version "$NERDCTL_DOCKERFILE")
129+
130130
# Update cosign with version from nerdctl
131131
echo "Updating cosign to version $COSIGN_VERSION..."
132132
if [ -n "$COSIGN_VERSION" ]; then

0 commit comments

Comments
 (0)