[gentoo-commits] repo/proj/guru:master commit in: .github/workflows/, scripts/

[gentoo-commits] repo/proj/guru:master commit in: .github/workflows/, scripts/

[Andrew Ammerlaan]

commit:     292e03dc22ddc1d5a3bf143d311344f8cc0d9f75
Author:     Andrew Ammerlaan <andrewammerlaan <AT> riseup <DOT> net>
AuthorDate: Fri Apr  2 07:16:15 2021 +0000
Commit:     Andrew Ammerlaan <andrewammerlaan <AT> riseup <DOT> net>
CommitDate: Fri Apr  2 09:52:30 2021 +0000
URL:        https://gitweb.gentoo.org/repo/proj/guru.git/commit/?id=292e03dc

.github/workflows/repoman.yml: Use script to auto run the latest rm

By using a seperate script instead of running everything in the yml
file, we gain the ability to use and manipulate variables. This
means that we can now automatically run the latest version of
repoman, which should make this more hands-off by removing the
need to update this every now and then.

Signed-off-by: Andrew Ammerlaan <andrewammerlaan <AT> riseup.net>

 .github/workflows/pkgcheck.yml   |  4 +---
 .github/workflows/repoman.yml    | 15 ++-------------
 scripts/check-duplicates.sh      |  1 -
 scripts/setup-and-run-repoman.sh | 30 ++++++++++++++++++++++++++++++
 4 files changed, 33 insertions(+), 17 deletions(-)

diff --git a/.github/workflows/pkgcheck.yml b/.github/workflows/pkgcheck.yml
index 048f17c5f..e98762769 100644
--- a/.github/workflows/pkgcheck.yml
+++ b/.github/workflows/pkgcheck.yml
@@ -10,9 +10,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 8eb8668ad..b229afc94 100644
--- a/.github/workflows/repoman.yml
+++ b/.github/workflows/repoman.yml
@@ -11,17 +11,6 @@ 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.12.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
@@ -29,6 +18,6 @@ jobs:
         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
+    - name: Setup and run Repoman
       run: |
-        python3 portage-portage-3.0.12/repoman/bin/repoman full -dx
+        ./scripts/setup-and-run-repoman.sh

diff --git a/scripts/check-duplicates.sh b/scripts/check-duplicates.sh
index 8c6743bbd..ddd63fa68 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=(

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

[gentoo-commits] repo/proj/guru:master commit in: .github/workflows/, scripts/

[Florian Schmaus]

commit:     520142709533d575685dbabfb3882a5a260ca441
Author:     Anna (cybertailor) Vyalkova <cyber+gentoo <AT> sysrq <DOT> in>
AuthorDate: Tue Jun 27 07:53:22 2023 +0000
Commit:     Florian Schmaus <flow <AT> gentoo <DOT> org>
CommitDate: Tue Jun 27 07:55:18 2023 +0000
URL:        https://gitweb.gentoo.org/repo/proj/guru.git/commit/?id=52014270

.github/workflows: bump changed-files action

Signed-off-by: Anna (cybertailor) Vyalkova <cyber+gentoo <AT> sysrq.in>

 .github/workflows/emails.yml | 2 +-
 scripts/email-checker.py     | 2 +-
 2 files changed, 2 insertions(+), 2 deletions(-)

diff --git a/.github/workflows/emails.yml b/.github/workflows/emails.yml
index 67763cdb9..bff8c8fec 100644
--- a/.github/workflows/emails.yml
+++ b/.github/workflows/emails.yml
@@ -41,7 +41,7 @@ jobs:
 
       - name: Get changed files
         if: ${{ fromJSON(env.is_commit_valid) }}
-        uses: tj-actions/changed-files@v35
+        uses: tj-actions/changed-files@v37
         with:
           base_sha: ${{ env.last_successful_commit }}
           write_output_files: true

diff --git a/scripts/email-checker.py b/scripts/email-checker.py
index aa23550e5..edc528a37 100755
--- a/scripts/email-checker.py
+++ b/scripts/email-checker.py
@@ -47,7 +47,7 @@ def check_maintainers(maintainers: Iterator[Maintainer]) -> Iterator[Maintainer]
 
 
 if __name__ == '__main__':
-    files = [line.strip() for line in sys.stdin]
+    files = input().split()
     maintainers = set(read_all_maintainers(files))
     missing_maintainers = tuple(check_maintainers(maintainers))
     sys.exit(int(len(missing_maintainers) != 0))