[Git][java-team/pkg-java-scripts][master] 4 commits: Set the default merge method to fast-forward

[Emmanuel Bourg (@ebourg)]

Emmanuel Bourg pushed to branch master at Debian Java Maintainers / pkg-java-scripts


Commits:
af40acd9 by Emmanuel Bourg at 2024-07-11T11:44:14+02:00
Set the default merge method to fast-forward

- - - - -
143ecbe6 by Emmanuel Bourg at 2024-07-11T11:46:07+02:00
Update to Standards-Version 4.7.0

- - - - -
af52afc9 by Emmanuel Bourg at 2024-07-11T11:48:10+02:00
Remove more dot files when cleaning the local packaging repository

- - - - -
4a2e1f0f by Emmanuel Bourg at 2024-07-11T11:52:30+02:00
Enable Salsa jobs by default

- - - - -


3 changed files:

- setup-packaging-repository.sh
- setup-salsa-repository
- stdver.sh


Changes:

=====================================
setup-packaging-repository.sh
=====================================
@@ -39,7 +39,7 @@ echo "Cleanup the working directory..."
 shopt -s extglob
 rm -Rfv !(debian)
 rm -Rf .git* .travis* .pc .idea .settings .classpath .project .checkstyle .lein-failures .dockerignore
-rm -Rf .git* .travis* .pc .idea .settings .classpath .project .checkstyle .lein-failures .dockerignore .hgignore .mvn .ply .appveyor.yml .editorconfig
+rm -Rf .git* .travis* .pc .idea .settings .classpath .project .checkstyle .lein-failures .dockerignore .hgignore .mvn .ply .appveyor.yml .editorconfig .hgtags .jcheck .mrconfig .gradle
 
 echo ""
 echo "Preparing the local repository..."


=====================================
setup-salsa-repository
=====================================
@@ -46,7 +46,7 @@ SALSA_GROUP_ID=2588
 echo "Creating the ${PACKAGE} repository..."
 
 RESPONSE=$(curl -s "$SALSA_URL/projects?private_token=$SALSA_TOKEN" \
-  --data "path=$PACKAGE&namespace_id=$SALSA_GROUP_ID&visibility=public&issues_enabled=false&snippets_enabled=false&wiki_enabled=false&jobs_enabled=false&printing_merge_request_link_enabled=false")
+  --data "path=$PACKAGE&namespace_id=$SALSA_GROUP_ID&visibility=public&issues_enabled=false&snippets_enabled=false&wiki_enabled=false&jobs_enabled=true&printing_merge_request_link_enabled=false&merge_method=ff")
 
 echo $RESPONSE | jq --exit-status .id > /dev/null
 check_return_code


=====================================
stdver.sh
=====================================
@@ -3,7 +3,7 @@
 # Update the Standards-Version field in debian/control
 #
 
-STANDARDS_VERSION=4.6.1
+STANDARDS_VERSION=4.7.0
 
 echo "Updating Standards-Version to $STANDARDS_VERSION..."
 echo ""



View it on GitLab: https://salsa.debian.org/java-team/pkg-java-scripts/-/compare/9cff30e028b248d3bcb2092bb8906715406fb1a7...4a2e1f0ff38bf136f84f2f4ea70051dc3258f293

-- 
This project does not include diff previews in email notifications.
View it on GitLab: https://salsa.debian.org/java-team/pkg-java-scripts/-/compare/9cff30e028b248d3bcb2092bb8906715406fb1a7...4a2e1f0ff38bf136f84f2f4ea70051dc3258f293
You're receiving this email because of your account on salsa.debian.org.


-------------- next part --------------
An HTML attachment was scrubbed...
URL: <http://alioth-lists.debian.net/pipermail/pkg-java-commits/attachments/20240711/a25e5366/attachment.htm>