public inbox for gentoo-commits@lists.gentoo.org
 help / color / mirror / Atom feed
From: "Andrew Ammerlaan" <andrewammerlaan@riseup.net>
To: gentoo-commits@lists.gentoo.org
Subject: [gentoo-commits] repo/proj/guru:master commit in: scripts/, .github/workflows/
Date: Fri,  2 Apr 2021 09:54:11 +0000 (UTC)	[thread overview]
Message-ID: <1617357150.e19e4730a005e718d8b8617c07bafca7e4e68346.andrewammerlaan@gentoo> (raw)

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


WARNING: multiple messages have this Message-ID (diff)
From: "Andrew Ammerlaan" <andrewammerlaan@riseup.net>
To: gentoo-commits@lists.gentoo.org
Subject: [gentoo-commits] repo/proj/guru:dev commit in: scripts/, .github/workflows/
Date: Fri,  2 Apr 2021 09:52:34 +0000 (UTC)	[thread overview]
Message-ID: <1617357150.e19e4730a005e718d8b8617c07bafca7e4e68346.andrewammerlaan@gentoo> (raw)
Message-ID: <20210402095234.ImlLaU69oK_pSbefP3G45UY0-cmdMqYptHmyhUnPpnM@z> (raw)

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


             reply	other threads:[~2021-04-02  9:54 UTC|newest]

Thread overview: 3+ messages / expand[flat|nested]  mbox.gz  Atom feed  top
2021-04-02  9:54 Andrew Ammerlaan [this message]
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 --
2022-04-06 19:43 [gentoo-commits] repo/proj/guru:master " Michał Górny

Reply instructions:

You may reply publicly to this message via plain-text email
using any one of the following methods:

* Save the following mbox file, import it into your mail client,
  and reply-to-all from there: mbox

  Avoid top-posting and favor interleaved quoting:
  https://en.wikipedia.org/wiki/Posting_style#Interleaved_style

* Reply using the --to, --cc, and --in-reply-to
  switches of git-send-email(1):

  git send-email \
    --in-reply-to=1617357150.e19e4730a005e718d8b8617c07bafca7e4e68346.andrewammerlaan@gentoo \
    --to=andrewammerlaan@riseup.net \
    --cc=gentoo-commits@lists.gentoo.org \
    --cc=gentoo-dev@lists.gentoo.org \
    /path/to/YOUR_REPLY

  https://kernel.org/pub/software/scm/git/docs/git-send-email.html

* If your mail client supports setting the In-Reply-To header
  via mailto: links, try the mailto: link
Be sure your reply has a Subject: header at the top and a blank line before the message body.
This is a public inbox, see mirroring instructions
for how to clone and mirror all data and code used for this inbox