public inbox for gentoo-commits@lists.gentoo.org
 help / color / mirror / Atom feed
* [gentoo-commits] repo/proj/guru:dev commit in: scripts/, .github/workflows/
@ 2021-02-17 15:18 Andrew Ammerlaan
  0 siblings, 0 replies; 6+ messages in thread
From: Andrew Ammerlaan @ 2021-02-17 15:18 UTC (permalink / raw
  To: gentoo-commits

commit:     16f5492d54322ef258f94fdb755269378a163098
Author:     Andrew Ammerlaan <andrewammerlaan <AT> riseup <DOT> net>
AuthorDate: Wed Feb 17 15:17:36 2021 +0000
Commit:     Andrew Ammerlaan <andrewammerlaan <AT> riseup <DOT> net>
CommitDate: Wed Feb 17 15:17:36 2021 +0000
URL:        https://gitweb.gentoo.org/repo/proj/guru.git/commit/?id=16f5492d

.github/workflows/duplicates.yml: add script to check for potential duplicates

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

 .github/workflows/duplicates.yml | 23 ++++++++++++
 scripts/check-duplicates.sh      | 75 ++++++++++++++++++++++++++++++++++++++++
 2 files changed, 98 insertions(+)

diff --git a/.github/workflows/duplicates.yml b/.github/workflows/duplicates.yml
new file mode 100644
index 00000000..9c0c2532
--- /dev/null
+++ b/.github/workflows/duplicates.yml
@@ -0,0 +1,23 @@
+name: repoman
+
+on:
+  push:
+    branches: [ dev ]
+  pull_request:
+    branches: [ dev ]
+
+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 00000000..14965961
--- /dev/null
+++ b/scripts/check-duplicates.sh
@@ -0,0 +1,75 @@
+#!/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"
+	exit 1
+fi
+exit 0


^ permalink raw reply related	[flat|nested] 6+ messages in thread
* [gentoo-commits] repo/proj/guru:dev commit in: scripts/, .github/workflows/
@ 2021-02-17 15:22 Andrew Ammerlaan
  0 siblings, 0 replies; 6+ messages in thread
From: Andrew Ammerlaan @ 2021-02-17 15:22 UTC (permalink / raw
  To: gentoo-commits

commit:     1f3eb4b89254b0b081b38c2e42a5d4dd3350c465
Author:     Andrew Ammerlaan <andrewammerlaan <AT> riseup <DOT> net>
AuthorDate: Wed Feb 17 15:21:09 2021 +0000
Commit:     Andrew Ammerlaan <andrewammerlaan <AT> riseup <DOT> net>
CommitDate: Wed Feb 17 15:22:02 2021 +0000
URL:        https://gitweb.gentoo.org/repo/proj/guru.git/commit/?id=1f3eb4b8

scripts/check-duplicates.sh: run in correct dir

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

 .github/workflows/duplicates.yml | 2 +-
 scripts/check-duplicates.sh      | 2 +-
 2 files changed, 2 insertions(+), 2 deletions(-)

diff --git a/.github/workflows/duplicates.yml b/.github/workflows/duplicates.yml
index 9c0c2532..d143d718 100644
--- a/.github/workflows/duplicates.yml
+++ b/.github/workflows/duplicates.yml
@@ -1,4 +1,4 @@
-name: repoman
+name: duplicates
 
 on:
   push:

diff --git a/scripts/check-duplicates.sh b/scripts/check-duplicates.sh
index 14965961..66d1bb9a 100755
--- a/scripts/check-duplicates.sh
+++ b/scripts/check-duplicates.sh
@@ -10,7 +10,7 @@
 printf "\nChecking for duplicates....\n"
 
 gentoo_location="/var/db/repos/gentoo"
-guru_location="../"
+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)/")


^ permalink raw reply related	[flat|nested] 6+ messages in thread
* [gentoo-commits] repo/proj/guru:dev commit in: scripts/, .github/workflows/
  2021-04-02  9:54 [gentoo-commits] repo/proj/guru:master commit in: .github/workflows/, scripts/ Andrew Ammerlaan
@ 2021-04-02  9:52 ` Andrew Ammerlaan
  0 siblings, 0 replies; 6+ messages in thread
From: Andrew Ammerlaan @ 2021-04-02  9:52 UTC (permalink / raw
  To: gentoo-commits

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


^ permalink raw reply related	[flat|nested] 6+ messages in thread
* [gentoo-commits] repo/proj/guru:dev commit in: scripts/, .github/workflows/
  2021-04-02  9:54 [gentoo-commits] repo/proj/guru:master " Andrew Ammerlaan
@ 2021-04-02  9:52 ` Andrew Ammerlaan
  0 siblings, 0 replies; 6+ messages in thread
From: Andrew Ammerlaan @ 2021-04-02  9:52 UTC (permalink / raw
  To: gentoo-commits

commit:     e19e4730a005e718d8b8617c07bafca7e4e68346
Author:     Andrew Ammerlaan <andrewammerlaan <AT> riseup <DOT> net>
AuthorDate: Fri Apr  2 07:23:09 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=e19e4730

.github/workflows/*: reduce code-duplication

Reduce code duplication by moving the ::gentoo setup part
into a seperate script. This way only one file has to be
edited when e.g. updating the profile to a new version

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

 .github/workflows/duplicates.yml |  6 +-----
 .github/workflows/repoman.yml    |  6 +-----
 scripts/setup-master-gentoo.sh   | 10 ++++++++++
 3 files changed, 12 insertions(+), 10 deletions(-)

diff --git a/.github/workflows/duplicates.yml b/.github/workflows/duplicates.yml
index d143d718e..6240adef0 100644
--- a/.github/workflows/duplicates.yml
+++ b/.github/workflows/duplicates.yml
@@ -13,11 +13,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/repoman.yml b/.github/workflows/repoman.yml
index b229afc94..fa9cebb6f 100644
--- a/.github/workflows/repoman.yml
+++ b/.github/workflows/repoman.yml
@@ -13,11 +13,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: Setup and run Repoman
       run: |
         ./scripts/setup-and-run-repoman.sh

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] 6+ messages in thread
* [gentoo-commits] repo/proj/guru:master commit in: .github/workflows/, scripts/
@ 2021-04-02  9:54 Andrew Ammerlaan
  2021-04-02  9:52 ` [gentoo-commits] repo/proj/guru:dev commit in: scripts/, .github/workflows/ Andrew Ammerlaan
  0 siblings, 1 reply; 6+ messages in thread
From: Andrew Ammerlaan @ 2021-04-02  9:54 UTC (permalink / raw
  To: gentoo-commits

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


^ permalink raw reply related	[flat|nested] 6+ messages in thread
* [gentoo-commits] repo/proj/guru:dev commit in: scripts/, .github/workflows/
@ 2023-02-02  6:15 Anna Vyalkova
  0 siblings, 0 replies; 6+ messages in thread
From: Anna Vyalkova @ 2023-02-02  6:15 UTC (permalink / raw
  To: gentoo-commits

commit:     87804196df681b345a2ba1b5d422447fc26a0852
Author:     Anna (cybertailor) Vyalkova <cyber+gentoo <AT> sysrq <DOT> in>
AuthorDate: Thu Feb  2 05:54:30 2023 +0000
Commit:     Anna Vyalkova <cyber+gentoo <AT> sysrq <DOT> in>
CommitDate: Thu Feb  2 06:14:18 2023 +0000
URL:        https://gitweb.gentoo.org/repo/proj/guru.git/commit/?id=87804196

.github/workflows: update actions

* bump actions
* fix indentation and other issues detected by yamllint

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

 .github/workflows/duplicates.yml | 20 ++++++------
 .github/workflows/emails.yml     | 66 +++++++++++++++++++++-------------------
 .github/workflows/pkgcheck.yml   | 16 +++++-----
 scripts/email-checker.py         | 10 +++---
 4 files changed, 59 insertions(+), 53 deletions(-)

diff --git a/.github/workflows/duplicates.yml b/.github/workflows/duplicates.yml
index 6240adef0..3c12675ac 100644
--- a/.github/workflows/duplicates.yml
+++ b/.github/workflows/duplicates.yml
@@ -1,19 +1,21 @@
+---
+
 name: duplicates
 
 on:
   push:
-    branches: [ dev ]
+    branches: [dev]
   pull_request:
-    branches: [ dev ]
+    branches: [dev]
 
 jobs:
   build:
     runs-on: ubuntu-latest
     steps:
-    - uses: actions/checkout@v2
-    - name: Setup master gentoo repository
-      run: |
-        ./scripts/setup-master-gentoo.sh
-    - name: Check for duplicates
-      run: |
-        ./scripts/check-duplicates.sh
+      - uses: actions/checkout@v3
+      - name: Setup master gentoo repository
+        run: |
+          ./scripts/setup-master-gentoo.sh
+      - name: Check for duplicates
+        run: |
+          ./scripts/check-duplicates.sh

diff --git a/.github/workflows/emails.yml b/.github/workflows/emails.yml
index 966000a14..12f70387f 100644
--- a/.github/workflows/emails.yml
+++ b/.github/workflows/emails.yml
@@ -1,43 +1,45 @@
+---
+
 name: emails
 
 on:
   push:
-    branches: [ dev ]
+    branches: [dev]
   pull_request:
-    branches: [ dev ]
+    branches: [dev]
 
 jobs:
   bugzilla:
     runs-on: ubuntu-latest
     steps:
 
-    - uses: nrwl/last-successful-commit-action@v1
-      id: last_successful_commit
-      with:
-        branch: 'dev'
-        workflow_id: 'emails.yml'
-        github_token: ${{ secrets.GITHUB_TOKEN }}
-
-    - name: Checkout compare ref
-      uses: actions/checkout@v2
-      with:
-        ref: ${{ steps.last_successful_commit.outputs.commit_hash }}
-
-    - name: Checkout code
-      uses: actions/checkout@v2
-
-    - uses: actions/setup-python@v3
-      with:
-        python-version: '3.x'
-
-    - name: Get changed files
-      id: changed-files
-      uses: tj-actions/changed-files@v18.6
-      with:
-        base_sha: ${{ steps.last_successful_commit.outputs.commit_hash }}
-        files: |
-          **/metadata.xml
-
-    - name: Check Emails against bugzilla
-      run: |
-        python ./scripts/email-checker.py ${{ steps.changed-files.outputs.all_changed_files }}
+      - uses: nrwl/last-successful-commit-action@v1
+        id: last_successful_commit
+        with:
+          branch: 'dev'
+          workflow_id: 'emails.yml'
+          github_token: ${{ secrets.GITHUB_TOKEN }}
+
+      - name: Checkout compare ref
+        uses: actions/checkout@v3
+        with:
+          ref: ${{ steps.last_successful_commit.outputs.commit_hash }}
+
+      - name: Checkout code
+        uses: actions/checkout@v3
+
+      - uses: actions/setup-python@v3
+        with:
+          python-version: '3.x'
+
+      - name: Get changed files
+        id: changed-files
+        uses: tj-actions/changed-files@v18.6
+        with:
+          base_sha: ${{ steps.last_successful_commit.outputs.commit_hash }}
+          files: |
+            **/metadata.xml
+
+      - name: Check Emails against bugzilla
+        run: |
+          python ./scripts/email-checker.py ${{ steps.changed-files.outputs.all_changed_files }}

diff --git a/.github/workflows/pkgcheck.yml b/.github/workflows/pkgcheck.yml
index 30afdc58c..be7ad363d 100644
--- a/.github/workflows/pkgcheck.yml
+++ b/.github/workflows/pkgcheck.yml
@@ -1,17 +1,19 @@
+---
+
 name: pkgcheck
 
 on:
   push:
-    branches: [ dev ]
+    branches: [dev]
   pull_request:
-    branches: [ dev ]
+    branches: [dev]
 
 jobs:
   build:
     runs-on: ubuntu-latest
     steps:
-    - uses: actions/checkout@v2
-    - name: Run pkgcheck
-      uses: pkgcore/pkgcheck-action@v1
-      with:
-        args: --keywords=-RedundantVersion,-NonsolvableDepsInDev
+      - uses: actions/checkout@v3
+      - name: Run pkgcheck
+        uses: pkgcore/pkgcheck-action@v1
+        with:
+          args: --keywords=-RedundantVersion,-NonsolvableDepsInDev

diff --git a/scripts/email-checker.py b/scripts/email-checker.py
index 2b6e93a1d..e0e477913 100755
--- a/scripts/email-checker.py
+++ b/scripts/email-checker.py
@@ -1,12 +1,12 @@
 #!/usr/bin/env python3
 
-from http.client import HTTPSConnection
-import json
 import sys
-from typing import Dict, Iterator, NamedTuple
-from urllib.parse import quote_plus
 import xml.etree.ElementTree as ET
 
+from http.client import HTTPSConnection
+from typing import Iterator, NamedTuple
+from urllib.parse import quote_plus
+
 
 class Maintainer(NamedTuple):
     name: str
@@ -18,7 +18,7 @@ class Maintainer(NamedTuple):
             resp = client.getresponse()
             resp.read()
             return resp.status == 200
-        except:
+        except Exception:
             return False
 
 


^ permalink raw reply related	[flat|nested] 6+ messages in thread
end of thread, other threads:[~2023-02-02  6:15 UTC | newest]

Thread overview: 6+ messages (download: mbox.gz follow: Atom feed
-- links below jump to the message on this page --
2021-04-02  9:54 [gentoo-commits] repo/proj/guru:master commit in: .github/workflows/, scripts/ Andrew Ammerlaan
2021-04-02  9:52 ` [gentoo-commits] repo/proj/guru:dev commit in: scripts/, .github/workflows/ Andrew Ammerlaan
  -- strict thread matches above, loose matches on Subject: below --
2023-02-02  6:15 Anna Vyalkova
2021-04-02  9:54 [gentoo-commits] repo/proj/guru:master " Andrew Ammerlaan
2021-04-02  9:52 ` [gentoo-commits] repo/proj/guru:dev " Andrew Ammerlaan
2021-02-17 15:22 Andrew Ammerlaan
2021-02-17 15:18 Andrew Ammerlaan

This is a public inbox, see mirroring instructions
for how to clone and mirror all data and code used for this inbox