Compare commits
29
Commits
v1.0.4
..
b70db3d434
| Author | SHA1 | Date | |
|---|---|---|---|
|
|
b70db3d434
|
||
|
|
5d15c15cb0
|
||
|
|
91189e0cfc
|
||
|
|
ec1066a56d
|
||
|
|
56e8c5c8a3
|
||
|
|
b96e4a62a6
|
||
|
|
e216dd07c8
|
||
|
|
22515c4fc5
|
||
|
|
490b8731a7
|
||
|
|
d799935f26
|
||
|
|
844b5fcd43
|
||
|
|
d77d76a421 | ||
|
|
5f1cdb3a9c
|
||
|
|
be92ae4fc4 | ||
|
|
1e2d4cf187
|
||
|
|
bd8e8c1550
|
||
|
|
cbff7f3351 | ||
|
|
a927feb55f
|
||
|
|
d902812919
|
||
|
|
b832548f95
|
||
|
|
5709046b50
|
||
|
|
e0cd7b8f3f
|
||
|
|
b452f8406d | ||
|
|
0b82945d81 | ||
|
|
2ca8715cb7
|
||
|
|
7bf0e52271
|
||
|
|
8b1ede0af3
|
||
|
|
e9280d2ee5
|
||
|
|
54d4f1da01
|
@@ -24,16 +24,14 @@ jobs:
|
|||||||
components: clippy, rustfmt
|
components: clippy, rustfmt
|
||||||
cache: false
|
cache: false
|
||||||
|
|
||||||
|
# Ein rohes 'actions/cache' auf target/ liefert zwar einen technischen Cache-Hit (Dateien
|
||||||
|
# werden wiederhergestellt), Cargo kompiliert die Abhängigkeiten aber oft trotzdem neu:
|
||||||
|
# Der tar-basierte Restore-Vorgang setzt bei allen wiederhergestellten Dateien dieselbe
|
||||||
|
# Mtime, wodurch Cargos Fingerprinting nicht mehr zuverlässig erkennen kann, was
|
||||||
|
# älter/neuer als was ist, und sicherheitshalber alles neu baut. Swatinem/rust-cache ist
|
||||||
|
# genau dafür gebaut (u. a. gezielte Mtime-Korrektur nach dem Restore).
|
||||||
- name: Cache Cargo-Abhängigkeiten & Build-Artefakte
|
- name: Cache Cargo-Abhängigkeiten & Build-Artefakte
|
||||||
uses: actions/cache@v6
|
uses: Swatinem/rust-cache@v2
|
||||||
with:
|
|
||||||
path: |
|
|
||||||
~/.cargo/registry
|
|
||||||
~/.cargo/git
|
|
||||||
target
|
|
||||||
key: cargo-${{ runner.os }}-${{ hashFiles('Cargo.lock') }}
|
|
||||||
restore-keys: |
|
|
||||||
cargo-${{ runner.os }}-
|
|
||||||
|
|
||||||
- name: Formatierung automatisch beheben
|
- name: Formatierung automatisch beheben
|
||||||
run: cargo fmt
|
run: cargo fmt
|
||||||
|
|||||||
@@ -6,8 +6,43 @@ on:
|
|||||||
- main
|
- main
|
||||||
|
|
||||||
jobs:
|
jobs:
|
||||||
|
detect-changes:
|
||||||
|
name: Erkenne relevante Code-Änderungen
|
||||||
|
runs-on: ubuntu-latest
|
||||||
|
outputs:
|
||||||
|
code_changed: ${{ steps.filter.outputs.code }}
|
||||||
|
version_exists: ${{ steps.check-version.outputs.exists }}
|
||||||
|
steps:
|
||||||
|
- name: Checkout Repository
|
||||||
|
uses: actions/checkout@v7
|
||||||
|
|
||||||
|
- name: Prüfe auf Änderungen am Programmcode
|
||||||
|
uses: dorny/paths-filter@v4
|
||||||
|
id: filter
|
||||||
|
with:
|
||||||
|
filters: |
|
||||||
|
code:
|
||||||
|
- 'src/**'
|
||||||
|
- 'Cargo.toml'
|
||||||
|
- 'Cargo.lock'
|
||||||
|
- 'scripts/**'
|
||||||
|
- '.cargo/**'
|
||||||
|
- '.gitea/workflows/main.yaml'
|
||||||
|
|
||||||
|
- name: Prüfe ob Version bereits in der Registry existiert
|
||||||
|
id: check-version
|
||||||
|
if: steps.filter.outputs.code == 'true'
|
||||||
|
env:
|
||||||
|
GITEA_URL: ${{ gitea.server_url || github.server_url }}
|
||||||
|
REPO_OWNER: ${{ gitea.repository_owner || github.repository_owner }}
|
||||||
|
TOKEN: ${{ secrets.PACKAGE_TOKEN || secrets.RELEASE_TOKEN || secrets.PUBLISH_TOKEN || secrets.API_TOKEN || secrets.PAT_TOKEN || secrets.CUSTOM_TOKEN || secrets.GITEA_TOKEN || secrets.GITHUB_TOKEN || github.token }}
|
||||||
|
run: |
|
||||||
|
python3 scripts/check-version-published.py
|
||||||
|
|
||||||
release-and-publish:
|
release-and-publish:
|
||||||
name: Build, Publish Crate to Gitea Registry & Create Release
|
name: Build, Publish Crate to Gitea Registry & Create Release
|
||||||
|
needs: detect-changes
|
||||||
|
if: needs.detect-changes.outputs.code_changed == 'true' && needs.detect-changes.outputs.version_exists != 'true'
|
||||||
runs-on: ubuntu-latest
|
runs-on: ubuntu-latest
|
||||||
steps:
|
steps:
|
||||||
- name: Checkout Repository
|
- name: Checkout Repository
|
||||||
@@ -19,16 +54,14 @@ jobs:
|
|||||||
toolchain: stable
|
toolchain: stable
|
||||||
cache: false
|
cache: false
|
||||||
|
|
||||||
|
# Ein rohes 'actions/cache' auf target/ liefert zwar einen technischen Cache-Hit (Dateien
|
||||||
|
# werden wiederhergestellt), Cargo kompiliert die Abhängigkeiten aber oft trotzdem neu:
|
||||||
|
# Der tar-basierte Restore-Vorgang setzt bei allen wiederhergestellten Dateien dieselbe
|
||||||
|
# Mtime, wodurch Cargos Fingerprinting nicht mehr zuverlässig erkennen kann, was
|
||||||
|
# älter/neuer als was ist, und sicherheitshalber alles neu baut. Swatinem/rust-cache ist
|
||||||
|
# genau dafür gebaut (u. a. gezielte Mtime-Korrektur nach dem Restore).
|
||||||
- name: Cache Cargo-Abhängigkeiten & Build-Artefakte
|
- name: Cache Cargo-Abhängigkeiten & Build-Artefakte
|
||||||
uses: actions/cache@v6
|
uses: Swatinem/rust-cache@v2
|
||||||
with:
|
|
||||||
path: |
|
|
||||||
~/.cargo/registry
|
|
||||||
~/.cargo/git
|
|
||||||
target
|
|
||||||
key: cargo-${{ runner.os }}-${{ hashFiles('Cargo.lock') }}
|
|
||||||
restore-keys: |
|
|
||||||
cargo-${{ runner.os }}-
|
|
||||||
|
|
||||||
- name: Run Tests
|
- name: Run Tests
|
||||||
run: |
|
run: |
|
||||||
|
|||||||
@@ -9,7 +9,7 @@ jobs:
|
|||||||
renovate:
|
renovate:
|
||||||
name: Dependency-Updates prüfen & Pull Requests erstellen
|
name: Dependency-Updates prüfen & Pull Requests erstellen
|
||||||
runs-on: ubuntu-latest
|
runs-on: ubuntu-latest
|
||||||
container: ghcr.io/renovatebot/renovate:44.82.0
|
container: ghcr.io/renovatebot/renovate:44.103.6
|
||||||
steps:
|
steps:
|
||||||
- name: Renovate ausführen
|
- name: Renovate ausführen
|
||||||
run: renovate
|
run: renovate
|
||||||
@@ -19,6 +19,7 @@ jobs:
|
|||||||
RENOVATE_TOKEN: ${{ secrets.RENOVATE_TOKEN }}
|
RENOVATE_TOKEN: ${{ secrets.RENOVATE_TOKEN }}
|
||||||
RENOVATE_REPOSITORIES: ${{ gitea.repository || github.repository }}
|
RENOVATE_REPOSITORIES: ${{ gitea.repository || github.repository }}
|
||||||
RENOVATE_AUTODISCOVER: "false"
|
RENOVATE_AUTODISCOVER: "false"
|
||||||
|
RENOVATE_ALLOW_CUSTOM_CRATE_REGISTRIES: "true"
|
||||||
RENOVATE_GIT_AUTHOR: "Renovate Bot <renovate-bot@creativedragonslayer.de>"
|
RENOVATE_GIT_AUTHOR: "Renovate Bot <renovate-bot@creativedragonslayer.de>"
|
||||||
RENOVATE_HOST_RULES: >-
|
RENOVATE_HOST_RULES: >-
|
||||||
[{"hostType":"cargo","matchHost":"${{ gitea.server_url || github.server_url }}","token":"${{ secrets.RENOVATE_TOKEN }}"}]
|
[{"hostType":"cargo","matchHost":"${{ gitea.server_url || github.server_url }}","token":"${{ secrets.RENOVATE_TOKEN }}"}]
|
||||||
|
|||||||
@@ -17,7 +17,7 @@ jobs:
|
|||||||
runs-on: ubuntu-latest
|
runs-on: ubuntu-latest
|
||||||
env:
|
env:
|
||||||
TRIVY_VERSION: "0.74.0"
|
TRIVY_VERSION: "0.74.0"
|
||||||
OSV_SCANNER_VERSION: "2.5.1"
|
OSV_SCANNER_VERSION: "2.6.0"
|
||||||
steps:
|
steps:
|
||||||
- name: Checkout Repository
|
- name: Checkout Repository
|
||||||
uses: actions/checkout@v7
|
uses: actions/checkout@v7
|
||||||
|
|||||||
@@ -0,0 +1,111 @@
|
|||||||
|
name: Auto-PR (Testing → Main)
|
||||||
|
|
||||||
|
on:
|
||||||
|
push:
|
||||||
|
branches:
|
||||||
|
- testing
|
||||||
|
|
||||||
|
jobs:
|
||||||
|
create-pr:
|
||||||
|
name: Erstelle automatisch PR von testing nach main
|
||||||
|
runs-on: ubuntu-latest
|
||||||
|
steps:
|
||||||
|
- name: Checkout Repository
|
||||||
|
uses: actions/checkout@v7
|
||||||
|
with:
|
||||||
|
fetch-depth: 0
|
||||||
|
|
||||||
|
- name: Prüfe auf bereits offenen PR nach main
|
||||||
|
id: check_pr
|
||||||
|
env:
|
||||||
|
GITEA_URL: ${{ gitea.server_url || github.server_url }}
|
||||||
|
REPO: ${{ gitea.repository || github.repository }}
|
||||||
|
TOKEN: ${{ secrets.PACKAGE_TOKEN || secrets.RELEASE_TOKEN || secrets.PUBLISH_TOKEN || secrets.API_TOKEN || secrets.PAT_TOKEN || secrets.CUSTOM_TOKEN || secrets.GITEA_TOKEN || secrets.GITHUB_TOKEN || github.token }}
|
||||||
|
run: |
|
||||||
|
OPEN_PRS=$(curl -s -H "Authorization: token ${TOKEN}" "${GITEA_URL}/api/v1/repos/${REPO}/pulls?state=open&limit=50")
|
||||||
|
EXISTS=$(echo "$OPEN_PRS" | jq -r '[.[] | select(.base.ref == "main" and .head.ref == "testing")] | length')
|
||||||
|
echo "Bereits offene testing→main PRs: ${EXISTS}"
|
||||||
|
echo "exists=${EXISTS}" >> "$GITHUB_OUTPUT"
|
||||||
|
|
||||||
|
- name: Ermittle Versionen auf main & testing
|
||||||
|
id: versions
|
||||||
|
if: steps.check_pr.outputs.exists == '0'
|
||||||
|
run: |
|
||||||
|
git fetch origin main
|
||||||
|
MAIN_VERSION="$(git show origin/main:Cargo.toml | sed -n 's/^version = "\(.*\)"/\1/p' | head -n1)"
|
||||||
|
TESTING_VERSION="$(sed -n 's/^version = "\(.*\)"/\1/p' Cargo.toml | head -n1)"
|
||||||
|
echo "Version auf main: ${MAIN_VERSION} / Version auf testing: ${TESTING_VERSION}"
|
||||||
|
echo "main_version=${MAIN_VERSION}" >> "$GITHUB_OUTPUT"
|
||||||
|
echo "testing_version=${TESTING_VERSION}" >> "$GITHUB_OUTPUT"
|
||||||
|
|
||||||
|
- name: Ermittle geänderte Kategorien (main...testing)
|
||||||
|
id: categories
|
||||||
|
if: steps.check_pr.outputs.exists == '0' && steps.versions.outputs.main_version == steps.versions.outputs.testing_version
|
||||||
|
run: |
|
||||||
|
CHANGED_FILES="$(git diff --name-only origin/main...HEAD)"
|
||||||
|
echo "Geänderte Dateien main...testing:"
|
||||||
|
echo "$CHANGED_FILES"
|
||||||
|
|
||||||
|
WORKFLOWS="false"
|
||||||
|
CONFIG="false"
|
||||||
|
DOCS="false"
|
||||||
|
|
||||||
|
if echo "$CHANGED_FILES" | grep -q '^\.gitea/workflows/'; then
|
||||||
|
WORKFLOWS="true"
|
||||||
|
fi
|
||||||
|
if echo "$CHANGED_FILES" | grep -qE '^(renovate\.json|qodana\.yaml|Cargo\.toml|Cargo\.lock|\.cargo/)'; then
|
||||||
|
CONFIG="true"
|
||||||
|
fi
|
||||||
|
if echo "$CHANGED_FILES" | grep -qE '(^|/)[^/]+\.md$|^LICENSE$'; then
|
||||||
|
DOCS="true"
|
||||||
|
fi
|
||||||
|
|
||||||
|
echo "workflows=${WORKFLOWS}" >> "$GITHUB_OUTPUT"
|
||||||
|
echo "config=${CONFIG}" >> "$GITHUB_OUTPUT"
|
||||||
|
echo "docs=${DOCS}" >> "$GITHUB_OUTPUT"
|
||||||
|
|
||||||
|
- name: Bestimme PR-Titel
|
||||||
|
id: title
|
||||||
|
if: steps.check_pr.outputs.exists == '0'
|
||||||
|
run: |
|
||||||
|
if [ "${{ steps.versions.outputs.main_version }}" != "${{ steps.versions.outputs.testing_version }}" ]; then
|
||||||
|
TITLE="Merge testing in main: Release ${{ steps.versions.outputs.testing_version }}"
|
||||||
|
else
|
||||||
|
PARTS=()
|
||||||
|
[ "${{ steps.categories.outputs.workflows }}" = "true" ] && PARTS+=("Workflows")
|
||||||
|
[ "${{ steps.categories.outputs.config }}" = "true" ] && PARTS+=("Konfigurationen")
|
||||||
|
[ "${{ steps.categories.outputs.docs }}" = "true" ] && PARTS+=("Dokumentation")
|
||||||
|
|
||||||
|
if [ ${#PARTS[@]} -eq 0 ]; then
|
||||||
|
TITLE="Merge testing in main"
|
||||||
|
else
|
||||||
|
JOINED=""
|
||||||
|
for PART in "${PARTS[@]}"; do
|
||||||
|
if [ -z "$JOINED" ]; then
|
||||||
|
JOINED="$PART"
|
||||||
|
else
|
||||||
|
JOINED="${JOINED} & ${PART}"
|
||||||
|
fi
|
||||||
|
done
|
||||||
|
TITLE="Merge testing in main: ${JOINED} aktualisiert"
|
||||||
|
fi
|
||||||
|
fi
|
||||||
|
echo "Ermittelter PR-Titel: ${TITLE}"
|
||||||
|
echo "title=${TITLE}" >> "$GITHUB_OUTPUT"
|
||||||
|
|
||||||
|
- name: Erstelle PR (testing -> main)
|
||||||
|
if: steps.check_pr.outputs.exists == '0'
|
||||||
|
env:
|
||||||
|
GITEA_URL: ${{ gitea.server_url || github.server_url }}
|
||||||
|
REPO: ${{ gitea.repository || github.repository }}
|
||||||
|
TOKEN: ${{ secrets.PACKAGE_TOKEN || secrets.RELEASE_TOKEN || secrets.PUBLISH_TOKEN || secrets.API_TOKEN || secrets.PAT_TOKEN || secrets.CUSTOM_TOKEN || secrets.GITEA_TOKEN || secrets.GITHUB_TOKEN || github.token }}
|
||||||
|
TITLE: ${{ steps.title.outputs.title }}
|
||||||
|
run: |
|
||||||
|
PAYLOAD=$(jq -n --arg title "$TITLE" --arg head "testing" --arg base "main" \
|
||||||
|
'{title: $title, head: $head, base: $base}')
|
||||||
|
curl -f -s -S -X POST \
|
||||||
|
-H "Authorization: token ${TOKEN}" \
|
||||||
|
-H "Content-Type: application/json" \
|
||||||
|
-d "$PAYLOAD" \
|
||||||
|
"${GITEA_URL}/api/v1/repos/${REPO}/pulls"
|
||||||
|
echo "PR erstellt: ${TITLE}"
|
||||||
@@ -6,8 +6,32 @@ on:
|
|||||||
- testing
|
- testing
|
||||||
|
|
||||||
jobs:
|
jobs:
|
||||||
|
detect-changes:
|
||||||
|
name: Erkenne relevante Code-Änderungen
|
||||||
|
runs-on: ubuntu-latest
|
||||||
|
outputs:
|
||||||
|
code_changed: ${{ steps.filter.outputs.code }}
|
||||||
|
steps:
|
||||||
|
- name: Checkout Repository
|
||||||
|
uses: actions/checkout@v7
|
||||||
|
|
||||||
|
- name: Prüfe auf Änderungen am Programmcode
|
||||||
|
uses: dorny/paths-filter@v4
|
||||||
|
id: filter
|
||||||
|
with:
|
||||||
|
filters: |
|
||||||
|
code:
|
||||||
|
- 'src/**'
|
||||||
|
- 'Cargo.toml'
|
||||||
|
- 'Cargo.lock'
|
||||||
|
- 'scripts/**'
|
||||||
|
- '.cargo/**'
|
||||||
|
- '.gitea/workflows/testing.yaml'
|
||||||
|
|
||||||
build-and-preview:
|
build-and-preview:
|
||||||
name: Build, Check & Create Preview Release
|
name: Build, Check & Create Preview Release
|
||||||
|
needs: detect-changes
|
||||||
|
if: needs.detect-changes.outputs.code_changed == 'true'
|
||||||
runs-on: ubuntu-latest
|
runs-on: ubuntu-latest
|
||||||
steps:
|
steps:
|
||||||
- name: Checkout Repository
|
- name: Checkout Repository
|
||||||
@@ -19,16 +43,14 @@ jobs:
|
|||||||
toolchain: stable
|
toolchain: stable
|
||||||
cache: false
|
cache: false
|
||||||
|
|
||||||
|
# Ein rohes 'actions/cache' auf target/ liefert zwar einen technischen Cache-Hit (Dateien
|
||||||
|
# werden wiederhergestellt), Cargo kompiliert die Abhängigkeiten aber oft trotzdem neu:
|
||||||
|
# Der tar-basierte Restore-Vorgang setzt bei allen wiederhergestellten Dateien dieselbe
|
||||||
|
# Mtime, wodurch Cargos Fingerprinting nicht mehr zuverlässig erkennen kann, was
|
||||||
|
# älter/neuer als was ist, und sicherheitshalber alles neu baut. Swatinem/rust-cache ist
|
||||||
|
# genau dafür gebaut (u. a. gezielte Mtime-Korrektur nach dem Restore).
|
||||||
- name: Cache Cargo-Abhängigkeiten & Build-Artefakte
|
- name: Cache Cargo-Abhängigkeiten & Build-Artefakte
|
||||||
uses: actions/cache@v6
|
uses: Swatinem/rust-cache@v2
|
||||||
with:
|
|
||||||
path: |
|
|
||||||
~/.cargo/registry
|
|
||||||
~/.cargo/git
|
|
||||||
target
|
|
||||||
key: cargo-${{ runner.os }}-${{ hashFiles('Cargo.lock') }}
|
|
||||||
restore-keys: |
|
|
||||||
cargo-${{ runner.os }}-
|
|
||||||
|
|
||||||
- name: Run Tests
|
- name: Run Tests
|
||||||
run: |
|
run: |
|
||||||
|
|||||||
@@ -12,7 +12,7 @@ jobs:
|
|||||||
name: TruffleHog
|
name: TruffleHog
|
||||||
runs-on: ubuntu-latest
|
runs-on: ubuntu-latest
|
||||||
env:
|
env:
|
||||||
TRUFFLEHOG_VERSION: "3.97.4"
|
TRUFFLEHOG_VERSION: "3.97.5"
|
||||||
steps:
|
steps:
|
||||||
- name: Checkout Repository
|
- name: Checkout Repository
|
||||||
uses: actions/checkout@v7
|
uses: actions/checkout@v7
|
||||||
|
|||||||
@@ -8,6 +8,7 @@ on:
|
|||||||
- reopened
|
- reopened
|
||||||
branches:
|
branches:
|
||||||
- testing
|
- testing
|
||||||
|
- dev
|
||||||
|
|
||||||
jobs:
|
jobs:
|
||||||
test:
|
test:
|
||||||
@@ -23,16 +24,14 @@ jobs:
|
|||||||
toolchain: stable
|
toolchain: stable
|
||||||
cache: false
|
cache: false
|
||||||
|
|
||||||
|
# Ein rohes 'actions/cache' auf target/ liefert zwar einen technischen Cache-Hit (Dateien
|
||||||
|
# werden wiederhergestellt), Cargo kompiliert die Abhängigkeiten aber oft trotzdem neu:
|
||||||
|
# Der tar-basierte Restore-Vorgang setzt bei allen wiederhergestellten Dateien dieselbe
|
||||||
|
# Mtime, wodurch Cargos Fingerprinting nicht mehr zuverlässig erkennen kann, was
|
||||||
|
# älter/neuer als was ist, und sicherheitshalber alles neu baut. Swatinem/rust-cache ist
|
||||||
|
# genau dafür gebaut (u. a. gezielte Mtime-Korrektur nach dem Restore).
|
||||||
- name: Cache Cargo-Abhängigkeiten & Build-Artefakte
|
- name: Cache Cargo-Abhängigkeiten & Build-Artefakte
|
||||||
uses: actions/cache@v6
|
uses: Swatinem/rust-cache@v2
|
||||||
with:
|
|
||||||
path: |
|
|
||||||
~/.cargo/registry
|
|
||||||
~/.cargo/git
|
|
||||||
target
|
|
||||||
key: cargo-${{ runner.os }}-${{ hashFiles('Cargo.lock') }}
|
|
||||||
restore-keys: |
|
|
||||||
cargo-${{ runner.os }}-
|
|
||||||
|
|
||||||
- name: Run Tests
|
- name: Run Tests
|
||||||
run: cargo test
|
run: cargo test
|
||||||
|
|||||||
@@ -0,0 +1,84 @@
|
|||||||
|
name: Auto Patch-Version-Bump (Dev → Testing PR)
|
||||||
|
|
||||||
|
on:
|
||||||
|
pull_request:
|
||||||
|
types: [opened]
|
||||||
|
branches:
|
||||||
|
- testing
|
||||||
|
|
||||||
|
jobs:
|
||||||
|
detect-changes:
|
||||||
|
name: Erkenne relevante Änderungen im PR
|
||||||
|
runs-on: ubuntu-latest
|
||||||
|
if: ${{ (gitea.head_ref || github.head_ref) == 'dev' }}
|
||||||
|
outputs:
|
||||||
|
code_changed: ${{ steps.filter.outputs.code }}
|
||||||
|
steps:
|
||||||
|
- name: Checkout Dev-Branch (PR-Head)
|
||||||
|
uses: actions/checkout@v7
|
||||||
|
with:
|
||||||
|
ref: ${{ gitea.head_ref || github.head_ref }}
|
||||||
|
fetch-depth: 0
|
||||||
|
|
||||||
|
- name: Prüfe auf Änderungen an Cargo.toml, Cargo.lock oder src/
|
||||||
|
uses: dorny/paths-filter@v4
|
||||||
|
id: filter
|
||||||
|
with:
|
||||||
|
base: ${{ gitea.base_ref || github.base_ref }}
|
||||||
|
filters: |
|
||||||
|
code:
|
||||||
|
- 'Cargo.toml'
|
||||||
|
- 'Cargo.lock'
|
||||||
|
- 'src/**'
|
||||||
|
|
||||||
|
bump-version:
|
||||||
|
name: Patch-Version erhöhen & auf Dev pushen
|
||||||
|
needs: detect-changes
|
||||||
|
if: needs.detect-changes.outputs.code_changed == 'true'
|
||||||
|
runs-on: ubuntu-latest
|
||||||
|
steps:
|
||||||
|
- name: Checkout Dev-Branch (PR-Head)
|
||||||
|
uses: actions/checkout@v7
|
||||||
|
with:
|
||||||
|
ref: ${{ gitea.head_ref || github.head_ref }}
|
||||||
|
fetch-depth: 0
|
||||||
|
token: ${{ secrets.PACKAGE_TOKEN || secrets.RELEASE_TOKEN || secrets.PUBLISH_TOKEN || secrets.API_TOKEN || secrets.PAT_TOKEN || secrets.CUSTOM_TOKEN || secrets.GITEA_TOKEN || secrets.GITHUB_TOKEN || github.token }}
|
||||||
|
|
||||||
|
- name: Ermittle Cargo-Version auf testing & dev
|
||||||
|
id: versions
|
||||||
|
run: |
|
||||||
|
git fetch origin testing --depth=1
|
||||||
|
TESTING_VERSION="$(git show origin/testing:Cargo.toml | sed -n 's/^version = "\(.*\)"/\1/p' | head -n1)"
|
||||||
|
DEV_VERSION="$(sed -n 's/^version = "\(.*\)"/\1/p' Cargo.toml | head -n1)"
|
||||||
|
echo "Version auf testing: ${TESTING_VERSION} / Version auf dev: ${DEV_VERSION}"
|
||||||
|
echo "testing_version=${TESTING_VERSION}" >> "$GITHUB_OUTPUT"
|
||||||
|
echo "dev_version=${DEV_VERSION}" >> "$GITHUB_OUTPUT"
|
||||||
|
|
||||||
|
- name: Patch-Version um 1 erhöhen (Cargo.toml & Cargo.lock)
|
||||||
|
if: steps.versions.outputs.testing_version == steps.versions.outputs.dev_version
|
||||||
|
run: |
|
||||||
|
VERSION="${{ steps.versions.outputs.dev_version }}"
|
||||||
|
MAJOR="$(echo "$VERSION" | cut -d. -f1)"
|
||||||
|
MINOR="$(echo "$VERSION" | cut -d. -f2)"
|
||||||
|
PATCH="$(echo "$VERSION" | cut -d. -f3)"
|
||||||
|
NEW_VERSION="${MAJOR}.${MINOR}.$((PATCH + 1))"
|
||||||
|
echo "Erhöhe Version: ${VERSION} -> ${NEW_VERSION}"
|
||||||
|
|
||||||
|
sed -i "0,/^version = \"${VERSION}\"/s//version = \"${NEW_VERSION}\"/" Cargo.toml
|
||||||
|
|
||||||
|
PACKAGE_NAME="$(sed -n 's/^name = "\(.*\)"/\1/p' Cargo.toml | head -n1)"
|
||||||
|
awk -v new="$NEW_VERSION" -v pkg="$PACKAGE_NAME" '
|
||||||
|
found_name && /^version = "/ {
|
||||||
|
print "version = \"" new "\""
|
||||||
|
found_name = 0
|
||||||
|
next
|
||||||
|
}
|
||||||
|
$0 == "name = \"" pkg "\"" { found_name = 1 }
|
||||||
|
{ print }
|
||||||
|
' Cargo.lock > Cargo.lock.tmp && mv Cargo.lock.tmp Cargo.lock
|
||||||
|
|
||||||
|
git config user.name "Gitea-Bot"
|
||||||
|
git config user.email "no-reply@creativedragonslayer.de"
|
||||||
|
git add Cargo.toml Cargo.lock
|
||||||
|
git commit -m "Chore: Erhöht Patch-Version auf ${NEW_VERSION} für Promotion nach testing"
|
||||||
|
git push origin HEAD:${{ gitea.head_ref || github.head_ref }}
|
||||||
Generated
+1
@@ -4,6 +4,7 @@
|
|||||||
<content url="file://$MODULE_DIR$">
|
<content url="file://$MODULE_DIR$">
|
||||||
<sourceFolder url="file://$MODULE_DIR$/src" isTestSource="false" />
|
<sourceFolder url="file://$MODULE_DIR$/src" isTestSource="false" />
|
||||||
<sourceFolder url="file://$MODULE_DIR$/tests" isTestSource="true" />
|
<sourceFolder url="file://$MODULE_DIR$/tests" isTestSource="true" />
|
||||||
|
<sourceFolder url="file://$MODULE_DIR$/examples" isTestSource="false" />
|
||||||
<excludeFolder url="file://$MODULE_DIR$/target" />
|
<excludeFolder url="file://$MODULE_DIR$/target" />
|
||||||
</content>
|
</content>
|
||||||
<orderEntry type="inheritedJdk" />
|
<orderEntry type="inheritedJdk" />
|
||||||
|
|||||||
Generated
+3
-3
@@ -16,7 +16,7 @@ checksum = "3eaf3ede3fee6db1a4c2ee091bf8a8b4dccdc6d17f656fb07896ee72867612f2"
|
|||||||
|
|
||||||
[[package]]
|
[[package]]
|
||||||
name = "logger-ctdra"
|
name = "logger-ctdra"
|
||||||
version = "1.0.4"
|
version = "1.0.5"
|
||||||
dependencies = [
|
dependencies = [
|
||||||
"program-ctdra",
|
"program-ctdra",
|
||||||
"time",
|
"time",
|
||||||
@@ -54,9 +54,9 @@ dependencies = [
|
|||||||
|
|
||||||
[[package]]
|
[[package]]
|
||||||
name = "program-ctdra"
|
name = "program-ctdra"
|
||||||
version = "1.0.0"
|
version = "1.0.1"
|
||||||
source = "sparse+https://gitea.creative-dragonslayer.de/api/packages/Rust-Crates/cargo/"
|
source = "sparse+https://gitea.creative-dragonslayer.de/api/packages/Rust-Crates/cargo/"
|
||||||
checksum = "54f20af67f90bf6d10697dd77bb4beb41dafad7fe0fb46aacfc81ad45a8e48bd"
|
checksum = "528d5771916f74bdffb77ad60ea00c0ae4bd85f9a84e920cd65730a082133d67"
|
||||||
|
|
||||||
[[package]]
|
[[package]]
|
||||||
name = "quote"
|
name = "quote"
|
||||||
|
|||||||
+1
-1
@@ -1,6 +1,6 @@
|
|||||||
[package]
|
[package]
|
||||||
name = "logger-ctdra"
|
name = "logger-ctdra"
|
||||||
version = "1.0.4"
|
version = "1.0.5"
|
||||||
edition = "2024"
|
edition = "2024"
|
||||||
authors = ['DragonSlayer_14']
|
authors = ['DragonSlayer_14']
|
||||||
readme = "README.md"
|
readme = "README.md"
|
||||||
|
|||||||
@@ -10,6 +10,7 @@
|
|||||||
- `Warn` (2) — Warnungen (Ausgabe auf `stdout` mit `[?]`-Präfix)
|
- `Warn` (2) — Warnungen (Ausgabe auf `stdout` mit `[?]`-Präfix)
|
||||||
- `Info` (3) — Betriebsinformationen (Ausgabe auf `stdout` mit `[i]`-Präfix)
|
- `Info` (3) — Betriebsinformationen (Ausgabe auf `stdout` mit `[i]`-Präfix)
|
||||||
- `Debug` (4) — Diagnoseausgaben (Ausgabe auf `stdout` mit `[d]`-Präfix)
|
- `Debug` (4) — Diagnoseausgaben (Ausgabe auf `stdout` mit `[d]`-Präfix)
|
||||||
|
- **Farbige Terminalausgabe**: Jede Zeile wird je nach Schweregrad eingefärbt (`Error` rot, `Warn` gelb, `Info` grün, `Debug` cyan). Farben werden nur ausgegeben, wenn `stdout`/`stderr` ein echtes Terminal ist (keine Umleitung in Datei/Pipe), `NO_COLOR` nicht gesetzt ist und `TERM` nicht `dumb` ist. Die Logdatei enthält stets reinen Text ohne ANSI-Codes.
|
||||||
- **Threadsicherheit**: Dateischreibzugriffe und Konfiguration sind thread-sicher serialisiert.
|
- **Threadsicherheit**: Dateischreibzugriffe und Konfiguration sind thread-sicher serialisiert.
|
||||||
- **Einheitliches Format**: `[Präfix][DD.MM.YYYY HH:MM:SS.mmm][LEVEL][Tag]: Nachricht`
|
- **Einheitliches Format**: `[Präfix][DD.MM.YYYY HH:MM:SS.mmm][LEVEL][Tag]: Nachricht`
|
||||||
- **Flexible Konfiguration**:
|
- **Flexible Konfiguration**:
|
||||||
|
|||||||
+35
-6
@@ -1,30 +1,59 @@
|
|||||||
{
|
{
|
||||||
"$schema": "https://docs.renovatebot.com/renovate-schema.json",
|
"$schema": "https://docs.renovatebot.com/renovate-schema.json",
|
||||||
"extends": ["config:recommended"],
|
"extends": [
|
||||||
|
"config:recommended"
|
||||||
|
],
|
||||||
"timezone": "Europe/Berlin",
|
"timezone": "Europe/Berlin",
|
||||||
"schedule": ["before 6am on monday"],
|
"schedule": [
|
||||||
"allowCustomCrateRegistries": true,
|
"before 6am"
|
||||||
|
],
|
||||||
"baseBranchPatterns": [
|
"baseBranchPatterns": [
|
||||||
"dev"
|
"dev"
|
||||||
],
|
],
|
||||||
"packageRules": [
|
"packageRules": [
|
||||||
{
|
{
|
||||||
"matchFileNames": [".gitea/workflows/**"],
|
"matchFileNames": [
|
||||||
|
".gitea/workflows/**"
|
||||||
|
],
|
||||||
"groupName": "Gitea Actions",
|
"groupName": "Gitea Actions",
|
||||||
"separateMajorMinor": false,
|
"separateMajorMinor": false,
|
||||||
"separateMinorPatch": false
|
"separateMinorPatch": false
|
||||||
},
|
},
|
||||||
{
|
{
|
||||||
"matchManagers": ["cargo"],
|
"matchManagers": [
|
||||||
|
"cargo"
|
||||||
|
],
|
||||||
"groupName": "Cargo Dependencies",
|
"groupName": "Cargo Dependencies",
|
||||||
"separateMajorMinor": false,
|
"separateMajorMinor": false,
|
||||||
"separateMinorPatch": false
|
"separateMinorPatch": false
|
||||||
},
|
},
|
||||||
{
|
{
|
||||||
"matchManagers": ["dockerfile", "docker-compose"],
|
"matchManagers": [
|
||||||
|
"dockerfile",
|
||||||
|
"docker-compose"
|
||||||
|
],
|
||||||
"groupName": "Docker-Images",
|
"groupName": "Docker-Images",
|
||||||
"separateMajorMinor": false,
|
"separateMajorMinor": false,
|
||||||
"separateMinorPatch": false
|
"separateMinorPatch": false
|
||||||
|
},
|
||||||
|
{
|
||||||
|
"description": "Patch-/Minor-/Digest-Updates automatisch mergen, sobald alle CI-Checks (inkl. Unit-Tests) erfolgreich sind - Major-Updates sind unten explizit ausgenommen (siehe nächste Regel).",
|
||||||
|
"matchUpdateTypes": [
|
||||||
|
"patch",
|
||||||
|
"minor",
|
||||||
|
"digest",
|
||||||
|
"lockFileMaintenance"
|
||||||
|
],
|
||||||
|
"automerge": true,
|
||||||
|
"automergeType": "pr",
|
||||||
|
"platformAutomerge": true
|
||||||
|
},
|
||||||
|
{
|
||||||
|
"description": "Major-Updates immer manuell prüfen, da potenziell brechende Änderungen.",
|
||||||
|
"matchUpdateTypes": [
|
||||||
|
"major"
|
||||||
|
],
|
||||||
|
"automerge": false
|
||||||
}
|
}
|
||||||
],
|
],
|
||||||
"customManagers": [
|
"customManagers": [
|
||||||
|
|||||||
@@ -0,0 +1,62 @@
|
|||||||
|
#!/usr/bin/env python3
|
||||||
|
"""Prüft, ob die aktuelle Crate-Version bereits in der Gitea Cargo-Registry existiert.
|
||||||
|
|
||||||
|
Liest Name und Version aus Cargo.toml und fragt die Gitea Package-API ab.
|
||||||
|
Das Ergebnis wird als Step-Output "exists" (true/false) in GITHUB_OUTPUT
|
||||||
|
geschrieben, damit der Release/Publish-Job komplett übersprungen werden kann,
|
||||||
|
statt erst nach Build & Tests an einem "Version existiert bereits"-Fehler der
|
||||||
|
Registry zu scheitern.
|
||||||
|
"""
|
||||||
|
|
||||||
|
import os
|
||||||
|
import re
|
||||||
|
import urllib.error
|
||||||
|
import urllib.request
|
||||||
|
|
||||||
|
|
||||||
|
def read_cargo_field(field, path="Cargo.toml"):
|
||||||
|
pattern = re.compile(rf'^{field}\s*=\s*"(.*)"')
|
||||||
|
with open(path) as f:
|
||||||
|
for line in f:
|
||||||
|
match = pattern.match(line.strip())
|
||||||
|
if match:
|
||||||
|
return match.group(1)
|
||||||
|
raise SystemExit(f"Feld '{field}' nicht in {path} gefunden.")
|
||||||
|
|
||||||
|
|
||||||
|
def version_exists(gitea_url, owner, name, version, token):
|
||||||
|
url = f"{gitea_url}/api/v1/packages/{owner}/cargo/{name}/{version}"
|
||||||
|
req = urllib.request.Request(url, method="GET")
|
||||||
|
req.add_header("Authorization", f"token {token}")
|
||||||
|
try:
|
||||||
|
with urllib.request.urlopen(req, timeout=10) as resp:
|
||||||
|
return resp.status == 200
|
||||||
|
except urllib.error.HTTPError as e:
|
||||||
|
if e.code == 404:
|
||||||
|
return False
|
||||||
|
raise
|
||||||
|
|
||||||
|
|
||||||
|
def main():
|
||||||
|
gitea_url = os.environ["GITEA_URL"].strip().rstrip("/")
|
||||||
|
owner = os.environ["REPO_OWNER"].strip()
|
||||||
|
token = os.environ["TOKEN"].strip()
|
||||||
|
github_output = os.environ["GITHUB_OUTPUT"]
|
||||||
|
|
||||||
|
name = read_cargo_field("name")
|
||||||
|
version = read_cargo_field("version")
|
||||||
|
|
||||||
|
print(f"Prüfe {name}@{version} in der Gitea Cargo Registry...")
|
||||||
|
exists = version_exists(gitea_url, owner, name, version, token)
|
||||||
|
|
||||||
|
if exists:
|
||||||
|
print(f"Version {version} existiert bereits in der Registry. Release/Publish wird übersprungen.")
|
||||||
|
else:
|
||||||
|
print(f"Version {version} ist neu.")
|
||||||
|
|
||||||
|
with open(github_output, "a") as f:
|
||||||
|
f.write(f"exists={'true' if exists else 'false'}\n")
|
||||||
|
|
||||||
|
|
||||||
|
if __name__ == "__main__":
|
||||||
|
main()
|
||||||
+34
-1
@@ -24,7 +24,7 @@
|
|||||||
use std::env;
|
use std::env;
|
||||||
use std::fmt::{Display, Formatter};
|
use std::fmt::{Display, Formatter};
|
||||||
use std::fs::{File, OpenOptions, create_dir_all};
|
use std::fs::{File, OpenOptions, create_dir_all};
|
||||||
use std::io::Write;
|
use std::io::{IsTerminal, Write};
|
||||||
use std::path::PathBuf;
|
use std::path::PathBuf;
|
||||||
use std::str::FromStr;
|
use std::str::FromStr;
|
||||||
use std::sync::atomic::{AtomicU8, Ordering};
|
use std::sync::atomic::{AtomicU8, Ordering};
|
||||||
@@ -156,6 +156,33 @@ pub fn set_log_dir(path: impl Into<PathBuf>) {
|
|||||||
}
|
}
|
||||||
}
|
}
|
||||||
|
|
||||||
|
/// ANSI-Escape-Sequenz zum Zurücksetzen der Textfarbe.
|
||||||
|
const ANSI_RESET: &str = "\x1b[0m";
|
||||||
|
|
||||||
|
/// Liefert die ANSI-Farbsequenz für den jeweiligen Schweregrad.
|
||||||
|
///
|
||||||
|
/// Farben: `Error` -> Rot, `Warn` -> Gelb, `Info` -> Grün, `Debug` -> Cyan.
|
||||||
|
fn ansi_color(log_level: &LogLevel) -> &'static str {
|
||||||
|
match log_level {
|
||||||
|
LogLevel::Error => "\x1b[31m",
|
||||||
|
LogLevel::Warn => "\x1b[33m",
|
||||||
|
LogLevel::Info => "\x1b[32m",
|
||||||
|
LogLevel::Debug => "\x1b[36m",
|
||||||
|
}
|
||||||
|
}
|
||||||
|
|
||||||
|
/// Prüft, ob Farbausgabe für den gegebenen Stream sinnvoll ist.
|
||||||
|
///
|
||||||
|
/// Voraussetzungen:
|
||||||
|
/// - Der Stream muss ein echtes Terminal sein (`is_terminal`), keine Umleitung in eine Datei oder Pipe.
|
||||||
|
/// - Die Umgebungsvariable `NO_COLOR` darf nicht gesetzt sein (siehe <https://no-color.org/>).
|
||||||
|
/// - `TERM` darf nicht auf `dumb` stehen.
|
||||||
|
fn color_supported(stream_is_terminal: bool) -> bool {
|
||||||
|
stream_is_terminal
|
||||||
|
&& env::var_os("NO_COLOR").is_none()
|
||||||
|
&& env::var("TERM").map(|term| term != "dumb").unwrap_or(true)
|
||||||
|
}
|
||||||
|
|
||||||
/// Formatiert eine Lognachricht mit Zeitstempel, Level, Tag und Präfix.
|
/// Formatiert eine Lognachricht mit Zeitstempel, Level, Tag und Präfix.
|
||||||
///
|
///
|
||||||
/// Format:
|
/// Format:
|
||||||
@@ -224,7 +251,13 @@ pub fn log(tag: &str, message: &str, log_level: LogLevel) {
|
|||||||
let formatted = format_message(tag, message, &log_level);
|
let formatted = format_message(tag, message, &log_level);
|
||||||
|
|
||||||
if log_level == LogLevel::Error {
|
if log_level == LogLevel::Error {
|
||||||
|
if color_supported(std::io::stderr().is_terminal()) {
|
||||||
|
eprintln!("{}{}{}", ansi_color(&log_level), formatted, ANSI_RESET);
|
||||||
|
} else {
|
||||||
eprintln!("{}", formatted);
|
eprintln!("{}", formatted);
|
||||||
|
}
|
||||||
|
} else if color_supported(std::io::stdout().is_terminal()) {
|
||||||
|
println!("{}{}{}", ansi_color(&log_level), formatted, ANSI_RESET);
|
||||||
} else {
|
} else {
|
||||||
println!("{}", formatted);
|
println!("{}", formatted);
|
||||||
}
|
}
|
||||||
|
|||||||
Reference in New Issue
Block a user