* [gentoo-commits] proj/sci:master commit in: scripts/, .github/workflows/
@ 2021-02-17 19:39 Andrew Ammerlaan
0 siblings, 0 replies; 3+ messages in thread
From: Andrew Ammerlaan @ 2021-02-17 19:39 UTC (permalink / raw
To: gentoo-commits
commit: c8511a14fec6323b99300f881502ba49c9878b32
Author: Andrew Ammerlaan <andrewammerlaan <AT> riseup <DOT> net>
AuthorDate: Wed Feb 17 19:38:52 2021 +0000
Commit: Andrew Ammerlaan <andrewammerlaan <AT> riseup <DOT> net>
CommitDate: Wed Feb 17 19:38:52 2021 +0000
URL: https://gitweb.gentoo.org/proj/sci.git/commit/?id=c8511a14
.github/workflows/duplicates.yml: add script to check for duplicates
Signed-off-by: Andrew Ammerlaan <andrewammerlaan <AT> riseup.net>
.github/workflows/duplicates.yml | 25 +++++++++++++
scripts/check-duplicates.sh | 76 ++++++++++++++++++++++++++++++++++++++++
2 files changed, 101 insertions(+)
diff --git a/.github/workflows/duplicates.yml b/.github/workflows/duplicates.yml
new file mode 100644
index 000000000..2db452228
--- /dev/null
+++ b/.github/workflows/duplicates.yml
@@ -0,0 +1,25 @@
+name: duplicates
+
+on:
+ push:
+ branches: [ dev ]
+ pull_request:
+ branches: [ dev ]
+ schedule:
+ - cron: '0 0 * * *'
+
+jobs:
+ build:
+ runs-on: ubuntu-latest
+ steps:
+ - 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
+ - name: Check for duplicates
+ run: |
+ ./scripts/check-duplicates.sh
diff --git a/scripts/check-duplicates.sh b/scripts/check-duplicates.sh
new file mode 100755
index 000000000..8f6b89af7
--- /dev/null
+++ b/scripts/check-duplicates.sh
@@ -0,0 +1,76 @@
+#!/usr/bin/env bash
+# Maintainer: Andrew Ammerlaan <andrewammerlaan@riseup.net>
+#
+# This checks if packages in ::guru are also in ::gentoo
+#
+# Note that this is not going to be 100% accurate
+#
+#
+
+printf "\nChecking for duplicates....\n"
+
+gentoo_location="/var/db/repos/gentoo"
+guru_location="."
+
+gentoo_packs=$(find ${gentoo_location} -mindepth 2 -maxdepth 2 -printf "%P\n" | sort | grep -Ev "^(.git|.github|metadata|profiles|scripts)/")
+guru_packs=$(find ${guru_location} -mindepth 2 -maxdepth 2 -printf "%P\n" | sort | grep -Ev "^(.git|.github|metadata|profiles|scripts)/")
+
+pack_overrides="" pack_close_match_in_cat="" pack_close_match=""
+for guru_pack in ${guru_packs}; do
+ # separate category and packages
+ guru_pack_cat="${guru_pack%%/*}"
+ guru_pack_name="${guru_pack##*/}"
+
+ # convert all to lowercase
+ guru_pack_name="${guru_pack_name,,}"
+
+ # stip all numbers, dashes, underscores and pluses
+ guru_pack_name="${guru_pack_name/[0-9-_+]}"
+
+ for gentoo_pack in ${gentoo_packs}; do
+ # separate category and packages
+ gentoo_pack_cat="${gentoo_pack%%/*}"
+ gentoo_pack_name="${gentoo_pack##*/}"
+
+ # convert all to lowercase
+ gentoo_pack_name="${gentoo_pack_name,,}"
+
+ # stip all numbers, dashes, underscores and pluses
+ gentoo_pack_name="${gentoo_pack_name/[0-9-_+]}"
+
+ #TODO: check DESCRIPTION, HOMEPAGE and SRC_URI for close matches
+
+ if [[ "${gentoo_pack_name}" == "${guru_pack_name}" ]]; then
+ if [[ "${gentoo_pack_cat}" == "${guru_pack_cat}" ]]; then
+ if [[ "${gentoo_pack}" == "${guru_pack}" ]]; then
+ pack_overrides+="\t${guru_pack}::guru exact match of ${gentoo_pack}::gentoo\n"
+ else
+ pack_close_match_in_cat+="\t${guru_pack}::guru possible duplicate of ${gentoo_pack}::gentoo\n"
+ fi
+ else
+ pack_close_match+="\t${guru_pack}::guru possible duplicate of ${gentoo_pack}::gentoo\n"
+ fi
+ fi
+ done
+done
+
+if [ -n "${pack_close_match}" ]; then
+ printf "\nWARNING: The following packages closely match packages in the main Gentoo repository\n"
+ printf "${pack_close_match}"
+ printf "Please check these manually\n"
+fi
+
+if [ -n "${pack_close_match_in_cat}" ]; then
+ printf "\nWARNING: The following packages closely match packages in the main Gentoo repository in the same category\n"
+ printf "${pack_close_match_in_cat}"
+ printf "Please check these manually\n"
+fi
+
+if [ -n "${pack_overrides}" ]; then
+ printf "\nERROR: The following packages override packages in the main Gentoo repository\n"
+ printf "${pack_overrides}"
+ printf "Please remove these packages\n"
+ # do not exit fatally on ::science
+ # exit 1
+fi
+exit 0
^ permalink raw reply related [flat|nested] 3+ messages in thread* [gentoo-commits] proj/sci:master commit in: scripts/, .github/workflows/
@ 2021-04-02 10:05 Andrew Ammerlaan
0 siblings, 0 replies; 3+ messages in thread
From: Andrew Ammerlaan @ 2021-04-02 10:05 UTC (permalink / raw
To: gentoo-commits
commit: b626e67544b166813669b54835108a43ade9d2ac
Author: Andrew Ammerlaan <andrewammerlaan <AT> riseup <DOT> net>
AuthorDate: Fri Apr 2 10:04:44 2021 +0000
Commit: Andrew Ammerlaan <andrewammerlaan <AT> riseup <DOT> 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 <andrewammerlaan <AT> 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 <andrewammerlaan@riseup.net>
+#
+# 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 <andrewammerlaan@riseup.net>
+#
+# 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
^ permalink raw reply related [flat|nested] 3+ messages in thread* [gentoo-commits] proj/sci:master commit in: scripts/, .github/workflows/
@ 2022-05-02 12:14 Andrew Ammerlaan
0 siblings, 0 replies; 3+ messages in thread
From: Andrew Ammerlaan @ 2022-05-02 12:14 UTC (permalink / raw
To: gentoo-commits
commit: ec3f4cd6cbeddb065b35d3c1911b8141a4c6787f
Author: Andrew Ammerlaan <andrewammerlaan <AT> gentoo <DOT> org>
AuthorDate: Mon May 2 12:11:21 2022 +0000
Commit: Andrew Ammerlaan <andrewammerlaan <AT> gentoo <DOT> org>
CommitDate: Mon May 2 12:11:21 2022 +0000
URL: https://gitweb.gentoo.org/proj/sci.git/commit/?id=ec3f4cd6
Drop repoman CI in favour of pkgcheck
Signed-off-by: Andrew Ammerlaan <andrewammerlaan <AT> gentoo.org>
.github/workflows/repoman.yml | 22 ----------------------
scripts/setup-and-run-repoman.sh | 30 ------------------------------
2 files changed, 52 deletions(-)
diff --git a/.github/workflows/repoman.yml b/.github/workflows/repoman.yml
deleted file mode 100644
index afea3ae53..000000000
--- a/.github/workflows/repoman.yml
+++ /dev/null
@@ -1,22 +0,0 @@
-name: repoman
-
-on:
- push:
- branches: [ master ]
- pull_request:
- branches: [ master ]
- schedule:
- - cron: '0 0 * * *'
-
-jobs:
- build:
- runs-on: ubuntu-latest
- steps:
- - uses: actions/checkout@v2
- - name: Setup master gentoo repository
- run: |
- ./scripts/setup-master-gentoo.sh
- - name: Setup and run Repoman
- run: |
- ./scripts/setup-and-run-repoman.sh
-
diff --git a/scripts/setup-and-run-repoman.sh b/scripts/setup-and-run-repoman.sh
deleted file mode 100755
index e2e10c78e..000000000
--- a/scripts/setup-and-run-repoman.sh
+++ /dev/null
@@ -1,30 +0,0 @@
-#! /usr/bin/env bash
-# Maintainer: Andrew Ammerlaan <andrewammerlaan@gentoo.org>
-#
-# 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 portage | sort -uV )
-
-# 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
^ permalink raw reply related [flat|nested] 3+ messages in thread
end of thread, other threads:[~2022-05-02 12:14 UTC | newest]
Thread overview: 3+ messages (download: mbox.gz follow: Atom feed
-- links below jump to the message on this page --
2021-02-17 19:39 [gentoo-commits] proj/sci:master commit in: scripts/, .github/workflows/ Andrew Ammerlaan
-- strict thread matches above, loose matches on Subject: below --
2021-04-02 10:05 Andrew Ammerlaan
2022-05-02 12:14 Andrew Ammerlaan
This is a public inbox, see mirroring instructions
for how to clone and mirror all data and code used for this inbox