| 1 |
commit: e19e4730a005e718d8b8617c07bafca7e4e68346 |
| 2 |
Author: Andrew Ammerlaan <andrewammerlaan <AT> riseup <DOT> net> |
| 3 |
AuthorDate: Fri Apr 2 07:23:09 2021 +0000 |
| 4 |
Commit: Andrew Ammerlaan <andrewammerlaan <AT> riseup <DOT> net> |
| 5 |
CommitDate: Fri Apr 2 09:52:30 2021 +0000 |
| 6 |
URL: https://gitweb.gentoo.org/repo/proj/guru.git/commit/?id=e19e4730 |
| 7 |
|
| 8 |
.github/workflows/*: reduce code-duplication |
| 9 |
|
| 10 |
Reduce code duplication by moving the ::gentoo setup part |
| 11 |
into a seperate script. This way only one file has to be |
| 12 |
edited when e.g. updating the profile to a new version |
| 13 |
|
| 14 |
Signed-off-by: Andrew Ammerlaan <andrewammerlaan <AT> riseup.net> |
| 15 |
|
| 16 |
.github/workflows/duplicates.yml | 6 +----- |
| 17 |
.github/workflows/repoman.yml | 6 +----- |
| 18 |
scripts/setup-master-gentoo.sh | 10 ++++++++++ |
| 19 |
3 files changed, 12 insertions(+), 10 deletions(-) |
| 20 |
|
| 21 |
diff --git a/.github/workflows/duplicates.yml b/.github/workflows/duplicates.yml |
| 22 |
index d143d718e..6240adef0 100644 |
| 23 |
--- a/.github/workflows/duplicates.yml |
| 24 |
+++ b/.github/workflows/duplicates.yml |
| 25 |
@@ -13,11 +13,7 @@ jobs: |
| 26 |
- uses: actions/checkout@v2 |
| 27 |
- name: Setup master gentoo repository |
| 28 |
run: | |
| 29 |
- sudo mkdir -p /var/db/repos/gentoo /etc/portage /var/cache/distfiles |
| 30 |
- wget -qO - "https://github.com/gentoo-mirror/gentoo/archive/master.tar.gz" | sudo tar xz -C /var/db/repos/gentoo --strip-components=1 |
| 31 |
- sudo wget "https://www.gentoo.org/dtd/metadata.dtd" -O /var/cache/distfiles/metadata.dtd |
| 32 |
- sudo wget "https://gitweb.gentoo.org/proj/portage.git/plain/cnf/repos.conf" -O /etc/portage/repos.conf |
| 33 |
- sudo ln -s /var/db/repos/gentoo/profiles/default/linux/amd64/17.1 /etc/portage/make.profile |
| 34 |
+ ./scripts/setup-master-gentoo.sh |
| 35 |
- name: Check for duplicates |
| 36 |
run: | |
| 37 |
./scripts/check-duplicates.sh |
| 38 |
|
| 39 |
diff --git a/.github/workflows/repoman.yml b/.github/workflows/repoman.yml |
| 40 |
index b229afc94..fa9cebb6f 100644 |
| 41 |
--- a/.github/workflows/repoman.yml |
| 42 |
+++ b/.github/workflows/repoman.yml |
| 43 |
@@ -13,11 +13,7 @@ jobs: |
| 44 |
- uses: actions/checkout@v2 |
| 45 |
- name: Setup master gentoo repository |
| 46 |
run: | |
| 47 |
- sudo mkdir -p /var/db/repos/gentoo /etc/portage /var/cache/distfiles |
| 48 |
- wget -qO - "https://github.com/gentoo-mirror/gentoo/archive/master.tar.gz" | sudo tar xz -C /var/db/repos/gentoo --strip-components=1 |
| 49 |
- sudo wget "https://www.gentoo.org/dtd/metadata.dtd" -O /var/cache/distfiles/metadata.dtd |
| 50 |
- sudo wget "https://gitweb.gentoo.org/proj/portage.git/plain/cnf/repos.conf" -O /etc/portage/repos.conf |
| 51 |
- sudo ln -s /var/db/repos/gentoo/profiles/default/linux/amd64/17.1 /etc/portage/make.profile |
| 52 |
+ ./scripts/setup-master-gentoo.sh |
| 53 |
- name: Setup and run Repoman |
| 54 |
run: | |
| 55 |
./scripts/setup-and-run-repoman.sh |
| 56 |
|
| 57 |
diff --git a/scripts/setup-master-gentoo.sh b/scripts/setup-master-gentoo.sh |
| 58 |
new file mode 100755 |
| 59 |
index 000000000..a2939721a |
| 60 |
--- /dev/null |
| 61 |
+++ b/scripts/setup-master-gentoo.sh |
| 62 |
@@ -0,0 +1,10 @@ |
| 63 |
+#! /usr/bin/env bash |
| 64 |
+# Maintainer: Andrew Ammerlaan <andrewammerlaan@××××××.net> |
| 65 |
+# |
| 66 |
+# Fetch and setup the latest ::gentoo |
| 67 |
+ |
| 68 |
+sudo mkdir -p /var/db/repos/gentoo /etc/portage /var/cache/distfiles |
| 69 |
+wget -qO - "https://github.com/gentoo-mirror/gentoo/archive/master.tar.gz" | sudo tar xz -C /var/db/repos/gentoo --strip-components=1 |
| 70 |
+sudo wget "https://www.gentoo.org/dtd/metadata.dtd" -O /var/cache/distfiles/metadata.dtd |
| 71 |
+sudo wget "https://gitweb.gentoo.org/proj/portage.git/plain/cnf/repos.conf" -O /etc/portage/repos.conf |
| 72 |
+sudo ln -s /var/db/repos/gentoo/profiles/default/linux/amd64/17.1 /etc/portage/make.profile |
Archives