* [gentoo-commits] proj/pkgcore/pkgcheck:master commit in: testdata/data/repos/standalone/EapiCheck/DeprecatedEapi/, ...
@ 2025-02-07 20:37 Arthur Zamarin
0 siblings, 0 replies; only message in thread
From: Arthur Zamarin @ 2025-02-07 20:37 UTC (permalink / raw
To: gentoo-commits
commit: 97558276231cdac3a1b323bfbc2e216d4be3afe4
Author: Arthur Zamarin <arthurzam <AT> gentoo <DOT> org>
AuthorDate: Fri Feb 7 19:53:17 2025 +0000
Commit: Arthur Zamarin <arthurzam <AT> gentoo <DOT> org>
CommitDate: Fri Feb 7 20:37:03 2025 +0000
URL: https://gitweb.gentoo.org/proj/pkgcore/pkgcheck.git/commit/?id=97558276
testdata: fix patch files for mac os
Signed-off-by: Arthur Zamarin <arthurzam <AT> gentoo.org>
.github/workflows/test.yml | 6 ++++--
.../RepoProfilesCheck/UnknownCategoryDirs/fix.patch | 11 ++++++-----
.../RepoProfilesCheck/NonexistentProfilePath/fix.patch | 13 +++++++++----
.../RepoProfilesCheck/UnusedProfileDirs/fix.patch | 9 ++++++---
.../BadCommandsCheck/BannedEapiCommand/fix.patch | 2 +-
.../data/repos/standalone/EapiCheck/BannedEapi/fix.patch | 6 +++---
.../repos/standalone/EapiCheck/DeprecatedEapi/fix.patch | 6 +++---
.../standalone/LicenseCheck/InvalidLicense/fix.patch | 15 ++++++++-------
.../repos/standalone/PkgDirCheck/InvalidPN/fix.patch | 16 ----------------
.../data/repos/standalone/PkgDirCheck/InvalidPN/fix.sh | 2 ++
.../repos/standalone/PkgDirCheck/MismatchedPN/fix.patch | 16 ----------------
.../repos/standalone/PkgDirCheck/MismatchedPN/fix.sh | 2 ++
.../repos/standalone/SourcingCheck/InvalidEapi/fix.patch | 12 ++++++------
13 files changed, 50 insertions(+), 66 deletions(-)
diff --git a/.github/workflows/test.yml b/.github/workflows/test.yml
index cf0b5031..150ff0f0 100644
--- a/.github/workflows/test.yml
+++ b/.github/workflows/test.yml
@@ -44,9 +44,11 @@ jobs:
- name: Install macos deps
if: ${{ matrix.os == 'macos-latest' }}
run: |
- brew install bash gnu-sed
+ brew install bash gnu-sed gpatch
# enable gnu-sed usage as "sed"
- echo "/usr/local/opt/gnu-sed/libexec/gnubin" >> $GITHUB_PATH
+ echo "/opt/homebrew/opt/gnu-sed/libexec/gnubin" >> $GITHUB_PATH
+ # enable gpatch usage as "sed"
+ echo "/opt/homebrew/opt/gpatch/libexec/gnubin" >> $GITHUB_PATH
- name: Install non-python deps
if: ${{ matrix.os == 'ubuntu-latest' }}
diff --git a/testdata/data/repos/gentoo/RepoProfilesCheck/UnknownCategoryDirs/fix.patch b/testdata/data/repos/gentoo/RepoProfilesCheck/UnknownCategoryDirs/fix.patch
index db124175..1825814a 100644
--- a/testdata/data/repos/gentoo/RepoProfilesCheck/UnknownCategoryDirs/fix.patch
+++ b/testdata/data/repos/gentoo/RepoProfilesCheck/UnknownCategoryDirs/fix.patch
@@ -1,7 +1,8 @@
diff -Naur gentoo/profiles/categories fixed/profiles/categories
---- gentoo/profiles/categories 2019-08-26 11:54:09.183232467 -0600
-+++ fixed/profiles/categories 2019-08-26 11:55:49.101884403 -0600
-@@ -1,2 +1,3 @@
- CatMissingMetadataXml
- PackageMetadataXmlCheck
+--- gentoo/profiles/categories
++++ fixed/profiles/categories
+@@ -7,3 +7,4 @@ PkgDirCheck
+ UnstableOnlyCheck
+ UseFlagsWithoutEffectsCheck
+ nonexistent
+unknown
diff --git a/testdata/data/repos/profiledir/RepoProfilesCheck/NonexistentProfilePath/fix.patch b/testdata/data/repos/profiledir/RepoProfilesCheck/NonexistentProfilePath/fix.patch
index 18f1453b..ba207478 100644
--- a/testdata/data/repos/profiledir/RepoProfilesCheck/NonexistentProfilePath/fix.patch
+++ b/testdata/data/repos/profiledir/RepoProfilesCheck/NonexistentProfilePath/fix.patch
@@ -1,6 +1,11 @@
-diff -Naur standalone/profiles/profiles.desc fixed/profiles/profiles.desc
---- standalone/profiles/profiles.desc 2019-08-25 03:26:34.234884197 -0600
-+++ fixed/profiles/profiles.desc 2019-08-25 03:29:07.492884120 -0600
-@@ -1,2 +1 @@
+diff -Naur profiledir/profiles/profiles.desc fixed/profiles/profiles.desc
+--- profiledir/profiles/profiles.desc
++++ fixed/profiles/profiles.desc
+@@ -1,7 +1,6 @@
+ amd64 default
amd64 default stable
+ amd64 default/bad_parent dev
-amd64 nonexistent exp
+
+ amd64 unknown_pkgs exp
+ amd64 unknown_kwds exp
diff --git a/testdata/data/repos/profiledir/RepoProfilesCheck/UnusedProfileDirs/fix.patch b/testdata/data/repos/profiledir/RepoProfilesCheck/UnusedProfileDirs/fix.patch
index 0ebade26..294c18f4 100644
--- a/testdata/data/repos/profiledir/RepoProfilesCheck/UnusedProfileDirs/fix.patch
+++ b/testdata/data/repos/profiledir/RepoProfilesCheck/UnusedProfileDirs/fix.patch
@@ -1,7 +1,10 @@
diff -Naur profiledir/profiles/profiles.desc fixed/profiles/profiles.desc
---- profiledir/profiles/profiles.desc 2019-08-25 03:31:07.833669284 -0600
-+++ fixed/profiles/profiles.desc 2019-08-25 03:40:37.386386898 -0600
-@@ -1,2 +1,3 @@
+--- profiledir/profiles/profiles.desc
++++ fixed/profiles/profiles.desc
+@@ -1,5 +1,6 @@
+ amd64 default
amd64 default stable
+amd64 default/forgotten dev
+ amd64 default/bad_parent dev
amd64 nonexistent exp
+
diff --git a/testdata/data/repos/standalone/BadCommandsCheck/BannedEapiCommand/fix.patch b/testdata/data/repos/standalone/BadCommandsCheck/BannedEapiCommand/fix.patch
index 84f16a60..a0950afe 100644
--- a/testdata/data/repos/standalone/BadCommandsCheck/BannedEapiCommand/fix.patch
+++ b/testdata/data/repos/standalone/BadCommandsCheck/BannedEapiCommand/fix.patch
@@ -29,7 +29,7 @@ diff -Naur standalone/BadCommandsCheck/BannedEapiCommand/BannedEapiCommand-2.ebu
+++ fixed/BadCommandsCheck/BannedEapiCommand/BannedEapiCommand-2.ebuild
@@ -4,11 +4,3 @@ DESCRIPTION="Ebuild using banned commands"
HOMEPAGE="https://github.com/pkgcore/pkgcheck"
- SLOT="0"
+ LICENSE="BSD"
SLOT="0"
-
-pkg_preinst() {
diff --git a/testdata/data/repos/standalone/EapiCheck/BannedEapi/fix.patch b/testdata/data/repos/standalone/EapiCheck/BannedEapi/fix.patch
index c42befcd..47adbc49 100644
--- a/testdata/data/repos/standalone/EapiCheck/BannedEapi/fix.patch
+++ b/testdata/data/repos/standalone/EapiCheck/BannedEapi/fix.patch
@@ -1,10 +1,10 @@
diff -Naur standalone/EapiCheck/BannedEapi/BannedEapi-0.ebuild fixed/EapiCheck/BannedEapi/BannedEapi-0.ebuild
---- standalone/EapiCheck/BannedEapi/BannedEapi-0.ebuild 2019-09-15 03:05:12.832870282 -0600
-+++ fixed/EapiCheck/BannedEapi/BannedEapi-0.ebuild 2019-09-15 03:11:08.602303656 -0600
+--- standalone/EapiCheck/BannedEapi/BannedEapi-0.ebuild
++++ fixed/EapiCheck/BannedEapi/BannedEapi-0.ebuild
@@ -1,5 +1,5 @@
-EAPI=1
+EAPI=7
DESCRIPTION="Ebuild using banned EAPI"
HOMEPAGE="https://github.com/pkgcore/pkgcheck"
- SLOT="0"
+ LICENSE="BSD"
diff --git a/testdata/data/repos/standalone/EapiCheck/DeprecatedEapi/fix.patch b/testdata/data/repos/standalone/EapiCheck/DeprecatedEapi/fix.patch
index efea8671..dca3e484 100644
--- a/testdata/data/repos/standalone/EapiCheck/DeprecatedEapi/fix.patch
+++ b/testdata/data/repos/standalone/EapiCheck/DeprecatedEapi/fix.patch
@@ -1,10 +1,10 @@
diff -Naur standalone/EapiCheck/DeprecatedEapi/DeprecatedEapi-0.ebuild fixed/EapiCheck/DeprecatedEapi/DeprecatedEapi-0.ebuild
---- standalone/EapiCheck/DeprecatedEapi/DeprecatedEapi-0.ebuild 2019-09-15 03:08:00.380545715 -0600
-+++ fixed/EapiCheck/DeprecatedEapi/DeprecatedEapi-0.ebuild 2019-09-15 03:11:41.260435170 -0600
+--- standalone/EapiCheck/DeprecatedEapi/DeprecatedEapi-0.ebuild
++++ fixed/EapiCheck/DeprecatedEapi/DeprecatedEapi-0.ebuild
@@ -1,5 +1,5 @@
-EAPI=5
+EAPI=7
DESCRIPTION="Ebuild using deprecated EAPI"
HOMEPAGE="https://github.com/pkgcore/pkgcheck"
- SLOT="0"
+ LICENSE="BSD"
diff --git a/testdata/data/repos/standalone/LicenseCheck/InvalidLicense/fix.patch b/testdata/data/repos/standalone/LicenseCheck/InvalidLicense/fix.patch
index a71b857f..bccb66da 100644
--- a/testdata/data/repos/standalone/LicenseCheck/InvalidLicense/fix.patch
+++ b/testdata/data/repos/standalone/LicenseCheck/InvalidLicense/fix.patch
@@ -1,6 +1,6 @@
diff -Naur standalone/LicenseCheck/InvalidLicense/InvalidLicense-0.ebuild fixed/LicenseCheck/InvalidLicense/InvalidLicense-0.ebuild
---- standalone/LicenseCheck/InvalidLicense/InvalidLicense-0.ebuild 2019-11-23 00:27:57.633663522 -0700
-+++ fixed/LicenseCheck/InvalidLicense/InvalidLicense-0.ebuild 2019-11-23 00:30:26.740242348 -0700
+--- standalone/LicenseCheck/InvalidLicense/InvalidLicense-0.ebuild
++++ fixed/LicenseCheck/InvalidLicense/InvalidLicense-0.ebuild
@@ -1,4 +1,4 @@
DESCRIPTION="Ebuild with invalid LICENSE"
HOMEPAGE="https://github.com/pkgcore/pkgcheck"
@@ -8,8 +8,8 @@ diff -Naur standalone/LicenseCheck/InvalidLicense/InvalidLicense-0.ebuild fixed/
+LICENSE="BSD"
SLOT="0"
diff -Naur standalone/LicenseCheck/InvalidLicense/InvalidLicense-1.ebuild fixed/LicenseCheck/InvalidLicense/InvalidLicense-1.ebuild
---- standalone/LicenseCheck/InvalidLicense/InvalidLicense-1.ebuild 2019-11-23 00:28:02.437681816 -0700
-+++ fixed/LicenseCheck/InvalidLicense/InvalidLicense-1.ebuild 2019-11-23 00:30:37.192283283 -0700
+--- standalone/LicenseCheck/InvalidLicense/InvalidLicense-1.ebuild
++++ fixed/LicenseCheck/InvalidLicense/InvalidLicense-1.ebuild
@@ -1,4 +1,4 @@
DESCRIPTION="Ebuild with invalid LICENSE"
HOMEPAGE="https://github.com/pkgcore/pkgcheck"
@@ -17,9 +17,10 @@ diff -Naur standalone/LicenseCheck/InvalidLicense/InvalidLicense-1.ebuild fixed/
+LICENSE="BSD"
SLOT="0"
diff -Naur standalone/LicenseCheck/InvalidLicense/InvalidLicense-2.ebuild fixed/LicenseCheck/InvalidLicense/InvalidLicense-2.ebuild
---- standalone/LicenseCheck/InvalidLicense/InvalidLicense-2.ebuild 2019-11-23 00:29:11.103946140 -0700
-+++ fixed/LicenseCheck/InvalidLicense/InvalidLicense-2.ebuild 2019-11-23 00:30:47.739324583 -0700
-@@ -2,4 +2,4 @@
+--- standalone/LicenseCheck/InvalidLicense/InvalidLicense-2.ebuild
++++ fixed/LicenseCheck/InvalidLicense/InvalidLicense-2.ebuild
+@@ -1,5 +1,5 @@
+ DESCRIPTION="Ebuild with invalid LICENSE"
HOMEPAGE="https://github.com/pkgcore/pkgcheck"
-LICENSE="used?"
+LICENSE="used? ( BSD )"
diff --git a/testdata/data/repos/standalone/PkgDirCheck/InvalidPN/fix.patch b/testdata/data/repos/standalone/PkgDirCheck/InvalidPN/fix.patch
deleted file mode 100644
index 070de8d4..00000000
--- a/testdata/data/repos/standalone/PkgDirCheck/InvalidPN/fix.patch
+++ /dev/null
@@ -1,16 +0,0 @@
-diff -Naur standalone/PkgDirCheck/InvalidPN/InvalidPN-0.ebuild fixed/PkgDirCheck/InvalidPN/InvalidPN-0.ebuild
---- standalone/PkgDirCheck/InvalidPN/InvalidPN-0.ebuild 1969-12-31 17:00:00.000000000 -0700
-+++ fixed/PkgDirCheck/InvalidPN/InvalidPN-0.ebuild 2019-08-20 18:54:59.098260825 -0600
-@@ -0,0 +1,4 @@
-+DESCRIPTION="Ebuilds that have invalid package names"
-+HOMEPAGE="https://github.com/pkgcore/pkgcheck"
-+LICENSE="BSD"
-+SLOT="0"
-diff -Naur standalone/PkgDirCheck/InvalidPN/InvalidPN.ebuild fixed/PkgDirCheck/InvalidPN/InvalidPN.ebuild
---- standalone/PkgDirCheck/InvalidPN/InvalidPN.ebuild 2019-08-20 18:54:59.098260825 -0600
-+++ fixed/PkgDirCheck/InvalidPN/InvalidPN.ebuild 1969-12-31 17:00:00.000000000 -0700
-@@ -1,4 +0,0 @@
--DESCRIPTION="Ebuilds that have invalid package names"
--HOMEPAGE="https://github.com/pkgcore/pkgcheck"
--LICENSE="BSD"
--SLOT="0"
diff --git a/testdata/data/repos/standalone/PkgDirCheck/InvalidPN/fix.sh b/testdata/data/repos/standalone/PkgDirCheck/InvalidPN/fix.sh
new file mode 100755
index 00000000..6a3b41c8
--- /dev/null
+++ b/testdata/data/repos/standalone/PkgDirCheck/InvalidPN/fix.sh
@@ -0,0 +1,2 @@
+#!/bin/bash
+mv PkgDirCheck/InvalidPN/InvalidPN.ebuild PkgDirCheck/InvalidPN/InvalidPN-0.ebuild
diff --git a/testdata/data/repos/standalone/PkgDirCheck/MismatchedPN/fix.patch b/testdata/data/repos/standalone/PkgDirCheck/MismatchedPN/fix.patch
deleted file mode 100644
index 1085425e..00000000
--- a/testdata/data/repos/standalone/PkgDirCheck/MismatchedPN/fix.patch
+++ /dev/null
@@ -1,16 +0,0 @@
-diff -Naur standalone/PkgDirCheck/MismatchedPN/MismatchedPN-1.ebuild fixed/PkgDirCheck/MismatchedPN/MismatchedPN-1.ebuild
---- standalone/PkgDirCheck/MismatchedPN/MismatchedPN-1.ebuild 1969-12-31 17:00:00.000000000 -0700
-+++ fixed/PkgDirCheck/MismatchedPN/MismatchedPN-1.ebuild 2019-08-20 18:54:59.098260825 -0600
-@@ -0,0 +1,4 @@
-+DESCRIPTION="Ebuilds that have different names than their parent directory"
-+HOMEPAGE="https://github.com/pkgcore/pkgcheck"
-+LICENSE="BSD"
-+SLOT="0"
-diff -Naur standalone/PkgDirCheck/MismatchedPN/Mismatched-1.ebuild fixed/PkgDirCheck/MismatchedPN/Mismatched-1.ebuild
---- standalone/PkgDirCheck/MismatchedPN/Mismatched-1.ebuild 2019-08-20 18:54:59.098260825 -0600
-+++ fixed/PkgDirCheck/MismatchedPN/Mismatched-1.ebuild 1969-12-31 17:00:00.000000000 -0700
-@@ -1,4 +0,0 @@
--DESCRIPTION="Ebuilds that have different names than their parent directory"
--HOMEPAGE="https://github.com/pkgcore/pkgcheck"
--LICENSE="BSD"
--SLOT="0"
diff --git a/testdata/data/repos/standalone/PkgDirCheck/MismatchedPN/fix.sh b/testdata/data/repos/standalone/PkgDirCheck/MismatchedPN/fix.sh
new file mode 100755
index 00000000..0c32ca88
--- /dev/null
+++ b/testdata/data/repos/standalone/PkgDirCheck/MismatchedPN/fix.sh
@@ -0,0 +1,2 @@
+#!/bin/bash
+mv PkgDirCheck/MismatchedPN/Mismatched-1.ebuild PkgDirCheck/MismatchedPN/MismatchedPN-1.ebuild
diff --git a/testdata/data/repos/standalone/SourcingCheck/InvalidEapi/fix.patch b/testdata/data/repos/standalone/SourcingCheck/InvalidEapi/fix.patch
index 5f522779..f424e528 100644
--- a/testdata/data/repos/standalone/SourcingCheck/InvalidEapi/fix.patch
+++ b/testdata/data/repos/standalone/SourcingCheck/InvalidEapi/fix.patch
@@ -1,18 +1,18 @@
diff -Naur standalone/SourcingCheck/InvalidEapi/InvalidEapi-0.ebuild fixed/SourcingCheck/InvalidEapi/InvalidEapi-0.ebuild
---- standalone/SourcingCheck/InvalidEapi/InvalidEapi-0.ebuild 2019-09-15 03:08:49.094741882 -0600
-+++ fixed/SourcingCheck/InvalidEapi/InvalidEapi-0.ebuild 2019-09-15 03:12:21.294596386 -0600
+--- standalone/SourcingCheck/InvalidEapi/InvalidEapi-0.ebuild
++++ fixed/SourcingCheck/InvalidEapi/InvalidEapi-0.ebuild
@@ -1,4 +1,4 @@
-EAPI=9999
+EAPI=7
DESCRIPTION="Ebuild using unsupported EAPI"
HOMEPAGE="https://github.com/pkgcore/pkgcheck"
- SLOT="0"
+ LICENSE="BSD"
diff -Naur standalone/SourcingCheck/InvalidEapi/InvalidEapi-1.ebuild fixed/SourcingCheck/InvalidEapi/InvalidEapi-1.ebuild
---- standalone/SourcingCheck/InvalidEapi/InvalidEapi-1.ebuild 2019-09-15 03:09:44.633965531 -0600
-+++ fixed/SourcingCheck/InvalidEapi/InvalidEapi-1.ebuild 2019-09-15 03:12:30.961635314 -0600
+--- standalone/SourcingCheck/InvalidEapi/InvalidEapi-1.ebuild
++++ fixed/SourcingCheck/InvalidEapi/InvalidEapi-1.ebuild
@@ -1,4 +1,4 @@
-EAPI="invalid!"
+EAPI=7
DESCRIPTION="Ebuild using invalid EAPI"
HOMEPAGE="https://github.com/pkgcore/pkgcheck"
- SLOT="0"
+ LICENSE="BSD"
^ permalink raw reply related [flat|nested] only message in thread
only message in thread, other threads:[~2025-02-07 20:37 UTC | newest]
Thread overview: (only message) (download: mbox.gz follow: Atom feed
-- links below jump to the message on this page --
2025-02-07 20:37 [gentoo-commits] proj/pkgcore/pkgcheck:master commit in: testdata/data/repos/standalone/EapiCheck/DeprecatedEapi/, Arthur Zamarin
This is a public inbox, see mirroring instructions
for how to clone and mirror all data and code used for this inbox