From mboxrd@z Thu Jan 1 00:00:00 1970 Return-Path: Received: from lists.gentoo.org (pigeon.gentoo.org [208.92.234.80]) (using TLSv1.2 with cipher ECDHE-RSA-AES256-GCM-SHA384 (256/256 bits)) (No client certificate requested) by finch.gentoo.org (Postfix) with ESMTPS id D90F71382C5 for ; Fri, 2 Apr 2021 09:54:15 +0000 (UTC) Received: from pigeon.gentoo.org (localhost [127.0.0.1]) by pigeon.gentoo.org (Postfix) with SMTP id EB6B9E09C9; Fri, 2 Apr 2021 09:54:14 +0000 (UTC) Received: from smtp.gentoo.org (smtp.gentoo.org [140.211.166.183]) (using TLSv1.2 with cipher ECDHE-RSA-AES128-GCM-SHA256 (128/128 bits)) (No client certificate requested) by pigeon.gentoo.org (Postfix) with ESMTPS id D1C47E09C9 for ; Fri, 2 Apr 2021 09:54:14 +0000 (UTC) Received: from oystercatcher.gentoo.org (unknown [IPv6:2a01:4f8:202:4333:225:90ff:fed9:fc84]) (using TLSv1.2 with cipher ECDHE-RSA-AES128-GCM-SHA256 (128/128 bits)) (No client certificate requested) by smtp.gentoo.org (Postfix) with ESMTPS id C0F013407E6 for ; Fri, 2 Apr 2021 09:54:12 +0000 (UTC) Received: from localhost.localdomain (localhost [IPv6:::1]) by oystercatcher.gentoo.org (Postfix) with ESMTP id 7B60963B for ; Fri, 2 Apr 2021 09:54:11 +0000 (UTC) From: "Andrew Ammerlaan" To: gentoo-commits@lists.gentoo.org Content-Transfer-Encoding: 8bit Content-type: text/plain; charset=UTF-8 Reply-To: gentoo-dev@lists.gentoo.org, "Andrew Ammerlaan" Message-ID: <1617357150.e19e4730a005e718d8b8617c07bafca7e4e68346.andrewammerlaan@gentoo> Subject: [gentoo-commits] repo/proj/guru:master commit in: scripts/, .github/workflows/ X-VCS-Repository: repo/proj/guru X-VCS-Files: .github/workflows/duplicates.yml .github/workflows/repoman.yml scripts/setup-master-gentoo.sh X-VCS-Directories: .github/workflows/ scripts/ X-VCS-Committer: andrewammerlaan X-VCS-Committer-Name: Andrew Ammerlaan X-VCS-Revision: e19e4730a005e718d8b8617c07bafca7e4e68346 X-VCS-Branch: master Date: Fri, 2 Apr 2021 09:54:11 +0000 (UTC) Precedence: bulk List-Post: List-Help: List-Unsubscribe: List-Subscribe: List-Id: Gentoo Linux mail X-BeenThere: gentoo-commits@lists.gentoo.org X-Auto-Response-Suppress: DR, RN, NRN, OOF, AutoReply X-Archives-Salt: e68b05c3-adc1-42d5-bfb6-6cfe3609d8c1 X-Archives-Hash: 2f93ff278f2b00f008e79a9d7460cc07 commit: e19e4730a005e718d8b8617c07bafca7e4e68346 Author: Andrew Ammerlaan riseup net> AuthorDate: Fri Apr 2 07:23:09 2021 +0000 Commit: Andrew Ammerlaan riseup 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 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 +# +# 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 From mboxrd@z Thu Jan 1 00:00:00 1970 Return-Path: Received: from lists.gentoo.org (pigeon.gentoo.org [208.92.234.80]) (using TLSv1.2 with cipher ECDHE-RSA-AES256-GCM-SHA384 (256/256 bits)) (No client certificate requested) by finch.gentoo.org (Postfix) with ESMTPS id 3EDA713835A for ; Fri, 2 Apr 2021 09:52:38 +0000 (UTC) Received: from pigeon.gentoo.org (localhost [127.0.0.1]) by pigeon.gentoo.org (Postfix) with SMTP id 543D0E093A; Fri, 2 Apr 2021 09:52:37 +0000 (UTC) Received: from smtp.gentoo.org (smtp.gentoo.org [140.211.166.183]) (using TLSv1.2 with cipher ECDHE-RSA-AES128-GCM-SHA256 (128/128 bits)) (No client certificate requested) by pigeon.gentoo.org (Postfix) with ESMTPS id 3A85BE098F for ; Fri, 2 Apr 2021 09:52:37 +0000 (UTC) Received: from oystercatcher.gentoo.org (oystercatcher.gentoo.org [148.251.78.52]) (using TLSv1.2 with cipher ECDHE-RSA-AES128-GCM-SHA256 (128/128 bits)) (No client certificate requested) by smtp.gentoo.org (Postfix) with ESMTPS id B8B99340CC8 for ; Fri, 2 Apr 2021 09:52:35 +0000 (UTC) Received: from localhost.localdomain (localhost [IPv6:::1]) by oystercatcher.gentoo.org (Postfix) with ESMTP id 21587636 for ; Fri, 2 Apr 2021 09:52:34 +0000 (UTC) From: "Andrew Ammerlaan" To: gentoo-commits@lists.gentoo.org Content-Transfer-Encoding: 8bit Content-type: text/plain; charset=UTF-8 Reply-To: gentoo-dev@lists.gentoo.org, "Andrew Ammerlaan" Message-ID: <1617357150.e19e4730a005e718d8b8617c07bafca7e4e68346.andrewammerlaan@gentoo> Subject: [gentoo-commits] repo/proj/guru:dev commit in: scripts/, .github/workflows/ X-VCS-Repository: repo/proj/guru X-VCS-Files: .github/workflows/duplicates.yml .github/workflows/repoman.yml scripts/setup-master-gentoo.sh X-VCS-Directories: .github/workflows/ scripts/ X-VCS-Committer: andrewammerlaan X-VCS-Committer-Name: Andrew Ammerlaan X-VCS-Revision: e19e4730a005e718d8b8617c07bafca7e4e68346 X-VCS-Branch: dev Date: Fri, 2 Apr 2021 09:52:34 +0000 (UTC) Precedence: bulk List-Post: List-Help: List-Unsubscribe: List-Subscribe: List-Id: Gentoo Linux mail X-BeenThere: gentoo-commits@lists.gentoo.org X-Auto-Response-Suppress: DR, RN, NRN, OOF, AutoReply X-Archives-Salt: aa51c767-e4b1-4cd0-b8d4-baa4ba55ce63 X-Archives-Hash: ea7d82b23c9701442936d6f398bf2ae4 Message-ID: <20210402095234.ImlLaU69oK_pSbefP3G45UY0-cmdMqYptHmyhUnPpnM@z> commit: e19e4730a005e718d8b8617c07bafca7e4e68346 Author: Andrew Ammerlaan riseup net> AuthorDate: Fri Apr 2 07:23:09 2021 +0000 Commit: Andrew Ammerlaan riseup 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 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 +# +# 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