summaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
-rw-r--r--composer.json2
-rwxr-xr-xmakesrc.sh26
-rw-r--r--php-sebastian-environment9.spec12
3 files changed, 16 insertions, 24 deletions
diff --git a/composer.json b/composer.json
index 4b525e0..8a611ae 100644
--- a/composer.json
+++ b/composer.json
@@ -38,7 +38,7 @@
},
"extra": {
"branch-alias": {
- "dev-main": "9.1-dev"
+ "dev-main": "9.2-dev"
}
}
}
diff --git a/makesrc.sh b/makesrc.sh
index ac0c720..59cf430 100755
--- a/makesrc.sh
+++ b/makesrc.sh
@@ -1,35 +1,27 @@
#!/bin/bash
NAME=$(basename $PWD)
-DATE=$(sed -n '/^%global gh_date/{s/.* //;p}' $NAME.spec)
OWNER=$(sed -n '/^%global gh_owner/{s/.* //;p}' $NAME.spec)
PROJECT=$(sed -n '/^%global gh_project/{s/.* //;p}' $NAME.spec)
VERSION=$(sed -n '/^Version:/{s/.* //;p}' $NAME.spec)
-COMMIT=$(sed -n '/^%global gh_commit/{s/.* //;p}' $NAME.spec)
-SHORT=${COMMIT:0:7}
-DATE=$(date -d "$DATE -4 days" +%Y-%m-%d)
-
-if [ -f $NAME-$VERSION-$SHORT.tgz ]; then
- echo "$NAME-$VERSION-$SHORT.tgz already there"
+if [ -f $NAME-$VERSION.tgz ]; then
+ echo "$NAME-$VERSION.tgz already there"
else
- echo -e "\nCreate git snapshot\nName=$NAME, Owner=$OWNER, Project=$PROJECT, Version=$VERSION, Date=$DATE\n"
+ echo -e "\nCreate git snapshot\nName=$NAME, Owner=$OWNER, Project=$PROJECT, Version=$VERSION \n"
echo "Cloning..."
- rm -rf $PROJECT-$COMMIT
- git clone --shallow-since=$DATE https://github.com/$OWNER/$PROJECT.git $PROJECT-$COMMIT || exit 1
+ rm -rf $PROJECT-$VERSION
+ git clone https://github.com/$OWNER/$PROJECT.git --depth 1 --branch $VERSION $PROJECT-$VERSION || exit 1
- echo "Getting commit..."
- pushd $PROJECT-$COMMIT
- git checkout $COMMIT || exit 1
- cp composer.json ../composer.json
- popd
+ echo "Getting composer..."
+ cp $PROJECT-$VERSION/composer.json composer.json
echo "Archiving..."
- tar czf $NAME-$VERSION-$SHORT.tgz --exclude-vcs --exclude tools $PROJECT-$COMMIT
+ tar czf $NAME-$VERSION.tgz --exclude-vcs --exclude tools $PROJECT-$VERSION
echo "Cleaning..."
- rm -rf $PROJECT-$COMMIT
+ rm -rf $PROJECT-$VERSION
echo "Done."
fi
diff --git a/php-sebastian-environment9.spec b/php-sebastian-environment9.spec
index 1faa801..3dd46de 100644
--- a/php-sebastian-environment9.spec
+++ b/php-sebastian-environment9.spec
@@ -10,11 +10,8 @@
%bcond_without tests
# Sources
-%global gh_commit c4a2dc54b1a24e13ef1839cbb5947b967cbae853
-%global gh_short %(c=%{gh_commit}; echo ${c:0:7})
%global gh_owner sebastianbergmann
%global gh_project environment
-%global gh_date 2026-03-22
# Packagist
%global pk_vendor sebastian
%global pk_project %{gh_project}
@@ -25,14 +22,14 @@
%global ns_project Environment
Name: php-%{pk_vendor}-%{pk_project}%{major}
-Version: 9.1.0
+Version: 9.2.0
Release: 1%{?dist}
Summary: Handle HHVM/PHP environments, version %{major}
License: BSD-3-Clause
URL: https://github.com/%{gh_owner}/%{gh_project}
# run makesrc.sh to create a git snapshot with test suite
-Source0: %{name}-%{version}-%{gh_short}.tgz
+Source0: %{name}-%{version}.tgz
Source1: makesrc.sh
@@ -68,7 +65,7 @@ Autoloader: %{php_home}/%{ns_vendor}/%{ns_project}%{major}/autoload.php
%prep
-%setup -q -n %{gh_project}-%{gh_commit}
+%setup -q -n %{gh_project}-%{version}
%build
@@ -110,6 +107,9 @@ exit $ret
%changelog
+* Mon Apr 6 2026 Remi Collet <remi@remirepo.net> - 9.2.0-1
+- update to 9.2.0
+
* Mon Mar 23 2026 Remi Collet <remi@remirepo.net> - 9.1.0-1
- update to 9.1.0