diff --git a/sdk_container/src/third_party/portage-stable/.github/workflows/rust-apply-patch.sh b/sdk_container/src/third_party/portage-stable/.github/workflows/rust-apply-patch.sh deleted file mode 100755 index 8a58ff9e71..0000000000 --- a/sdk_container/src/third_party/portage-stable/.github/workflows/rust-apply-patch.sh +++ /dev/null @@ -1,16 +0,0 @@ -#!/bin/bash - -set -euo pipefail - -git fetch origin -git checkout -B "${BASE_BRANCH}" "origin/${BASE_BRANCH}" - -pushd "virtual/rust" >/dev/null || exit -VERSION_OLD=$(ls -1 rust-*.ebuild | sed -n "s/rust-\(1.[0-9]*.[0-9]*\).ebuild/\1/p" | sort -ruV | head -n1) -git mv rust-${VERSION_OLD}.ebuild "rust-${VERSION_NEW}.ebuild" -# For a complete update we would need to download the upstream ebuild and apply our crossdev patch. -# Automating this is not done yet and maybe would not work well either and had the same result as just renaming -# which we did here and has the same effect for minor updates that do not touch the ebuild logic. -popd >/dev/null || exit - -echo ::set-output name=VERSION_OLD::"${VERSION_OLD}" diff --git a/sdk_container/src/third_party/portage-stable/.github/workflows/rust-pull-request-main.yml b/sdk_container/src/third_party/portage-stable/.github/workflows/rust-pull-request-main.yml deleted file mode 100644 index ac31dc4ee8..0000000000 --- a/sdk_container/src/third_party/portage-stable/.github/workflows/rust-pull-request-main.yml +++ /dev/null @@ -1,40 +0,0 @@ -on: - repository_dispatch: - types: [rust-pull-request-main] - -jobs: - flatcar-rust-prs: - runs-on: ubuntu-latest - env: - GIT_SSH_COMMAND: "ssh -o StrictHostKeyChecking=no" - steps: - - uses: actions/checkout@v2 - - name: Fetch latest virtual Rust release - id: fetch-latest-release - run: | - git clone --depth=1 --no-checkout https://github.com/rust-lang/rust - versionMain=$(git -C rust ls-remote --tags origin | cut -f2 | sed -n "/refs\/tags\/1.[0-9]*.[0-9]*$/s/^refs\/tags\///p" | sort -ruV | head -n1) - rm -rf rust - echo ::set-output name=VERSION_MAIN::$(echo ${versionMain}) - echo ::set-output name=BASE_BRANCH_MAIN::main - - name: Apply patch for main - id: apply-patch-main - env: - BASE_BRANCH: ${{ steps.fetch-latest-release.outputs.BASE_BRANCH_MAIN }} - VERSION_NEW: ${{ steps.fetch-latest-release.outputs.VERSION_MAIN }} - run: .github/workflows/rust-apply-patch.sh - - name: Create pull request for main - uses: peter-evans/create-pull-request@v3 - with: - token: ${{ secrets.GITHUB_TOKEN }} - base: ${{ steps.fetch-latest-release.outputs.BASE_BRANCH_MAIN }} - branch: rust-${{ steps.fetch-latest-release.outputs.VERSION_MAIN }}-main - author: Flatcar Buildbot - committer: Flatcar Buildbot - title: Upgrade virtual Rust in main from ${{ steps.apply-patch-main.outputs.VERSION_OLD }} to ${{ steps.fetch-latest-release.outputs.VERSION_MAIN }} - commit-message: Upgrade virtual Rust in main from ${{ steps.apply-patch-main.outputs.VERSION_OLD }} to ${{ steps.fetch-latest-release.outputs.VERSION_MAIN }} - body: | - Upgrade virtual Rust in main from ${{ steps.apply-patch-main.outputs.VERSION_OLD }} to ${{ steps.fetch-latest-release.outputs.VERSION_MAIN }} - - This PR should be merged together with a corresponding PR in coreos-overlay for [`dev-lang/rust` ${{ steps.fetch-latest-release.outputs.VERSION_MAIN }}](https://github.com/flatcar-linux/coreos-overlay/pull/${{ github.event.client_payload.coreos-overlay-pull-request-number}}). - labels: main