mirror of
https://github.com/flatcar/scripts.git
synced 2025-10-01 18:42:22 +02:00
Drop mantle and kola-data from the SDK
With the new mantle container image referenced by the scripts repo we don't need the mantle copy in the SDK anymore. Drop the mantle package and the unused kola-data package.
This commit is contained in:
Kai Lueke
parent
9951fc5781
commit
87a18b79b3
@ -1,76 +0,0 @@
|
||||
name: Get the latest mantle release for branch
|
||||
on:
|
||||
workflow_dispatch:
|
||||
push:
|
||||
branches:
|
||||
- main
|
||||
|
||||
jobs:
|
||||
get-mantle-release:
|
||||
strategy:
|
||||
matrix:
|
||||
branch: [main,alpha,beta,stable]
|
||||
fail-fast: false
|
||||
runs-on: ubuntu-latest
|
||||
steps:
|
||||
- name: Figure out branch
|
||||
id: figure-out-branch
|
||||
run: |
|
||||
if [ ${{ matrix.branch }} = "main" ]; then
|
||||
echo ::set-output name=BRANCH::main
|
||||
else
|
||||
major=$(curl -sSL https://${{ matrix.branch }}.release.flatcar-linux.net/amd64-usr/current/version.txt | awk -F= '/FLATCAR_BUILD=/{ print $2 }')
|
||||
echo ::set-output name=BRANCH::flatcar-${major}
|
||||
fi
|
||||
- uses: actions/checkout@v2
|
||||
with:
|
||||
token: ${{ secrets.GITHUB_TOKEN }}
|
||||
ref: ${{ steps.figure-out-branch.outputs.BRANCH }}
|
||||
- name: Fetch latest mantle hash
|
||||
id: fetch-latest-mantle
|
||||
run: |
|
||||
commit=$(git ls-remote https://github.com/flatcar-linux/mantle refs/heads/flatcar-master | cut -f1)
|
||||
git clone https://github.com/flatcar-linux/mantle
|
||||
pushd mantle
|
||||
version=$(git describe HEAD)
|
||||
version=${version%%-*}
|
||||
version=${version#v}
|
||||
popd
|
||||
rm -rf mantle
|
||||
echo ::set-output name=COMMIT::${commit}
|
||||
echo ::set-output name=VERSION::${version}
|
||||
- name: Try to apply patch
|
||||
run: |
|
||||
set -x
|
||||
commit=${{ steps.fetch-latest-mantle.outputs.COMMIT }}
|
||||
version=${{ steps.fetch-latest-mantle.outputs.VERSION }}
|
||||
pushd coreos-devel/mantle
|
||||
if ! grep -q ${commit} mantle-9999.ebuild; then
|
||||
sed -i -e 's/\(CROS_WORKON_COMMIT\)=".*"/\1="'${commit}'"/' \
|
||||
-e 's/\(CROS_WORKON_COMMIT=.*\)#.*/\1# flatcar-master/' \
|
||||
mantle-9999.ebuild
|
||||
fi
|
||||
if ! git diff --quiet ; then
|
||||
link=$(echo mantle-*.*.*.ebuild)
|
||||
if ( echo ${link} | grep -q ${version} ); then
|
||||
# if link contains the correct version then we need to uprev
|
||||
rev=${link#mantle-*-r}
|
||||
rev=${rev%.ebuild}
|
||||
rev=$(( rev + 1 ))
|
||||
newlink=mantle-${version}-r${rev}.ebuild
|
||||
git mv ${link} ${newlink}
|
||||
else
|
||||
git mv ${link} mantle-${version}-r1.ebuild
|
||||
fi
|
||||
fi
|
||||
- name: Create pull request for main
|
||||
uses: peter-evans/create-pull-request@v3
|
||||
with:
|
||||
token: ${{ secrets.GITHUB_TOKEN }}
|
||||
base: ${{ steps.figure-out-branch.outputs.BRANCH }}
|
||||
branch: mantle-update-${{ steps.figure-out-branch.outputs.BRANCH }}
|
||||
author: Flatcar Buildbot <buildbot@flatcar-linux.org>
|
||||
committer: Flatcar Buildbot <buildbot@flatcar-linux.org>
|
||||
title: Upgrade mantle to latest HEAD in ${{ steps.figure-out-branch.outputs.BRANCH }}
|
||||
commit-message: Update mantle commit to latest HEAD
|
||||
delete-branch: true
|
||||
1
sdk_container/src/third_party/coreos-overlay/changelog/changes/2022-04-20-mantle-sdk.md
vendored
Normal file
1
sdk_container/src/third_party/coreos-overlay/changelog/changes/2022-04-20-mantle-sdk.md
vendored
Normal file
@ -0,0 +1 @@
|
||||
- SDK: Dropped the mantle binaries (kola, ore, etc.) from the SDK, they are now provided by the `ghcr.io/flatcar-linux/mantle` image ([PR#1827](https://github.com/flatcar-linux/coreos-overlay/pull/1827), [PR#275](https://github.com/flatcar-linux/scripts/pull/275))
|
||||
@ -19,7 +19,6 @@ RDEPEND="
|
||||
app-portage/gentoolkit
|
||||
coreos-base/coreos
|
||||
coreos-base/emerge-gitclone
|
||||
coreos-devel/mantle
|
||||
dev-lang/python
|
||||
dev-util/strace
|
||||
dev-vcs/repo
|
||||
|
||||
@ -1 +0,0 @@
|
||||
DIST docker-1.9.1.tgz 8386688 SHA256 6a095ccfd095b1283420563bd315263fa40015f1cee265de023efef144c7e52d SHA512 64356340adb4c411184a4a4e76a4157c7557693845453cb01e10c56b48ef677d6703c282a052be9dae4e4ff9c244989a2ff724c19d06dc583de53a80c46d9868 WHIRLPOOL 5119a235accfca1bf93ddaa19380ba86fbeef4fa736db5ab90cc67c7c5a206589bfa7cb61368eec0f791df11d305cd91425f0a4f7e7ae726ecd7572139a3eb88
|
||||
@ -1 +0,0 @@
|
||||
kola-data-9999.ebuild
|
||||
@ -1,21 +0,0 @@
|
||||
# Copyright 2016 CoreOS, Inc
|
||||
# Distributed under the terms of the GNU General Public License v2
|
||||
|
||||
EAPI=6
|
||||
|
||||
KEYWORDS="amd64"
|
||||
DESCRIPTION="Binary assets for use in kola tests"
|
||||
HOMEPAGE="https://github.com/coreos/mantle"
|
||||
LICENSE="Apache"
|
||||
|
||||
SRC_URI="https://get.docker.com/builds/Linux/x86_64/docker-1.9.1.tgz"
|
||||
SLOT="0"
|
||||
|
||||
QA_PREBUILT="usr/lib/kola/amd64/docker-1.9.1"
|
||||
|
||||
S="${WORKDIR}"
|
||||
|
||||
src_install() {
|
||||
exeinto /usr/lib/kola/amd64
|
||||
newexe usr/local/bin/docker docker-1.9.1
|
||||
}
|
||||
@ -1 +0,0 @@
|
||||
mantle-9999.ebuild
|
||||
@ -1,61 +0,0 @@
|
||||
# Copyright 2014 CoreOS, Inc.
|
||||
# Distributed under the terms of the GNU General Public License v2
|
||||
|
||||
EAPI=7
|
||||
CROS_WORKON_PROJECT="flatcar-linux/mantle"
|
||||
CROS_WORKON_LOCALNAME="mantle"
|
||||
CROS_WORKON_REPO="https://github.com"
|
||||
COREOS_GO_PACKAGE="github.com/flatcar-linux/mantle"
|
||||
COREOS_GO_MOD="vendor"
|
||||
|
||||
if [[ "${PV}" == 9999 ]]; then
|
||||
KEYWORDS="~amd64 ~arm64"
|
||||
else
|
||||
CROS_WORKON_COMMIT="d3f184b8ce16de080679c3658089cc4cc79360b7" # flatcar-master
|
||||
KEYWORDS="amd64 arm64"
|
||||
fi
|
||||
|
||||
inherit coreos-go cros-workon
|
||||
|
||||
DESCRIPTION="Mantle: Gluing Flatcar together"
|
||||
HOMEPAGE="https://github.com/flatcar-linux/mantle"
|
||||
LICENSE="Apache-2.0"
|
||||
SLOT="0"
|
||||
# objcopy/split have trouble with our cross-compiled kolet
|
||||
STRIP_MASK="/*/kola/*/kolet"
|
||||
|
||||
RDEPEND=">=net-dns/dnsmasq-2.72[dhcp,ipv6]"
|
||||
|
||||
src_compile() {
|
||||
export GO15VENDOREXPERIMENT="1"
|
||||
if [[ "${PV}" == 9999 ]]; then
|
||||
GO_LDFLAGS="-X ${COREOS_GO_PACKAGE}/version.Version=$(get_semver)"
|
||||
else
|
||||
GO_LDFLAGS="-X ${COREOS_GO_PACKAGE}/version.Version=${PV}"
|
||||
fi
|
||||
|
||||
for cmd in cork gangue kola ore plume; do
|
||||
go_build "${COREOS_GO_PACKAGE}/cmd/${cmd}"
|
||||
done
|
||||
|
||||
for a in amd64 arm64; do
|
||||
mkdir -p "${GOBIN}/${a}"
|
||||
CGO_ENABLED=0 GOBIN="${GOBIN}/${a}" GOARCH=${a} go_build "${COREOS_GO_PACKAGE}/cmd/kolet"
|
||||
done
|
||||
}
|
||||
|
||||
src_test() {
|
||||
./test
|
||||
}
|
||||
|
||||
src_install() {
|
||||
for cmd in cork gangue kola ore plume; do
|
||||
dobin "${GOBIN}"/"${cmd}"
|
||||
done
|
||||
|
||||
for a in amd64 arm64; do
|
||||
exeinto /usr/lib/kola/${a}
|
||||
doexe "${GOBIN}/${a}/kolet"
|
||||
done
|
||||
}
|
||||
|
||||
@ -1,4 +0,0 @@
|
||||
<?xml version="1.0" encoding="UTF-8"?>
|
||||
<!DOCTYPE pkgmetadata SYSTEM "http://www.gentoo.org/dtd/metadata.dtd">
|
||||
<pkgmetadata>
|
||||
</pkgmetadata>
|
||||
@ -28,8 +28,6 @@ DEPEND="
|
||||
coreos-base/hard-host-depends
|
||||
coreos-base/coreos-sb-keys
|
||||
coreos-devel/fero-client
|
||||
amd64? ( coreos-devel/kola-data )
|
||||
coreos-devel/mantle
|
||||
dev-libs/gobject-introspection
|
||||
dev-python/setuptools
|
||||
dev-util/boost-build
|
||||
|
||||
Loading…
x
Reference in New Issue
Block a user