From 7df93d2fe512578d46861b3278264c564e93eebc Mon Sep 17 00:00:00 2001 From: Krzesimir Nowak Date: Thu, 24 Mar 2022 16:46:30 +0100 Subject: [PATCH 1/2] virtual/rust: Move it to coreos-overlay It looks like we are not really following gentoo in rust releases, so move the package out to coreos-overlay. --- .../portage-stable/virtual/rust/metadata.xml | 12 ------------ .../virtual/rust/rust-1.52.1.ebuild | 19 ------------------- .../virtual/rust/rust-1.53.0-r1.ebuild | 19 ------------------- .../virtual/rust/rust-1.54.0.ebuild | 19 ------------------- .../virtual/rust/rust-1.59.0.ebuild | 19 ------------------- 5 files changed, 88 deletions(-) delete mode 100644 sdk_container/src/third_party/portage-stable/virtual/rust/metadata.xml delete mode 100644 sdk_container/src/third_party/portage-stable/virtual/rust/rust-1.52.1.ebuild delete mode 100644 sdk_container/src/third_party/portage-stable/virtual/rust/rust-1.53.0-r1.ebuild delete mode 100644 sdk_container/src/third_party/portage-stable/virtual/rust/rust-1.54.0.ebuild delete mode 100644 sdk_container/src/third_party/portage-stable/virtual/rust/rust-1.59.0.ebuild diff --git a/sdk_container/src/third_party/portage-stable/virtual/rust/metadata.xml b/sdk_container/src/third_party/portage-stable/virtual/rust/metadata.xml deleted file mode 100644 index f51288e196..0000000000 --- a/sdk_container/src/third_party/portage-stable/virtual/rust/metadata.xml +++ /dev/null @@ -1,12 +0,0 @@ - - - - - rust@gentoo.org - Rust Project - - - Install rustfmt, Rust code formatter - - - diff --git a/sdk_container/src/third_party/portage-stable/virtual/rust/rust-1.52.1.ebuild b/sdk_container/src/third_party/portage-stable/virtual/rust/rust-1.52.1.ebuild deleted file mode 100644 index b6e4774761..0000000000 --- a/sdk_container/src/third_party/portage-stable/virtual/rust/rust-1.52.1.ebuild +++ /dev/null @@ -1,19 +0,0 @@ -# Copyright 1999-2021 Gentoo Authors -# Distributed under the terms of the GNU General Public License v2 - -EAPI=7 - -inherit multilib-build - -DESCRIPTION="Virtual for Rust language compiler" - -LICENSE="" -SLOT="0" -KEYWORDS="amd64 arm arm64 ~ppc ppc64 ~riscv x86" -IUSE="rustfmt" - -BDEPEND="" -RDEPEND="|| ( - ~dev-lang/rust-${PV}[rustfmt?,${MULTILIB_USEDEP}] - ~dev-lang/rust-bin-${PV}[rustfmt?,${MULTILIB_USEDEP}] -)" diff --git a/sdk_container/src/third_party/portage-stable/virtual/rust/rust-1.53.0-r1.ebuild b/sdk_container/src/third_party/portage-stable/virtual/rust/rust-1.53.0-r1.ebuild deleted file mode 100644 index b6e4774761..0000000000 --- a/sdk_container/src/third_party/portage-stable/virtual/rust/rust-1.53.0-r1.ebuild +++ /dev/null @@ -1,19 +0,0 @@ -# Copyright 1999-2021 Gentoo Authors -# Distributed under the terms of the GNU General Public License v2 - -EAPI=7 - -inherit multilib-build - -DESCRIPTION="Virtual for Rust language compiler" - -LICENSE="" -SLOT="0" -KEYWORDS="amd64 arm arm64 ~ppc ppc64 ~riscv x86" -IUSE="rustfmt" - -BDEPEND="" -RDEPEND="|| ( - ~dev-lang/rust-${PV}[rustfmt?,${MULTILIB_USEDEP}] - ~dev-lang/rust-bin-${PV}[rustfmt?,${MULTILIB_USEDEP}] -)" diff --git a/sdk_container/src/third_party/portage-stable/virtual/rust/rust-1.54.0.ebuild b/sdk_container/src/third_party/portage-stable/virtual/rust/rust-1.54.0.ebuild deleted file mode 100644 index f9d87cdb21..0000000000 --- a/sdk_container/src/third_party/portage-stable/virtual/rust/rust-1.54.0.ebuild +++ /dev/null @@ -1,19 +0,0 @@ -# Copyright 1999-2021 Gentoo Authors -# Distributed under the terms of the GNU General Public License v2 - -EAPI=7 - -inherit multilib-build - -DESCRIPTION="Virtual for Rust language compiler" - -LICENSE="" -SLOT="0" -KEYWORDS="~amd64 ~arm ~arm64 ~ppc ~ppc64 ~riscv ~x86" -IUSE="rustfmt" - -BDEPEND="" -RDEPEND="|| ( - ~dev-lang/rust-${PV}[rustfmt?,${MULTILIB_USEDEP}] - ~dev-lang/rust-bin-${PV}[rustfmt?,${MULTILIB_USEDEP}] -)" diff --git a/sdk_container/src/third_party/portage-stable/virtual/rust/rust-1.59.0.ebuild b/sdk_container/src/third_party/portage-stable/virtual/rust/rust-1.59.0.ebuild deleted file mode 100644 index f9d87cdb21..0000000000 --- a/sdk_container/src/third_party/portage-stable/virtual/rust/rust-1.59.0.ebuild +++ /dev/null @@ -1,19 +0,0 @@ -# Copyright 1999-2021 Gentoo Authors -# Distributed under the terms of the GNU General Public License v2 - -EAPI=7 - -inherit multilib-build - -DESCRIPTION="Virtual for Rust language compiler" - -LICENSE="" -SLOT="0" -KEYWORDS="~amd64 ~arm ~arm64 ~ppc ~ppc64 ~riscv ~x86" -IUSE="rustfmt" - -BDEPEND="" -RDEPEND="|| ( - ~dev-lang/rust-${PV}[rustfmt?,${MULTILIB_USEDEP}] - ~dev-lang/rust-bin-${PV}[rustfmt?,${MULTILIB_USEDEP}] -)" From 13e71132f5ca45cd1e3bb481c1164627f7ea2e7e Mon Sep 17 00:00:00 2001 From: Krzesimir Nowak Date: Thu, 24 Mar 2022 16:55:27 +0100 Subject: [PATCH 2/2] .github: Drop the rust workflows They are now in coreos-overlay. --- .../.github/workflows/rust-apply-patch.sh | 16 -------- .../workflows/rust-pull-request-main.yml | 40 ------------------- 2 files changed, 56 deletions(-) delete mode 100755 sdk_container/src/third_party/portage-stable/.github/workflows/rust-apply-patch.sh delete mode 100644 sdk_container/src/third_party/portage-stable/.github/workflows/rust-pull-request-main.yml 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