Compare commits

..

5 Commits

Author SHA1 Message Date
Arjan van de Ven e0b152250f use gz not xz 2024-10-22 15:39:37 +00:00
Arjan van de Ven 70ca088ce6 update packages file 2024-10-18 19:19:02 +00:00
Arjan van de Ven a3c7b734fa packages update 2024-10-17 15:08:53 +00:00
Arjan van de Ven 7ff8c3a6d5 update packages file 2024-10-15 13:47:25 +00:00
William Douglas bdac11063e bump target: Stash repo first
In order to prevent content that wasn't committed from working its way
into a build, stash prior to doing the rest of the bump.

Signed-off-by: William Douglas <william.douglas@intel.com>
2024-10-10 11:47:15 -07:00
3 changed files with 23 additions and 8 deletions
+1
View File
@@ -223,6 +223,7 @@ scanlicense:
#help the variable BUMP_MSG is set, its value is used as the commit summary.
#help Otherwise a generic commit summary is used.
bump:
git stash
git pull --rebase
$(MAKE) bumpnogit
git add $(SPECFILE) release
+14
View File
@@ -1117,6 +1117,7 @@ ansible
ansible-core
antlr4-python3-runtime
apache-ant
apache-arrow
appstream
appstream-glib
apr
@@ -1331,6 +1332,7 @@ colord-kde
colordiff
columbiad
compat-Botan-soname2
compat-abseil-cpp-rolling
compat-atkmm-soname16
compat-babeltrace-one
compat-cairomm-soname10
@@ -1342,6 +1344,7 @@ compat-gcc-10
compat-gcr-soname1
compat-glibmm-soname24
compat-gnome-bluetooth-soname-13
compat-grpc-soname66
compat-gsl-soname27
compat-gtksourceview-soname3
compat-icu4c-rolling
@@ -2339,6 +2342,7 @@ libsoup
libspatialindex
libspatialite
libspectre
libspelling
libspiro
libspnav
libspng
@@ -2433,6 +2437,7 @@ llvm14
llvm15
llvm16
llvm17
llvm18
lm-sensors
lmdb
logrotate
@@ -2595,6 +2600,7 @@ nettle
network-manager-applet
networkmanager-qt
newt
nextcloud-desktop
nfs-utils
nftables
nghttp2
@@ -3943,8 +3949,11 @@ pypi-doxypypy
pypi-doxyqml
pypi-dpcontracts
pypi-dulwich
pypi-durationpy
pypi-ecdsa
pypi-editables
pypi-editdistance
pypi-edlib
pypi-einops
pypi-elementpath
pypi-enrich
@@ -4243,6 +4252,7 @@ pypi-netapp_lib
pypi-netdisco
pypi-netifaces
pypi-networkx
pypi-nftables
pypi-nh3
pypi-nibabel
pypi-nltk
@@ -4331,6 +4341,7 @@ pypi-poetry
pypi-poetry_core
pypi-poetry_plugin_export
pypi-polib
pypi-polyleven
pypi-port_for
pypi-portalocker
pypi-portend
@@ -4359,6 +4370,7 @@ pypi-py3dns
pypi-py3nvml
pypi-py_cpuinfo
pypi-pyaml
pypi-pyarrow
pypi-pyasn1
pypi-pyasn1_modules
pypi-pybind11
@@ -4372,6 +4384,7 @@ pypi-pycollada
pypi-pycosat
pypi-pycountry
pypi-pycparser
pypi-pycrdt
pypi-pycryptodome
pypi-pycryptodomex
pypi-pycups
@@ -4635,6 +4648,7 @@ pypi-text_unidecode
pypi-textdistance
pypi-textfsm
pypi-texttable
pypi-thefuzz
pypi-threadpoolctl
pypi-three_merge
pypi-tifffile
+8 -8
View File
@@ -111,11 +111,11 @@ def update_cargo_sources(name, tag, cargo_vendors):
with open('Makefile', encoding='utf8') as mfile:
for line in mfile.readlines():
if line.startswith('ARCHIVES'):
if re.search(archive_match + r'[a-zA-Z0-9_\-.]+\.tar\.xz', line):
new_archives = re.sub(archive_match + r'[a-zA-Z0-9_\-.]+\.tar\.xz',
f"{archive_replace}-{tag}.tar.xz", line)
if re.search(archive_match + r'[a-zA-Z0-9_\-.]+\.tar\.gz', line):
new_archives = re.sub(archive_match + r'[a-zA-Z0-9_\-.]+\.tar\.gz',
f"{archive_replace}-{tag}.tar.gz", line)
else:
new_archives = f"{line[:-1]} {archive_replace}-{tag}.tar.xz ./vendor\n"
new_archives = f"{line[:-1]} {archive_replace}-{tag}.tar.gz ./vendor\n"
print(new_archives.replace('ARCHIVES = ', '', 1))
makefile.append(new_archives)
else:
@@ -128,11 +128,11 @@ def update_cargo_sources(name, tag, cargo_vendors):
with open('options.conf', encoding='utf8') as ofile:
for line in ofile.readlines():
if line.startswith('archives'):
if re.search(archive_match + r'[a-zA-Z0-9_\-.]+\.tar\.xz', line):
new_archives = re.sub(archive_match + r'[a-zA-Z0-9_\-.]+\.tar\.xz',
f"{archive_match}-{tag}.tar.xz", line)
if re.search(archive_match + r'[a-zA-Z0-9_\-.]+\.tar\.gz', line):
new_archives = re.sub(archive_match + r'[a-zA-Z0-9_\-.]+\.tar\.gz',
f"{archive_match}-{tag}.tar.gz", line)
else:
new_archives = f"{line[:-1]} {archive_match}-{tag}.tar.xz ./vendor\n"
new_archives = f"{line[:-1]} {archive_match}-{tag}.tar.gz ./vendor\n"
options.append(new_archives)
else:
options.append(line)