Skip to content

fix: Only change go snap version to build components #1845

New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Draft
wants to merge 1 commit into
base: main
Choose a base branch
from
Draft

fix: Only change go snap version to build components #1845

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
1 commit
Select commit
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
26 changes: 16 additions & 10 deletions build-scripts/components/containerd/build.sh
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -1,12 +1,15 @@
#!/bin/bash

# Store the current Go snap revision
INITIAL_GO_REVISION=$(snap list go | grep -E '^go\s' | awk '{print $3}')
echo "Current Go snap revision: ${INITIAL_GO_REVISION}"

# Refresh to go 1.23-fips/stable channel
echo "Refreshing to go 1.23-fips/stable channel..."
snap refresh go --channel=1.23-fips/stable
# Check if Go is installed via snap
if snap list go >/dev/null 2>&1; then
# Store the current Go snap revision
INITIAL_GO_REVISION=$(snap list go | grep -E '^go\s' | awk '{print $3}')
echo "Current Go snap revision: ${INITIAL_GO_REVISION}"

# Refresh to go 1.23-fips/stable channel
echo "Refreshing to go 1.23-fips/stable channel..."
snap refresh go --channel=1.23-fips/stable
fi

INSTALL="${1}/bin"
mkdir -p "${INSTALL}"
Expand Down Expand Up @@ -39,6 +42,9 @@ for bin in ctr containerd-shim containerd-shim-runc-v1 containerd-shim-runc-v2;
cp "bin/${bin}" "${INSTALL}/${bin}"
done

# Restore the initial Go snap revision
echo "Restoring Go snap to initial revision: ${INITIAL_GO_REVISION}"
snap revert go --revision="${INITIAL_GO_REVISION}"
# Restore Go state
if snap list go >/dev/null 2>&1; then
# Restore the initial Go snap revision
echo "Restoring Go snap to initial revision: ${INITIAL_GO_REVISION}"
snap revert go --revision="${INITIAL_GO_REVISION}"
fi
26 changes: 16 additions & 10 deletions build-scripts/components/runc/build.sh
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -1,12 +1,15 @@
#!/bin/bash

# Store the current Go snap revision
INITIAL_GO_REVISION=$(snap list go | grep -E '^go\s' | awk '{print $3}')
echo "Current Go snap revision: ${INITIAL_GO_REVISION}"

# Refresh to go 1.23-fips/stable channel
echo "Refreshing to go 1.23-fips/stable channel..."
snap refresh go --channel=1.23-fips/stable
# Check if Go is installed via snap
if snap list go >/dev/null 2>&1; then
# Store the current Go snap revision
INITIAL_GO_REVISION=$(snap list go | grep -E '^go\s' | awk '{print $3}')
echo "Current Go snap revision: ${INITIAL_GO_REVISION}"

# Refresh to go 1.23-fips/stable channel
echo "Refreshing to go 1.23-fips/stable channel..."
snap refresh go --channel=1.23-fips/stable
fi

VERSION="${2}"

Expand All @@ -19,6 +22,9 @@ export COMMIT="$(git describe --long --always "${VERSION}")"
make BUILDTAGS="seccomp apparmor" EXTRA_LDFLAGS="-s -w" static
cp runc "${INSTALL}/runc"

# Restore the initial Go snap revision
echo "Restoring Go snap to initial revision: ${INITIAL_GO_REVISION}"
snap revert go --revision="${INITIAL_GO_REVISION}"
# Restore Go state
if snap list go >/dev/null 2>&1; then
# Restore the initial Go snap revision
echo "Restoring Go snap to initial revision: ${INITIAL_GO_REVISION}"
snap revert go --revision="${INITIAL_GO_REVISION}"
fi
Loading