From d2bbcd6bde5a62278baffd31f7d0723dfc0c6d1f Mon Sep 17 00:00:00 2001 From: Markus Weigelt Date: Mon, 19 Jun 2023 11:01:52 +0200 Subject: [PATCH 1/2] Update submodules --- _modules/ocrd_controller | 2 +- _modules/ocrd_manager | 2 +- _modules/ocrd_monitor | 2 +- 3 files changed, 3 insertions(+), 3 deletions(-) diff --git a/_modules/ocrd_controller b/_modules/ocrd_controller index 7386f41..4b92961 160000 --- a/_modules/ocrd_controller +++ b/_modules/ocrd_controller @@ -1 +1 @@ -Subproject commit 7386f413d34991df12b22c38ff19c4aecd75335d +Subproject commit 4b929615254859b7c03ba320a2ffee3989e9fa10 diff --git a/_modules/ocrd_manager b/_modules/ocrd_manager index e4f3210..690f5cf 160000 --- a/_modules/ocrd_manager +++ b/_modules/ocrd_manager @@ -1 +1 @@ -Subproject commit e4f32109bcd93433bb7ee03d4a6bf3c3c3d85b0e +Subproject commit 690f5cf55db139d9e6947dad0903154430782148 diff --git a/_modules/ocrd_monitor b/_modules/ocrd_monitor index 27999cf..b372d20 160000 --- a/_modules/ocrd_monitor +++ b/_modules/ocrd_monitor @@ -1 +1 @@ -Subproject commit 27999cfe4c94e6f02abf2baa4eff13f1d97de79b +Subproject commit b372d2032310a6015a13ebe0ab2ee2edbcb168d1 From 5a51babb5a8f5259ec553e1c35e654a604f225d7 Mon Sep 17 00:00:00 2001 From: Markus Weigelt Date: Mon, 19 Jun 2023 11:09:50 +0200 Subject: [PATCH 2/2] Update release-stable-pr.yml --- .github/workflows/release-stable-pr.yml | 6 +++--- 1 file changed, 3 insertions(+), 3 deletions(-) diff --git a/.github/workflows/release-stable-pr.yml b/.github/workflows/release-stable-pr.yml index 5e32e16..7e125c5 100644 --- a/.github/workflows/release-stable-pr.yml +++ b/.github/workflows/release-stable-pr.yml @@ -16,7 +16,7 @@ jobs: - name: Checkout repository and submodules of stable branch uses: actions/checkout@v3 with: - ref: fix-stable-release-pr + ref: stable submodules: recursive fetch-depth: 0 # fetch tags @@ -31,7 +31,7 @@ jobs: ./.github/scripts/update-changelog.sh ${{ secrets.GITHUB_TOKEN }} ${{ env.release_version }} # Update .env - sed -i 's|CONTROLLER_BASE_VERSION=maximum-git|CONTROLLER_BASE_VERSION=${{ github.event.inputs.ocrd-all-version }}|g' .env + sed -i 's|CONTROLLER_BASE_VERSION=maximum-cuda|CONTROLLER_BASE_VERSION=${{ github.event.inputs.ocrd-all-version }}|g' .env sed -i 's|CONTROLLER_IMAGE=ghcr.io/slub/ocrd_controller:latest|CONTROLLER_IMAGE=ghcr.io/slub/ocrd_controller:stable|g' .env sed -i 's|MANAGER_IMAGE=ghcr.io/slub/ocrd_manager:latest|MANAGER_IMAGE=ghcr.io/slub/ocrd_manager:stable|g' .env sed -i 's|MONITOR_IMAGE=ghcr.io/slub/ocrd_monitor:latest|MONITOR_IMAGE=ghcr.io/slub/ocrd_monitor:stable|g' .env @@ -56,5 +56,5 @@ jobs: - Release title "Stable Version "${{ env.release_date }}" of Integration of OCR-D and Kitodo.Production" - Copy changes of release from CHANGELOG.md to description base: stable - branch: release-stable-version + branch: release-stable-version-${{ env.release_version }} delete-branch: true