From f6f85b7afdbd7f84042c130026ad5a93ae964ffc Mon Sep 17 00:00:00 2001 From: "Douglas Cerna (Soy Douglas)" Date: Mon, 7 Oct 2024 15:45:59 +0000 Subject: [PATCH 1/3] Upgrade pre-commit dependencies --- .pre-commit-config.yaml | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/.pre-commit-config.yaml b/.pre-commit-config.yaml index 0731a89..09a1715 100644 --- a/.pre-commit-config.yaml +++ b/.pre-commit-config.yaml @@ -1,13 +1,13 @@ repos: - repo: https://github.com/pre-commit/pre-commit-hooks - rev: v4.5.0 + rev: v5.0.0 hooks: - id: check-json - id: check-yaml - id: end-of-file-fixer - id: trailing-whitespace - repo: https://github.com/igorshubovych/markdownlint-cli - rev: v0.39.0 + rev: v0.42.0 hooks: - id: markdownlint - repo: https://github.com/thlorenz/doctoc From dcbd864e78fb6b6c40c84db495ce671bca7eb1ae Mon Sep 17 00:00:00 2001 From: "Douglas Cerna (Soy Douglas)" Date: Mon, 7 Oct 2024 18:41:32 +0000 Subject: [PATCH 2/3] Update test scripts --- tests/archivematica/EL9/install.sh | 4 ++-- tests/archivematica/jammy/install.sh | 6 +++--- 2 files changed, 5 insertions(+), 5 deletions(-) diff --git a/tests/archivematica/EL9/install.sh b/tests/archivematica/EL9/install.sh index 2650f2e..c428cbb 100755 --- a/tests/archivematica/EL9/install.sh +++ b/tests/archivematica/EL9/install.sh @@ -46,7 +46,7 @@ else sudo -u root bash -c 'cat << EOF > /etc/yum.repos.d/archivematica.repo [archivematica] name=archivematica -baseurl=https://packages.archivematica.org/1.16.x/rocky9 +baseurl=https://packages.archivematica.org/1.17.x/rocky9 gpgcheck=1 gpgkey=https://packages.archivematica.org/GPG-KEY-archivematica-sha512 enabled=1 @@ -56,7 +56,7 @@ fi sudo -u root bash -c 'cat << EOF >> /etc/yum.repos.d/archivematica-extras.repo [archivematica-extras] name=archivematica-extras -baseurl=https://packages.archivematica.org/1.16.x/rocky9-extras +baseurl=https://packages.archivematica.org/1.17.x/rocky9-extras gpgcheck=1 gpgkey=https://packages.archivematica.org/GPG-KEY-archivematica-sha512 enabled=1 diff --git a/tests/archivematica/jammy/install.sh b/tests/archivematica/jammy/install.sh index 1d64ced..a1624fd 100755 --- a/tests/archivematica/jammy/install.sh +++ b/tests/archivematica/jammy/install.sh @@ -39,15 +39,15 @@ sudo debconf-set-selections <<< "archivematica-mcp-server archivematica-mcp-serv sudo debconf-set-selections <<< "archivematica-mcp-server archivematica-mcp-server/mysql/app-pass password demo-am" sudo debconf-set-selections <<< "archivematica-mcp-server archivematica-mcp-server/app-password-confirm password demo-am" -curl -fsSL https://packages.archivematica.org/1.16.x/key.asc | sudo gpg --dearmor -o /etc/apt/keyrings/archivematica-1.16.x.gpg -sudo sh -c 'echo "deb [arch=amd64 signed-by=/etc/apt/keyrings/archivematica-1.16.x.gpg] http://packages.archivematica.org/1.16.x/ubuntu-externals jammy main" > /etc/apt/sources.list.d/archivematica-externals.list' +curl -fsSL https://packages.archivematica.org/1.17.x/key.asc | sudo gpg --dearmor -o /etc/apt/keyrings/archivematica-1.17.x.gpg +sudo sh -c 'echo "deb [arch=amd64 signed-by=/etc/apt/keyrings/archivematica-1.17.x.gpg] http://packages.archivematica.org/1.17.x/ubuntu-externals jammy main" > /etc/apt/sources.list.d/archivematica-externals.list' if [ "${local_repository}" == "true" ] ; then sudo -u root bash -c 'cat << EOF > /etc/apt/sources.list.d/archivematica.list deb file:/am-packbuild/debs/jammy/_deb_repository ./ EOF' else - sudo sh -c 'echo "deb [arch=amd64 signed-by=/etc/apt/keyrings/archivematica-1.16.x.gpg] http://packages.archivematica.org/1.16.x/ubuntu jammy main" > /etc/apt/sources.list.d/archivematica.list' + sudo sh -c 'echo "deb [arch=amd64 signed-by=/etc/apt/keyrings/archivematica-1.17.x.gpg] http://packages.archivematica.org/1.17.x/ubuntu jammy main" > /etc/apt/sources.list.d/archivematica.list' fi sudo apt-get -o Acquire::AllowInsecureRepositories=true update From 2b7e6d538c6ddee39751894a74f814a70ed965a5 Mon Sep 17 00:00:00 2001 From: "Douglas Cerna (Soy Douglas)" Date: Mon, 7 Oct 2024 21:43:39 +0000 Subject: [PATCH 3/3] Update version references --- README.md | 2 +- debs/focal/.Jenkinsci | 2 +- debs/jammy/.Jenkinsci | 2 +- debs/jammy/archivematica-storage-service/Makefile | 2 +- debs/jammy/archivematica/Makefile | 2 +- debs/jammy/archivematica/debian-MCPClient/control | 2 +- debs/jammy/archivematica/debian-MCPServer/control | 2 +- debs/jammy/archivematica/debian-archivematicaCommon/control | 2 +- debs/jammy/archivematica/debian-dashboard/control | 2 +- rpms/EL9/.Jenkinsci | 2 +- rpms/EL9/archivematica-storage-service/Makefile | 2 +- rpms/EL9/archivematica/Makefile | 2 +- 12 files changed, 12 insertions(+), 12 deletions(-) diff --git a/README.md b/README.md index 2864d85..d139987 100644 --- a/README.md +++ b/README.md @@ -21,7 +21,7 @@ may be a bit different between packages, but the most common are `BRANCH`, So in order to build a specific branch or version, this command can be used from the folder of the package we want to build: - make BRANCH=qa/1.x VERSION=1.16.0 RELEASE=rc5 + make BRANCH=qa/1.x VERSION=1.17.0 RELEASE=rc5 Keep in mind that the makefiles are a bit recursive, they will invoke Docker, mount the current folder, and run the deb-build target. diff --git a/debs/focal/.Jenkinsci b/debs/focal/.Jenkinsci index 2ff6036..e2a6aec 100644 --- a/debs/focal/.Jenkinsci +++ b/debs/focal/.Jenkinsci @@ -5,7 +5,7 @@ pipeline { string(defaultValue: 'qa/1.x', description: '', name: 'BRANCH') string(defaultValue: '', description: '', name: 'GIT_REPO') string(defaultValue: '0F4A4D31', description: 'For production packages, use production key', name: 'GPG_ID') - string(defaultValue: '1.16.0', description: '', name: 'VERSION') + string(defaultValue: '1.17.0', description: '', name: 'VERSION') string(defaultValue: '-beta1', description: '', name: 'RELEASE') string(defaultValue: 'qa/1.x', description: '', name: 'PACKBUILD_BRANCH') string(defaultValue: 'jenkinsci', description: '', name: 'REPOSITORY') diff --git a/debs/jammy/.Jenkinsci b/debs/jammy/.Jenkinsci index bb8bafe..2751c37 100644 --- a/debs/jammy/.Jenkinsci +++ b/debs/jammy/.Jenkinsci @@ -5,7 +5,7 @@ pipeline { string(defaultValue: 'qa/1.x', description: '', name: 'BRANCH') string(defaultValue: '', description: '', name: 'GIT_REPO') string(defaultValue: '0F4A4D31', description: 'For production packages, use production key', name: 'GPG_ID') - string(defaultValue: '1.16.0', description: '', name: 'VERSION') + string(defaultValue: '1.17.0', description: '', name: 'VERSION') string(defaultValue: '-beta1', description: '', name: 'RELEASE') string(defaultValue: 'qa/1.x', description: '', name: 'PACKBUILD_BRANCH') string(defaultValue: 'jenkinsci', description: '', name: 'REPOSITORY') diff --git a/debs/jammy/archivematica-storage-service/Makefile b/debs/jammy/archivematica-storage-service/Makefile index 5b48185..d7456a1 100644 --- a/debs/jammy/archivematica-storage-service/Makefile +++ b/debs/jammy/archivematica-storage-service/Makefile @@ -5,7 +5,7 @@ DOCKER_VOLUME = "/src" DOCKER_IMAGE = "debbuild-$(NAME)-$(PACKAGE)-$(VERSION)" GPG_ID ?= 0F4A4D31 BRANCH ?= qa/0.x -VERSION ?= 0.22.0 +VERSION ?= 0.23.0 RELEASE ?= -1 GIT_REPO = "https://github.com/artefactual/archivematica-storage-service" diff --git a/debs/jammy/archivematica/Makefile b/debs/jammy/archivematica/Makefile index ea2cfe6..8884718 100644 --- a/debs/jammy/archivematica/Makefile +++ b/debs/jammy/archivematica/Makefile @@ -5,7 +5,7 @@ DOCKER_VOLUME = "/src" DOCKER_IMAGE = "debbuild-$(NAME)-$(PACKAGE)-$(VERSION)" GPG_ID ?= 0F4A4D31 BRANCH ?= qa/1.x -VERSION ?= 1.16.0 +VERSION ?= 1.17.0 RELEASE ?= -1 GIT_REPO ?= "https://github.com/artefactual" diff --git a/debs/jammy/archivematica/debian-MCPClient/control b/debs/jammy/archivematica/debian-MCPClient/control index 5ca6e9c..86752ba 100644 --- a/debs/jammy/archivematica/debian-MCPClient/control +++ b/debs/jammy/archivematica/debian-MCPClient/control @@ -11,7 +11,7 @@ Package: archivematica-mcp-client Architecture: amd64 Depends: ${misc:Depends}, - archivematica-common (>= 1.16.0), + archivematica-common (>= 1.17.0), atool, bulk-extractor, clamav, diff --git a/debs/jammy/archivematica/debian-MCPServer/control b/debs/jammy/archivematica/debian-MCPServer/control index a4a4c9b..2129278 100644 --- a/debs/jammy/archivematica/debian-MCPServer/control +++ b/debs/jammy/archivematica/debian-MCPServer/control @@ -11,7 +11,7 @@ Package: archivematica-mcp-server Architecture: amd64 Depends: ${misc:Depends}, - archivematica-common (>= 1.16.0), + archivematica-common (>= 1.17.0), dbconfig-common, dbconfig-mysql, mysql-server, diff --git a/debs/jammy/archivematica/debian-archivematicaCommon/control b/debs/jammy/archivematica/debian-archivematicaCommon/control index 4fbe73d..e5b21d1 100644 --- a/debs/jammy/archivematica/debian-archivematicaCommon/control +++ b/debs/jammy/archivematica/debian-archivematicaCommon/control @@ -13,6 +13,6 @@ Depends: ${misc:Depends}, python3, python3-distutils, - archivematica (>= 1.16.0) + archivematica (>= 1.17.0) Description: Archivematica shared libraries. Homepage: https://www.archivematica.org diff --git a/debs/jammy/archivematica/debian-dashboard/control b/debs/jammy/archivematica/debian-dashboard/control index bb2222b..99f4e0e 100644 --- a/debs/jammy/archivematica/debian-dashboard/control +++ b/debs/jammy/archivematica/debian-dashboard/control @@ -12,7 +12,7 @@ Architecture: any Depends: ${shlibs:Depends}, ${misc:Depends}, - archivematica-common (>= 1.16.0), + archivematica-common (>= 1.17.0), git, nginx, gettext diff --git a/rpms/EL9/.Jenkinsci b/rpms/EL9/.Jenkinsci index 396842e..ebe9864 100644 --- a/rpms/EL9/.Jenkinsci +++ b/rpms/EL9/.Jenkinsci @@ -4,7 +4,7 @@ pipeline { string(defaultValue: 'archivematica', description: '', name: 'PACKAGE') string(defaultValue: 'qa/1.x', description: '', name: 'BRANCH') string(defaultValue: '0F4A4D31', description: 'For production packages, use production key', name: 'GPG_ID') - string(defaultValue: '1.16.0', description: '', name: 'VERSION') + string(defaultValue: '1.17.0', description: '', name: 'VERSION') string(defaultValue: 'beta1', description: '', name: 'RELEASE') string(defaultValue: '', description: '', name: 'GIT_REPO') string(defaultValue: 'qa/1.x', description: '', name: 'PACKBUILD_BRANCH') diff --git a/rpms/EL9/archivematica-storage-service/Makefile b/rpms/EL9/archivematica-storage-service/Makefile index b0cb511..874c8ad 100644 --- a/rpms/EL9/archivematica-storage-service/Makefile +++ b/rpms/EL9/archivematica-storage-service/Makefile @@ -1,6 +1,6 @@ NAME = archivematica-storage-service BRANCH ?= qa/0.x -VERSION ?= 0.22.0 +VERSION ?= 0.23.0 RELEASE ?= 1 RPM_TOPDIR = "/rpmbuild" DOCKER_VOLUME = "/src" diff --git a/rpms/EL9/archivematica/Makefile b/rpms/EL9/archivematica/Makefile index d6110f6..3a8d04a 100644 --- a/rpms/EL9/archivematica/Makefile +++ b/rpms/EL9/archivematica/Makefile @@ -1,6 +1,6 @@ PACKAGE ?= archivematica BRANCH ?= qa/1.x -VERSION ?= 1.16.0 +VERSION ?= 1.17.0 RELEASE ?= 1 RPM_TOPDIR = "/rpmbuild" DOCKER_VOLUME = "/src"