Merge pull request #313 from flatcar-linux/krnowak/move-rust

Move virtual/rust to coreos-overlay and drop the rust workflow
This commit is contained in:
Krzesimir Nowak 2022-03-31 11:28:26 +02:00 committed by GitHub
commit 2a00a4b6bf
7 changed files with 0 additions and 144 deletions

View File

@ -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}"

View File

@ -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 <buildbot@flatcar-linux.org>
committer: Flatcar Buildbot <buildbot@flatcar-linux.org>
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

View File

@ -1,12 +0,0 @@
<?xml version="1.0" encoding="UTF-8"?>
<!DOCTYPE pkgmetadata SYSTEM "https://www.gentoo.org/dtd/metadata.dtd">
<pkgmetadata>
<maintainer type="project">
<email>rust@gentoo.org</email>
<name>Rust Project</name>
</maintainer>
<use>
<flag name="rustfmt">Install rustfmt, Rust code formatter</flag>
</use>
<stabilize-allarches/>
</pkgmetadata>

View File

@ -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}]
)"

View File

@ -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}]
)"

View File

@ -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}]
)"

View File

@ -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}]
)"