Compare commits
10 Commits
| Author | SHA1 | Date | |
|---|---|---|---|
| ebdcf45f1c | |||
|
f76a8d2efc
|
|||
| c57ad0f355 | |||
|
51f5aefcaa
|
|||
| febd0e8369 | |||
|
5c4a2a8ffc
|
|||
|
|
b0672d7fde | ||
| fa21264ef3 | |||
|
0f934a6671
|
|||
|
d697c3e268
|
@@ -18,12 +18,39 @@ on:
|
||||
- "major"
|
||||
- "minor"
|
||||
- "patch"
|
||||
pull_request:
|
||||
types: [closed]
|
||||
branches:
|
||||
- main
|
||||
|
||||
jobs:
|
||||
build:
|
||||
runs-on: ubuntu-latest
|
||||
# Only run on merged PRs with [release-*] or manual workflow_dispatch
|
||||
if: |
|
||||
github.event_name == 'workflow_dispatch' ||
|
||||
(github.event_name == 'pull_request' && github.event.pull_request.merged == true && contains(github.event.pull_request.title, '[release-'))
|
||||
|
||||
steps:
|
||||
- name: Determine bump type
|
||||
id: bump_type
|
||||
run: |
|
||||
if [[ "${{ github.event_name }}" == "workflow_dispatch" ]]; then
|
||||
echo "type=${{ github.event.inputs.bump }}" >> $GITHUB_OUTPUT
|
||||
else
|
||||
# Extract bump type from PR title: [release-patch], [release-minor], [release-major]
|
||||
PR_TITLE="${{ github.event.pull_request.title }}"
|
||||
if [[ "$PR_TITLE" =~ \[release-major\] ]]; then
|
||||
echo "type=major" >> $GITHUB_OUTPUT
|
||||
elif [[ "$PR_TITLE" =~ \[release-minor\] ]]; then
|
||||
echo "type=minor" >> $GITHUB_OUTPUT
|
||||
elif [[ "$PR_TITLE" =~ \[release-patch\] ]]; then
|
||||
echo "type=patch" >> $GITHUB_OUTPUT
|
||||
else
|
||||
echo "type=patch" >> $GITHUB_OUTPUT
|
||||
fi
|
||||
fi
|
||||
|
||||
- name: Checkout code
|
||||
uses: actions/checkout@v4.2.2
|
||||
with:
|
||||
@@ -52,7 +79,7 @@ jobs:
|
||||
id: bump
|
||||
run: |
|
||||
uv tool install bump-my-version
|
||||
uv tool run bump-my-version bump ${{ github.event.inputs.bump }}
|
||||
uv tool run bump-my-version bump ${{ steps.bump_type.outputs.type }}
|
||||
# echo the version to github env, the version is shown by using uv tool run bump-my-version show current_version
|
||||
echo "VERSION<<EOF" >> $GITHUB_ENV
|
||||
echo "$(uv tool run bump-my-version show current_version)" >> $GITHUB_ENV
|
||||
@@ -77,12 +104,12 @@ jobs:
|
||||
echo "tag=$prev" >> "$GITHUB_OUTPUT"
|
||||
|
||||
- name: Compute lowercased image repo
|
||||
if: ${{ github.event.inputs.docker_release == 'true' }}
|
||||
if: ${{ github.event_name == 'workflow_dispatch' && github.event.inputs.docker_release == 'true' || github.event_name == 'pull_request' }}
|
||||
run: |
|
||||
echo "IMAGE_REPO=${{ secrets.REGISTRY }}/$(echo '${{ github.repository }}' | tr '[:upper:]' '[:lower:]')" >> $GITHUB_ENV
|
||||
|
||||
- name: Docker meta
|
||||
if: ${{ github.event.inputs.docker_release == 'true' }}
|
||||
if: ${{ github.event_name == 'workflow_dispatch' && github.event.inputs.docker_release == 'true' || github.event_name == 'pull_request' }}
|
||||
id: meta
|
||||
uses: docker/metadata-action@v5
|
||||
with:
|
||||
@@ -92,12 +119,13 @@ jobs:
|
||||
type=raw,value=${{ env.VERSION }}
|
||||
|
||||
- name: Build and push Docker image
|
||||
if: ${{ github.event.inputs.docker_release == 'true' }}
|
||||
if: ${{ github.event_name == 'workflow_dispatch' && github.event.inputs.docker_release == 'true' || github.event_name == 'pull_request' }}
|
||||
uses: docker/build-push-action@v6
|
||||
with:
|
||||
context: .
|
||||
platforms: linux/amd64
|
||||
push: true
|
||||
no-cache: true
|
||||
tags: ${{ steps.meta.outputs.tags }}
|
||||
labels: ${{ steps.meta.outputs.labels }}
|
||||
|
||||
@@ -118,7 +146,7 @@ jobs:
|
||||
GITHUB_TOKEN: ${{ secrets.GITEA_TOKEN }}
|
||||
|
||||
- name: Create Gitea Release
|
||||
if: ${{ github.event.inputs.github_release == 'true' }}
|
||||
if: ${{ github.event_name == 'workflow_dispatch' && github.event.inputs.github_release == 'true' || github.event_name == 'pull_request' }}
|
||||
uses: softprops/action-gh-release@v1
|
||||
with:
|
||||
tag_name: v${{ env.VERSION }}
|
||||
|
||||
@@ -240,6 +240,13 @@ input[type="radio"] { accent-color: var(--control-accent); }
|
||||
}
|
||||
[data-theme="dark"] .btn-secondary:hover { background: #1f2b3f; }
|
||||
|
||||
/* Generic disabled button state */
|
||||
.btn:disabled {
|
||||
opacity: 0.55;
|
||||
cursor: not-allowed;
|
||||
filter: grayscale(0.15);
|
||||
}
|
||||
|
||||
.actions {
|
||||
margin-top: 16px;
|
||||
display: flex;
|
||||
@@ -537,8 +544,8 @@ input[type="radio"] { accent-color: var(--control-accent); }
|
||||
top: 20px;
|
||||
right: 20px;
|
||||
background: var(--card-bg);
|
||||
border: 1px solid hsl(142, 71%, 45%);
|
||||
background-color: hsl(142, 82%, 30%);
|
||||
border: 1px solid hsl(142, 82%, 30%);
|
||||
background-color: hsl(142, 71%, 45%);
|
||||
border-radius: 12px;
|
||||
box-shadow: 0 10px 40px rgba(0,0,0,0.2);
|
||||
padding: 16px 20px;
|
||||
|
||||
@@ -103,13 +103,13 @@
|
||||
|
||||
<h2>Medien</h2>
|
||||
<div class="media-controls">
|
||||
<button type="button" class="btn btn-secondary" onclick="addMediaType('monografie')">
|
||||
<button type="button" id="btn-monografie" class="btn btn-secondary" onclick="addMediaType('monografie')" title="Monografie Sektion hinzufügen">
|
||||
<span class="mdi mdi-book"></span> + Monografie
|
||||
</button>
|
||||
<button type="button" class="btn btn-secondary" onclick="addMediaType('zeitschriftenartikel')">
|
||||
<button type="button" id="btn-zeitschriftenartikel" class="btn btn-secondary" onclick="addMediaType('zeitschriftenartikel')" title="Zeitschriftenartikel Sektion hinzufügen">
|
||||
<span class="mdi mdi-newspaper"></span> + Zeitschriftenartikel
|
||||
</button>
|
||||
<button type="button" class="btn btn-secondary" onclick="addMediaType('herausgeberwerk')">
|
||||
<button type="button" id="btn-herausgeberwerk" class="btn btn-secondary" onclick="addMediaType('herausgeberwerk')" title="Herausgeberwerk Sektion hinzufügen">
|
||||
<span class="mdi mdi-book-multiple"></span> + Herausgeberwerk
|
||||
</button>
|
||||
</div>
|
||||
@@ -173,6 +173,9 @@
|
||||
|
||||
// Media management functions (global scope for onclick handlers)
|
||||
function addMediaType(type) {
|
||||
const btn = document.getElementById('btn-' + type);
|
||||
// Prevent duplicate sections of same type
|
||||
if (btn && btn.disabled) { return; }
|
||||
const container = document.getElementById('media-sections');
|
||||
const sectionId = 'section-' + sectionCounter++;
|
||||
|
||||
@@ -243,6 +246,11 @@
|
||||
'</button>';
|
||||
|
||||
container.appendChild(section);
|
||||
// Disable button for this type until section removed
|
||||
if (btn) {
|
||||
btn.disabled = true;
|
||||
btn.title = 'Sektion bereits hinzugefügt – entfernen zum erneuten Hinzufügen';
|
||||
}
|
||||
|
||||
// Add first row automatically
|
||||
addMediaRow(sectionId, type);
|
||||
@@ -314,6 +322,7 @@
|
||||
const section = document.getElementById(sectionId);
|
||||
if (section) {
|
||||
if (confirm('Möchten Sie diese Sektion wirklich entfernen?')) {
|
||||
const type = section.getAttribute('data-type');
|
||||
// Clean up tracking for removed rows
|
||||
const rows = section.querySelectorAll('tr[id]');
|
||||
rows.forEach(row => {
|
||||
@@ -323,6 +332,12 @@
|
||||
}
|
||||
});
|
||||
section.remove();
|
||||
// Re-enable button for this media type
|
||||
const btn = document.getElementById('btn-' + type);
|
||||
if (btn) {
|
||||
btn.disabled = false;
|
||||
btn.title = 'Sektion hinzufügen';
|
||||
}
|
||||
updateSubmitButton();
|
||||
}
|
||||
}
|
||||
|
||||
@@ -1,6 +1,6 @@
|
||||
[project]
|
||||
name = "semapform"
|
||||
version = "0.2.1"
|
||||
version = "0.2.2"
|
||||
description = "Add your description here"
|
||||
readme = "README.md"
|
||||
requires-python = ">=3.13"
|
||||
@@ -15,7 +15,7 @@ dependencies = [
|
||||
]
|
||||
|
||||
[tool.bumpversion]
|
||||
current_version = "0.2.1"
|
||||
current_version = "0.2.2"
|
||||
parse = "(?P<major>\\d+)\\.(?P<minor>\\d+)\\.(?P<patch>\\d+)"
|
||||
serialize = ["{major}.{minor}.{patch}"]
|
||||
search = "{current_version}"
|
||||
|
||||
Reference in New Issue
Block a user