diff --git a/.github/workflows/containerd-apply-patch.sh b/.github/workflows/containerd-apply-patch.sh deleted file mode 100755 index 0b47f1c4c5..0000000000 --- a/.github/workflows/containerd-apply-patch.sh +++ /dev/null @@ -1,48 +0,0 @@ -#!/bin/bash - -set -euo pipefail - -source "${GHA_SCRIPTS_DIR}/.github/workflows/common.sh" - -prepare_git_repo - -if ! check_remote_branch "containerd-${VERSION_NEW}-${TARGET_BRANCH}"; then - echo "remote branch already exists, nothing to do" - exit 0 -fi - -pushd "${SDK_OUTER_OVERLAY}" - -VERSION_OLD=$(sed -n "s/^DIST containerd-\([0-9]*\.[0-9]*\.[0-9]*\).*/\1/p" app-containers/containerd/Manifest | sort -ruV | head -n1) -if [[ "${VERSION_NEW}" = "${VERSION_OLD}" ]]; then - echo "already the latest Containerd, nothing to do" - exit 0 -fi - -# we need to update not only the main ebuild file, but also its CONTAINERD_COMMIT, -# which needs to point to COMMIT_HASH that matches with $VERSION_NEW from upstream containerd. -containerdEbuildOld=$(get_ebuild_filename app-containers/containerd "${VERSION_OLD}") -containerdEbuildNew="app-containers/containerd/containerd-${VERSION_NEW}.ebuild" -git mv "${containerdEbuildOld}" "${containerdEbuildNew}" -sed -i "s/GIT_REVISION=.*/GIT_REVISION=${COMMIT_HASH}/g" "${containerdEbuildNew}" - -# The ebuild is masked by default to maintain compatibility with Gentoo upstream -# so we add an unmask for Flatcar only. -keywords_file="profiles/coreos/base/package.accept_keywords" -ts=$(date +'%Y-%m-%d %H:%M:%S') -comment="DO NOT EDIT THIS LINE. Added by containerd-apply-patch.sh on ${ts}" -sed -i "s;^\(=app-containers/containerd\)-${VERSION_OLD} .*;\1-${VERSION_NEW} ~amd64 ~arm64 # ${comment};" "${keywords_file}" - -popd - -URL="https://github.com/containerd/containerd/releases/tag/v${VERSION_NEW}" - -generate_update_changelog 'containerd' "${VERSION_NEW}" "${URL}" 'containerd' - -# Commit package changes and updated keyword file -commit_changes app-containers/containerd "${VERSION_OLD}" "${VERSION_NEW}" "${keywords_file}" - -cleanup_repo - -echo "VERSION_OLD=${VERSION_OLD}" >>"${GITHUB_OUTPUT}" -echo 'UPDATE_NEEDED=1' >>"${GITHUB_OUTPUT}" diff --git a/.github/workflows/containerd-release-main.yaml b/.github/workflows/containerd-release-main.yaml deleted file mode 100644 index 7e3b1d38a9..0000000000 --- a/.github/workflows/containerd-release-main.yaml +++ /dev/null @@ -1,50 +0,0 @@ -name: Get the latest Containerd release for main -on: - schedule: - - cron: '00 8 * * 5' - workflow_dispatch: - -jobs: - get-containerd-release: - runs-on: ubuntu-latest - steps: - - name: Check out scripts - uses: actions/checkout@v4 - with: - token: ${{ secrets.BOT_PR_TOKEN }} - path: scripts - - name: Figure out latest Containerd release version - id: containerd-latest-release - run: | - versionCommitPair=( $(git ls-remote --tags https://github.com/containerd/containerd | grep 'refs/tags/v[0-9]*\.[0-9]*\.[0-9]*$' | sed -e 's#^\([0-9a-fA-F]*\)[[:space:]]*refs/tags/v\(.*\)$#\2 \1#g' | sort --reverse --unique --version-sort | head --lines 1) ) - - echo "VERSION_NEW=${versionCommitPair[0]}" >>"${GITHUB_OUTPUT}" - echo "COMMIT_HASH=${versionCommitPair[1]}" >>"${GITHUB_OUTPUT}" - - name: Set up Flatcar SDK - id: setup-flatcar-sdk - env: - WORK_SCRIPTS_DIR: "${{ github.workspace }}/scripts" - CHANNEL: main - run: scripts/.github/workflows/setup-flatcar-sdk.sh - - name: Apply patch for main - id: apply-patch-main - env: - GHA_SCRIPTS_DIR: "${{ github.workspace }}/scripts" - WORK_SCRIPTS_DIR: "${{ github.workspace }}/scripts" - VERSION_NEW: ${{ steps.containerd-latest-release.outputs.VERSION_NEW }} - COMMIT_HASH: ${{ steps.containerd-latest-release.outputs.COMMIT_HASH }} - PACKAGES_CONTAINER: ${{ steps.setup-flatcar-sdk.outputs.PACKAGES_CONTAINER }} - SDK_NAME: ${{ steps.setup-flatcar-sdk.outputs.SDK_NAME }} - TARGET_BRANCH: main - run: scripts/.github/workflows/containerd-apply-patch.sh - - name: Create pull request for main - uses: peter-evans/create-pull-request@v6 - if: steps.apply-patch-main.outputs.UPDATE_NEEDED == 1 - with: - token: ${{ secrets.BOT_PR_TOKEN }} - path: scripts - branch: "containerd-${{ steps.containerd-latest-release.outputs.VERSION_NEW }}-main" - base: main - title: Upgrade Containerd in main from ${{ steps.apply-patch-main.outputs.VERSION_OLD }} to ${{ steps.containerd-latest-release.outputs.VERSION_NEW }} - body: Subject says it all. - labels: main