From mboxrd@z Thu Jan 1 00:00:00 1970 Return-Path: Received: from lists.gentoo.org (pigeon.gentoo.org [208.92.234.80]) (using TLSv1.2 with cipher ECDHE-RSA-AES256-GCM-SHA384 (256/256 bits)) (No client certificate requested) by finch.gentoo.org (Postfix) with ESMTPS id 2AF671382C5 for ; Fri, 2 Apr 2021 10:05:49 +0000 (UTC) Received: from pigeon.gentoo.org (localhost [127.0.0.1]) by pigeon.gentoo.org (Postfix) with SMTP id 72FFEE09A4; Fri, 2 Apr 2021 10:05:48 +0000 (UTC) Received: from smtp.gentoo.org (dev.gentoo.org [IPv6:2001:470:ea4a:1:5054:ff:fec7:86e4]) (using TLSv1.2 with cipher ECDHE-RSA-AES128-GCM-SHA256 (128/128 bits)) (No client certificate requested) by pigeon.gentoo.org (Postfix) with ESMTPS id 4EFF4E09A4 for ; Fri, 2 Apr 2021 10:05:48 +0000 (UTC) Received: from oystercatcher.gentoo.org (unknown [IPv6:2a01:4f8:202:4333:225:90ff:fed9:fc84]) (using TLSv1.2 with cipher ECDHE-RSA-AES128-GCM-SHA256 (128/128 bits)) (No client certificate requested) by smtp.gentoo.org (Postfix) with ESMTPS id 48DD6335D46 for ; Fri, 2 Apr 2021 10:05:47 +0000 (UTC) Received: from localhost.localdomain (localhost [IPv6:::1]) by oystercatcher.gentoo.org (Postfix) with ESMTP id 069FD4A5 for ; Fri, 2 Apr 2021 10:05:46 +0000 (UTC) From: "Andrew Ammerlaan" To: gentoo-commits@lists.gentoo.org Content-Transfer-Encoding: 8bit Content-type: text/plain; charset=UTF-8 Reply-To: gentoo-dev@lists.gentoo.org, "Andrew Ammerlaan" Message-ID: <1617357884.b626e67544b166813669b54835108a43ade9d2ac.andrewammerlaan@gentoo> Subject: [gentoo-commits] proj/sci:master commit in: scripts/, .github/workflows/ X-VCS-Repository: proj/sci X-VCS-Files: .github/workflows/duplicates.yml .github/workflows/pkgcheck.yml .github/workflows/repoman.yml scripts/check-duplicates.sh scripts/setup-and-run-repoman.sh scripts/setup-master-gentoo.sh X-VCS-Directories: .github/workflows/ scripts/ X-VCS-Committer: andrewammerlaan X-VCS-Committer-Name: Andrew Ammerlaan X-VCS-Revision: b626e67544b166813669b54835108a43ade9d2ac X-VCS-Branch: master Date: Fri, 2 Apr 2021 10:05:46 +0000 (UTC) Precedence: bulk List-Post: List-Help: List-Unsubscribe: List-Subscribe: List-Id: Gentoo Linux mail X-BeenThere: gentoo-commits@lists.gentoo.org X-Auto-Response-Suppress: DR, RN, NRN, OOF, AutoReply X-Archives-Salt: 3e236f4b-ffc7-445f-a172-acd5ddceff16 X-Archives-Hash: 0ba7fb1924947bec49014c448136b54a commit: b626e67544b166813669b54835108a43ade9d2ac Author: Andrew Ammerlaan riseup net> AuthorDate: Fri Apr 2 10:04:44 2021 +0000 Commit: Andrew Ammerlaan riseup net> CommitDate: Fri Apr 2 10:04:44 2021 +0000 URL: https://gitweb.gentoo.org/proj/sci.git/commit/?id=b626e675 .github/workflows: always use the latest version of repoman Signed-off-by: Andrew Ammerlaan riseup.net> .github/workflows/duplicates.yml | 6 +----- .github/workflows/pkgcheck.yml | 4 +--- .github/workflows/repoman.yml | 22 ++++------------------ scripts/check-duplicates.sh | 2 -- scripts/setup-and-run-repoman.sh | 30 ++++++++++++++++++++++++++++++ scripts/setup-master-gentoo.sh | 10 ++++++++++ 6 files changed, 46 insertions(+), 28 deletions(-) diff --git a/.github/workflows/duplicates.yml b/.github/workflows/duplicates.yml index 656d2d871..0a1f34a9d 100644 --- a/.github/workflows/duplicates.yml +++ b/.github/workflows/duplicates.yml @@ -15,11 +15,7 @@ jobs: - uses: actions/checkout@v2 - name: Setup master gentoo repository run: | - sudo mkdir -p /var/db/repos/gentoo /etc/portage /var/cache/distfiles - wget -qO - "https://github.com/gentoo-mirror/gentoo/archive/master.tar.gz" | sudo tar xz -C /var/db/repos/gentoo --strip-components=1 - sudo wget "https://www.gentoo.org/dtd/metadata.dtd" -O /var/cache/distfiles/metadata.dtd - sudo wget "https://gitweb.gentoo.org/proj/portage.git/plain/cnf/repos.conf" -O /etc/portage/repos.conf - sudo ln -s /var/db/repos/gentoo/profiles/default/linux/amd64/17.1 /etc/portage/make.profile + ./scripts/setup-master-gentoo.sh - name: Check for duplicates run: | ./scripts/check-duplicates.sh diff --git a/.github/workflows/pkgcheck.yml b/.github/workflows/pkgcheck.yml index 3a20016ac..e3abc3de6 100644 --- a/.github/workflows/pkgcheck.yml +++ b/.github/workflows/pkgcheck.yml @@ -12,9 +12,7 @@ jobs: build: runs-on: ubuntu-latest steps: - - name: Checkout code - uses: actions/checkout@v2 - + - uses: actions/checkout@v2 - name: Run pkgcheck uses: pkgcore/pkgcheck-action@v1 with: diff --git a/.github/workflows/repoman.yml b/.github/workflows/repoman.yml index a06a23b3b..afea3ae53 100644 --- a/.github/workflows/repoman.yml +++ b/.github/workflows/repoman.yml @@ -13,24 +13,10 @@ jobs: runs-on: ubuntu-latest steps: - uses: actions/checkout@v2 - - name: Set up Python 3.9 - uses: actions/setup-python@v2 - with: - python-version: 3.9 - - name: Setup repoman - run: | - python -m pip install --upgrade pip - pip install lxml pyyaml - wget -qO - "https://github.com/gentoo/portage/archive/portage-3.0.17.tar.gz" | tar xz - sudo groupadd -g 250 portage - sudo useradd -g portage -d /var/tmp/portage -s /bin/false -u 250 portage - name: Setup master gentoo repository run: | - sudo mkdir -p /var/db/repos/gentoo /etc/portage /var/cache/distfiles - wget -qO - "https://github.com/gentoo-mirror/gentoo/archive/master.tar.gz" | sudo tar xz -C /var/db/repos/gentoo --strip-components=1 - sudo wget "https://www.gentoo.org/dtd/metadata.dtd" -O /var/cache/distfiles/metadata.dtd - sudo wget "https://gitweb.gentoo.org/proj/portage.git/plain/cnf/repos.conf" -O /etc/portage/repos.conf - sudo ln -s /var/db/repos/gentoo/profiles/default/linux/amd64/17.1 /etc/portage/make.profile - - name: Test with repoman + ./scripts/setup-master-gentoo.sh + - name: Setup and run Repoman run: | - python3 portage-portage-3.0.17/repoman/bin/repoman full -dx + ./scripts/setup-and-run-repoman.sh + diff --git a/scripts/check-duplicates.sh b/scripts/check-duplicates.sh index d8e56463e..3f1c38329 100755 --- a/scripts/check-duplicates.sh +++ b/scripts/check-duplicates.sh @@ -4,7 +4,6 @@ # # This checks for potential and exact package matches within an overlay & ::gentoo # Note that this is not going to be 100% accurate -# GENTOO_DIR="/var/db/repos/gentoo" GENTOO_PACKAGES=( @@ -73,6 +72,5 @@ if [[ -n ${PKG_EXACT_MATCH} ]]; then printf "\nERROR: The following packages override packages in the main Gentoo repository:\n" printf "${PKG_EXACT_MATCH}" printf "Please remove these packages.\n" - # do not fatally exit # exit 1 fi diff --git a/scripts/setup-and-run-repoman.sh b/scripts/setup-and-run-repoman.sh new file mode 100755 index 000000000..f6607549d --- /dev/null +++ b/scripts/setup-and-run-repoman.sh @@ -0,0 +1,30 @@ +#! /usr/bin/env bash +# Maintainer: Andrew Ammerlaan +# +# This sets up repoman and runs the latest version +# +# TODO: Force repoman to output in colour + +### Setup prerequisites +python3 -m pip install --upgrade pip +pip install lxml pyyaml +sudo groupadd -g 250 portage +sudo useradd -g portage -d /var/tmp/portage -s /bin/false -u 250 portage + +### Sync the portage repository +git clone https://github.com/gentoo/portage.git +cd portage + +# Get all versions, and read into array +mapfile -t RM_VERSIONS < <( git tag | grep repoman | sort -u ) + +# Select latests version (last element in array) +RM_VERS="${RM_VERSIONS[-1]}" + +# Checkout this version +git checkout tags/${RM_VERS} -b ${RM_VERS} + +cd .. + +### Run repoman +python3 portage/repoman/bin/repoman -dx full diff --git a/scripts/setup-master-gentoo.sh b/scripts/setup-master-gentoo.sh new file mode 100755 index 000000000..a2939721a --- /dev/null +++ b/scripts/setup-master-gentoo.sh @@ -0,0 +1,10 @@ +#! /usr/bin/env bash +# Maintainer: Andrew Ammerlaan +# +# Fetch and setup the latest ::gentoo + +sudo mkdir -p /var/db/repos/gentoo /etc/portage /var/cache/distfiles +wget -qO - "https://github.com/gentoo-mirror/gentoo/archive/master.tar.gz" | sudo tar xz -C /var/db/repos/gentoo --strip-components=1 +sudo wget "https://www.gentoo.org/dtd/metadata.dtd" -O /var/cache/distfiles/metadata.dtd +sudo wget "https://gitweb.gentoo.org/proj/portage.git/plain/cnf/repos.conf" -O /etc/portage/repos.conf +sudo ln -s /var/db/repos/gentoo/profiles/default/linux/amd64/17.1 /etc/portage/make.profile