mirrors/flatcar-scripts
1
0
Fork 0
mirror of https://github.com/flatcar/scripts.git synced 2025-08-16 01:16:59 +02:00
Code Issues Packages Projects Releases Wiki Activity

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

Browse Source 
Import virtual/rust to from portage-stable and update the rust workflow
This commit is contained in:
Krzesimir Nowak 2022-03-31 11:28:24 +02:00 committed by GitHub
commit 1dc58fe441
5 changed files with 38 additions and 14 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

3
sdk_container/src/third_party/coreos-overlay/.github/workflows/common.sh vendored
View File

@ -44,6 +44,7 @@ function prepare_git_repo() {
# setup overlay repo inside SDK too (be fork friendly) # setup overlay repo inside SDK too (be fork friendly)
git -C "${SDK_OUTER_SRCDIR}/third_party/coreos-overlay" remote add our_remote "${our_remote_url}" git -C "${SDK_OUTER_SRCDIR}/third_party/coreos-overlay" remote add our_remote "${our_remote_url}"
git -C "${SDK_OUTER_SRCDIR}/third_party/coreos-overlay" fetch our_remote git -C "${SDK_OUTER_SRCDIR}/third_party/coreos-overlay" fetch our_remote
git -C "${SDK_OUTER_SRCDIR}/third_party/coreos-overlay" checkout -B "${BASE_BRANCH}" "our_remote/${BASE_BRANCH}"
} }
# caller needs to set pass a parameter as a branch name to be created. # caller needs to set pass a parameter as a branch name to be created.
@ -60,7 +61,7 @@ function checkout_branches() {
return 1 return 1
fi fi
git -C "${SDK_OUTER_SRCDIR}/third_party/coreos-overlay" checkout -B "${TARGET_BRANCH}" "github/${BASE_BRANCH}" git -C "${SDK_OUTER_SRCDIR}/third_party/coreos-overlay" checkout -B "${TARGET_BRANCH}" "our_remote/${BASE_BRANCH}"
} }
function regenerate_manifest() { function regenerate_manifest() {

2
sdk_container/src/third_party/coreos-overlay/.github/workflows/rust-apply-patch.sh vendored
View File

@ -29,6 +29,8 @@ find profiles -name 'package.*' | xargs sed -i "s/\([><]*=\|~\)*virtual\/rust-\S
EBUILD_FILENAME=$(get_ebuild_filename "dev-lang" "rust" "${VERSION_OLD}") EBUILD_FILENAME=$(get_ebuild_filename "dev-lang" "rust" "${VERSION_OLD}")
git mv "${EBUILD_FILENAME}" "dev-lang/rust/rust-${VERSION_NEW}.ebuild" git mv "${EBUILD_FILENAME}" "dev-lang/rust/rust-${VERSION_NEW}.ebuild"
EBUILD_FILENAME=$(get_ebuild_filename "virtual" "rust" "${VERSION_OLD}")
git mv "${EBUILD_FILENAME}" "virtual/rust/rust-${VERSION_NEW}.ebuild"
popd >/dev/null || exit popd >/dev/null || exit

16
sdk_container/src/third_party/coreos-overlay/.github/workflows/rust-release-main.yml vendored
View File

@ -40,18 +40,8 @@ jobs:
branch: rust-${{ steps.fetch-latest-release.outputs.VERSION_MAIN }}-main branch: rust-${{ steps.fetch-latest-release.outputs.VERSION_MAIN }}-main
author: Flatcar Buildbot <buildbot@flatcar-linux.org> author: Flatcar Buildbot <buildbot@flatcar-linux.org>
committer: Flatcar Buildbot <buildbot@flatcar-linux.org> committer: Flatcar Buildbot <buildbot@flatcar-linux.org>
title: Upgrade dev-lang/rust in main from ${{ steps.apply-patch-main.outputs.VERSION_OLD }} to ${{ steps.fetch-latest-release.outputs.VERSION_MAIN }} title: Upgrade dev-lang/rust and virtual/rust in main from ${{ steps.apply-patch-main.outputs.VERSION_OLD }} to ${{ steps.fetch-latest-release.outputs.VERSION_MAIN }}
commit-message: Upgrade dev-lang/rust in main from ${{ steps.apply-patch-main.outputs.VERSION_OLD }} to ${{ steps.fetch-latest-release.outputs.VERSION_MAIN }} commit-message: Upgrade dev-lang/rust and virtual rust in main from ${{ steps.apply-patch-main.outputs.VERSION_OLD }} to ${{ steps.fetch-latest-release.outputs.VERSION_MAIN }}
body: | body: |
Upgrade dev-lang/rust in main from ${{ steps.apply-patch-main.outputs.VERSION_OLD }} to ${{ steps.fetch-latest-release.outputs.VERSION_MAIN }} Upgrade dev-lang/rust and 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 portage-stable for `virtual/rust` ${{ steps.fetch-latest-release.outputs.VERSION_MAIN }}.
labels: main labels: main
- name: Send repository dispatch to portage-stable
uses: peter-evans/repository-dispatch@v1.0.0
if: steps.apply-patch-main.outputs.UPDATE_NEEDED == 1
with:
token: ${{ secrets.FLATCAR_PORTAGE_STABLE_ACCESS_TOKEN }}
repository: flatcar-linux/portage-stable
event-type: rust-pull-request-main
client-payload: '{"coreos-overlay-pull-request-number": "${{ steps.create-pull-request.outputs.pull-request-number }}"}'

12
sdk_container/src/third_party/coreos-overlay/virtual/rust/metadata.xml vendored Normal file
View File

@ -0,0 +1,12 @@
<?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>

19
sdk_container/src/third_party/coreos-overlay/virtual/rust/rust-1.59.0.ebuild vendored Normal file
View File

@ -0,0 +1,19 @@
# Copyright 1999-2022 Gentoo Authors
# Distributed under the terms of the GNU General Public License v2
EAPI=8
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}]
)"