Merge pull request #103 from slub/main

Update stable

.github/workflows/release-stable-pr.yml

@@ -3,21 +3,14 @@ name: Release Stable Pull Request
 on:
   # Allows you to run this workflow manually
   workflow_dispatch:
-    inputs:
-      ocrd-all-version: 
-        description: Stable tag of ocrd/all from stage for OCR-D Controller
-        required: true
-      ocrd-core-version: 
-        description: Stable tag of ocrd/core from stage for OCR-D Manager
-        required: true  
 
 jobs:
   build-pr:
     runs-on: ubuntu-latest
 
     steps:      
     - name: Checkout repository and submodules of stable branch
-      uses: actions/checkout@v3
+      uses: actions/checkout@v4
       with:
         ref: stable
         submodules: recursive
@@ -34,11 +27,7 @@ jobs:
         ./.github/scripts/update-changelog.sh ${{ secrets.GITHUB_TOKEN }} ${{ env.release_version }}
 
         # Update .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_BASE_VERSION=latest|MANAGER_BASE_VERSION=${{ github.event.inputs.ocrd-core-version }}|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
+        sed -i 's|:latest|:stable|g' .env
       shell: bash
 
     - name: Create Pull Request
@@ -47,15 +36,10 @@ jobs:
         commit-message: changes-for-release
         title: Release stable version ${{ env.release_version }}
         body: |
-          ## Autogenerated changes
-          - Update CHANGELOG.md
-          - Update .env 
-            - Replace `CONTROLLER_BASE_VERSION` with `${{ github.event.inputs.ocrd-all-version }}`
-            - Replace `MANAGER_BASE_VERSION` with `${{ github.event.inputs.ocrd-core-version }}`
-            - Replace `latest` with `stable`
+          ## Autogenerated changes (see "Files changed")
 
-          ## Manual steps to provide new release ${{ env.release_version }}
-          - Navigate to https://github.com/slub/ocrd_kitodo/releases/new after PR is merged
+          ## Manual steps to provide new release ${{ env.release_version }} after this PR is merged
+          - Navigate to https://github.com/slub/ocrd_kitodo/releases/new
           - Choose a tag "${{ env.release_version }}" and create this as new tag
           - Choose target "stable"
           - Release title "Stable Version "${{ env.release_date }}" of the integration of OCR-D and Kitodo.Production"

.github/workflows/makefile-ci.yml → .github/workflows/test-ci.yml

@@ -1,4 +1,4 @@
-name: Makefile CI
+name: Test CI
 
 on:
   # Triggers the workflow on push and pull request events but only for pull_requests on the main branch