Compare commits
24
Commits
| Author | SHA1 | Date | |
|---|---|---|---|
|
|
c57d2da457
|
||
|
|
a14264b541
|
||
|
|
b70db3d434
|
||
|
|
5d15c15cb0
|
||
|
|
91189e0cfc
|
||
|
|
ec1066a56d
|
||
|
|
56e8c5c8a3
|
||
|
|
b96e4a62a6
|
||
|
|
e216dd07c8
|
||
|
|
22515c4fc5
|
||
|
|
490b8731a7
|
||
|
|
d799935f26
|
||
|
|
844b5fcd43
|
||
|
|
d77d76a421 | ||
|
|
5f1cdb3a9c
|
||
|
|
be92ae4fc4 | ||
|
|
1e2d4cf187
|
||
|
|
bd8e8c1550
|
||
|
|
7bf0e52271
|
||
|
|
8b1ede0af3
|
||
|
|
4f6a05dd3b
|
||
|
|
2bd85e61bf
|
||
|
|
c34f094569
|
||
|
|
84e6796455
|
@@ -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
|
||||||
|
|||||||
@@ -54,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: |
|
||||||
|
|||||||
@@ -0,0 +1,91 @@
|
|||||||
|
name: Nightly Auto-Merge (Dev → Nightly)
|
||||||
|
|
||||||
|
on:
|
||||||
|
schedule:
|
||||||
|
# Gitea Actions interpretiert 'schedule'-Cron standardmaessig in der lokalen
|
||||||
|
# Zeitzone des Gitea-Servers (anders als GitHub Actions, das immer UTC nutzt).
|
||||||
|
# Das CRON_TZ-Praefix ist eine Gitea-Erweiterung und legt die Zeitzone explizit
|
||||||
|
# und DST-sicher fest, unabhaengig von der Server-Konfiguration.
|
||||||
|
- cron: "CRON_TZ=Europe/Berlin 0 9 * * *"
|
||||||
|
workflow_dispatch:
|
||||||
|
|
||||||
|
jobs:
|
||||||
|
merge-dev-into-nightly:
|
||||||
|
name: Erstelle & merge automatisch PR von dev nach nightly
|
||||||
|
runs-on: ubuntu-latest
|
||||||
|
steps:
|
||||||
|
- name: Checkout Repository
|
||||||
|
uses: actions/checkout@v7
|
||||||
|
with:
|
||||||
|
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: Stelle sicher, dass der nightly-Branch existiert
|
||||||
|
run: |
|
||||||
|
git fetch origin dev
|
||||||
|
if git ls-remote --exit-code --heads origin nightly > /dev/null 2>&1; then
|
||||||
|
echo "nightly-Branch existiert bereits."
|
||||||
|
else
|
||||||
|
echo "nightly-Branch existiert noch nicht, erstelle ihn initial von dev..."
|
||||||
|
git push origin origin/dev:refs/heads/nightly
|
||||||
|
fi
|
||||||
|
|
||||||
|
- name: Prüfe auf Unterschiede zwischen dev und nightly
|
||||||
|
id: diff
|
||||||
|
run: |
|
||||||
|
git fetch origin nightly
|
||||||
|
if git diff --quiet origin/nightly origin/dev; then
|
||||||
|
echo "Keine Unterschiede zwischen dev und nightly, überspringe."
|
||||||
|
echo "has_changes=false" >> "$GITHUB_OUTPUT"
|
||||||
|
else
|
||||||
|
echo "has_changes=true" >> "$GITHUB_OUTPUT"
|
||||||
|
fi
|
||||||
|
|
||||||
|
- name: Prüfe auf bereits offenen PR nach nightly
|
||||||
|
id: check_pr
|
||||||
|
if: steps.diff.outputs.has_changes == 'true'
|
||||||
|
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")
|
||||||
|
PR_NUMBER=$(echo "$OPEN_PRS" | jq -r '[.[] | select(.base.ref == "nightly" and .head.ref == "dev")][0].number // empty')
|
||||||
|
echo "Bereits offener dev→nightly PR: ${PR_NUMBER:-keiner}"
|
||||||
|
echo "pr_number=${PR_NUMBER}" >> "$GITHUB_OUTPUT"
|
||||||
|
|
||||||
|
- name: Erstelle PR (dev -> nightly)
|
||||||
|
id: create_pr
|
||||||
|
if: steps.diff.outputs.has_changes == 'true' && steps.check_pr.outputs.pr_number == ''
|
||||||
|
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: |
|
||||||
|
DATE="$(date -u +%Y-%m-%d)"
|
||||||
|
PAYLOAD=$(jq -n --arg title "Nightly-Build: Merge dev in nightly (${DATE})" --arg head "dev" --arg base "nightly" \
|
||||||
|
'{title: $title, head: $head, base: $base}')
|
||||||
|
RESP=$(curl -f -s -S -X POST \
|
||||||
|
-H "Authorization: token ${TOKEN}" \
|
||||||
|
-H "Content-Type: application/json" \
|
||||||
|
-d "$PAYLOAD" \
|
||||||
|
"${GITEA_URL}/api/v1/repos/${REPO}/pulls")
|
||||||
|
PR_NUMBER=$(echo "$RESP" | jq -r '.number')
|
||||||
|
echo "PR #${PR_NUMBER} erstellt."
|
||||||
|
echo "pr_number=${PR_NUMBER}" >> "$GITHUB_OUTPUT"
|
||||||
|
|
||||||
|
- name: Merge PR automatisch
|
||||||
|
if: steps.diff.outputs.has_changes == 'true'
|
||||||
|
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 }}
|
||||||
|
PR_NUMBER: ${{ steps.create_pr.outputs.pr_number || steps.check_pr.outputs.pr_number }}
|
||||||
|
run: |
|
||||||
|
echo "Merge PR #${PR_NUMBER} automatisch (dev -> nightly)..."
|
||||||
|
curl -f -s -S -X POST \
|
||||||
|
-H "Authorization: token ${TOKEN}" \
|
||||||
|
-H "Content-Type: application/json" \
|
||||||
|
-d '{"Do": "merge"}' \
|
||||||
|
"${GITEA_URL}/api/v1/repos/${REPO}/pulls/${PR_NUMBER}/merge"
|
||||||
|
echo "PR #${PR_NUMBER} erfolgreich gemerged."
|
||||||
@@ -0,0 +1,97 @@
|
|||||||
|
name: Nightly Build & Publish
|
||||||
|
|
||||||
|
on:
|
||||||
|
push:
|
||||||
|
branches:
|
||||||
|
- nightly
|
||||||
|
|
||||||
|
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/nightly.yaml'
|
||||||
|
|
||||||
|
build-and-publish:
|
||||||
|
name: Build & Publish Nightly-Crate zur Gitea Registry
|
||||||
|
needs: detect-changes
|
||||||
|
if: needs.detect-changes.outputs.code_changed == 'true'
|
||||||
|
runs-on: ubuntu-latest
|
||||||
|
steps:
|
||||||
|
- name: Checkout Repository
|
||||||
|
uses: actions/checkout@v7
|
||||||
|
|
||||||
|
- name: Install Rust Toolchain
|
||||||
|
uses: actions-rust-lang/setup-rust-toolchain@v2
|
||||||
|
with:
|
||||||
|
toolchain: stable
|
||||||
|
cache: false
|
||||||
|
|
||||||
|
- name: Cache Cargo-Abhängigkeiten & Build-Artefakte
|
||||||
|
uses: Swatinem/rust-cache@v2
|
||||||
|
|
||||||
|
- name: Run Tests
|
||||||
|
run: |
|
||||||
|
cargo test
|
||||||
|
|
||||||
|
- name: Compiler Check
|
||||||
|
run: |
|
||||||
|
cargo check --all-targets
|
||||||
|
|
||||||
|
# Nightly-Builds duerfen nie als regulaeres Update erscheinen: Ein SemVer-Pre-Release-
|
||||||
|
# Suffix (-nightly.<Zeitstempel>) sorgt dafuer, dass Renovates Standardverhalten
|
||||||
|
# (ignoreUnstable: true) diese Version automatisch ignoriert, solange die Basis-Version
|
||||||
|
# in Cargo.toml selbst kein Pre-Release ist. Die Aenderung ist rein fuer den Build-
|
||||||
|
# Workspace bestimmt und wird nie zurueck in den Branch committet.
|
||||||
|
- name: Ermittle & setze Nightly-Version (temporär, wird nicht committet)
|
||||||
|
id: nightly_version
|
||||||
|
run: |
|
||||||
|
BASE_VERSION="$(sed -n 's/^version = "\(.*\)"/\1/p' Cargo.toml | head -n1)"
|
||||||
|
TIMESTAMP="$(date -u +%Y%m%d%H%M)"
|
||||||
|
NIGHTLY_VERSION="${BASE_VERSION}-nightly.${TIMESTAMP}"
|
||||||
|
echo "Basis-Version: ${BASE_VERSION} -> Nightly-Version: ${NIGHTLY_VERSION}"
|
||||||
|
sed -i "0,/^version = \"${BASE_VERSION}\"/s//version = \"${NIGHTLY_VERSION}\"/" Cargo.toml
|
||||||
|
echo "version=${NIGHTLY_VERSION}" >> "$GITHUB_OUTPUT"
|
||||||
|
|
||||||
|
- name: Package Crate
|
||||||
|
run: |
|
||||||
|
cargo package --allow-dirty
|
||||||
|
|
||||||
|
- name: Publish Nightly-Crate zur Gitea Package Registry
|
||||||
|
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: |
|
||||||
|
mkdir -p ~/.cargo
|
||||||
|
cat <<EOF > ~/.cargo/config.toml
|
||||||
|
[registries.gitea]
|
||||||
|
index = "sparse+${GITEA_URL}/api/packages/${REPO_OWNER}/cargo/"
|
||||||
|
EOF
|
||||||
|
|
||||||
|
cat <<EOF > ~/.cargo/credentials.toml
|
||||||
|
[registries.gitea]
|
||||||
|
token = "Bearer ${TOKEN}"
|
||||||
|
EOF
|
||||||
|
|
||||||
|
export CARGO_REGISTRIES_GITEA_INDEX="sparse+${GITEA_URL}/api/packages/${REPO_OWNER}/cargo/"
|
||||||
|
export CARGO_REGISTRIES_GITEA_TOKEN="Bearer ${TOKEN}"
|
||||||
|
|
||||||
|
echo "Veröffentliche Nightly-Crate ${{ steps.nightly_version.outputs.version }} in Gitea Cargo Package Registry..."
|
||||||
|
cargo publish --registry gitea --allow-dirty
|
||||||
@@ -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.83.0
|
container: ghcr.io/renovatebot/renovate:44.103.6
|
||||||
steps:
|
steps:
|
||||||
- name: Renovate ausführen
|
- name: Renovate ausführen
|
||||||
run: renovate
|
run: renovate
|
||||||
|
|||||||
@@ -8,7 +8,7 @@ on:
|
|||||||
- dev
|
- dev
|
||||||
pull_request:
|
pull_request:
|
||||||
schedule:
|
schedule:
|
||||||
- cron: "0 5 * * 1"
|
- cron: "CRON_TZ=Europe/Berlin 0 5 * * 1"
|
||||||
workflow_dispatch:
|
workflow_dispatch:
|
||||||
|
|
||||||
jobs:
|
jobs:
|
||||||
@@ -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
|
||||||
|
|||||||
@@ -43,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: |
|
||||||
@@ -62,9 +60,54 @@ jobs:
|
|||||||
run: |
|
run: |
|
||||||
cargo check --all-targets
|
cargo check --all-targets
|
||||||
|
|
||||||
|
- name: Ermittle Basis-Version (für Release-Tag)
|
||||||
|
id: base_version
|
||||||
|
run: |
|
||||||
|
BASE_VERSION="$(sed -n 's/^version = "\(.*\)"/\1/p' Cargo.toml | head -n1)"
|
||||||
|
echo "version=${BASE_VERSION}" >> "$GITHUB_OUTPUT"
|
||||||
|
|
||||||
|
# Testing-Builds duerfen nie als regulaeres Update erscheinen: Ein SemVer-Pre-Release-
|
||||||
|
# Suffix (-testing.<Zeitstempel>) sorgt dafuer, dass Renovates Standardverhalten
|
||||||
|
# (ignoreUnstable: true) diese Version automatisch ignoriert, solange die Basis-Version
|
||||||
|
# in Cargo.toml selbst kein Pre-Release ist. Die Aenderung ist rein fuer den Build-
|
||||||
|
# Workspace bestimmt und wird nie zurueck in den Branch committet; der Release-Tag
|
||||||
|
# weiter unten nutzt bewusst die zuvor ermittelte Basis-Version, damit er stabil bleibt.
|
||||||
|
- name: Ermittle & setze Testing-Version (temporär, wird nicht committet)
|
||||||
|
id: testing_version
|
||||||
|
run: |
|
||||||
|
BASE_VERSION="${{ steps.base_version.outputs.version }}"
|
||||||
|
TIMESTAMP="$(date -u +%Y%m%d%H%M)"
|
||||||
|
TESTING_VERSION="${BASE_VERSION}-testing.${TIMESTAMP}"
|
||||||
|
echo "Basis-Version: ${BASE_VERSION} -> Testing-Version: ${TESTING_VERSION}"
|
||||||
|
sed -i "0,/^version = \"${BASE_VERSION}\"/s//version = \"${TESTING_VERSION}\"/" Cargo.toml
|
||||||
|
echo "version=${TESTING_VERSION}" >> "$GITHUB_OUTPUT"
|
||||||
|
|
||||||
- name: Package Crate
|
- name: Package Crate
|
||||||
run: |
|
run: |
|
||||||
cargo package
|
cargo package --allow-dirty
|
||||||
|
|
||||||
|
- name: Publish Testing-Crate zur Gitea Package Registry
|
||||||
|
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: |
|
||||||
|
mkdir -p ~/.cargo
|
||||||
|
cat <<EOF > ~/.cargo/config.toml
|
||||||
|
[registries.gitea]
|
||||||
|
index = "sparse+${GITEA_URL}/api/packages/${REPO_OWNER}/cargo/"
|
||||||
|
EOF
|
||||||
|
|
||||||
|
cat <<EOF > ~/.cargo/credentials.toml
|
||||||
|
[registries.gitea]
|
||||||
|
token = "Bearer ${TOKEN}"
|
||||||
|
EOF
|
||||||
|
|
||||||
|
export CARGO_REGISTRIES_GITEA_INDEX="sparse+${GITEA_URL}/api/packages/${REPO_OWNER}/cargo/"
|
||||||
|
export CARGO_REGISTRIES_GITEA_TOKEN="Bearer ${TOKEN}"
|
||||||
|
|
||||||
|
echo "Veröffentliche Testing-Crate ${{ steps.testing_version.outputs.version }} in Gitea Cargo Package Registry..."
|
||||||
|
cargo publish --registry gitea --allow-dirty
|
||||||
|
|
||||||
- name: Create Gitea Pre-Release and Upload Assets
|
- name: Create Gitea Pre-Release and Upload Assets
|
||||||
env:
|
env:
|
||||||
@@ -73,7 +116,7 @@ jobs:
|
|||||||
REPO_NAME: ${{ gitea.repository_name || github.event.repository.name }}
|
REPO_NAME: ${{ gitea.repository_name || github.event.repository.name }}
|
||||||
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 }}
|
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: |
|
run: |
|
||||||
VERSION="$(sed -n 's/^version = "\(.*\)"/\1/p' Cargo.toml | head -n1)"
|
VERSION="${{ steps.base_version.outputs.version }}"
|
||||||
TAG_NAME="v${VERSION}-preview"
|
TAG_NAME="v${VERSION}-preview"
|
||||||
RELEASE_TITLE="Preview Release ${TAG_NAME}"
|
RELEASE_TITLE="Preview Release ${TAG_NAME}"
|
||||||
RELEASE_NOTES="Automatisches Preview-Release für ${REPO_NAME} Crate ${VERSION} (Branch: Testing)."
|
RELEASE_NOTES="Automatisches Preview-Release für ${REPO_NAME} Crate ${VERSION} (Branch: Testing)."
|
||||||
|
|||||||
@@ -4,7 +4,7 @@ on:
|
|||||||
push:
|
push:
|
||||||
pull_request:
|
pull_request:
|
||||||
schedule:
|
schedule:
|
||||||
- cron: "0 6 * * 1"
|
- cron: "CRON_TZ=Europe/Berlin 0 6 * * 1"
|
||||||
workflow_dispatch:
|
workflow_dispatch:
|
||||||
|
|
||||||
jobs:
|
jobs:
|
||||||
@@ -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
|
||||||
|
|||||||
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
+1
-1
@@ -16,7 +16,7 @@ checksum = "3eaf3ede3fee6db1a4c2ee091bf8a8b4dccdc6d17f656fb07896ee72867612f2"
|
|||||||
|
|
||||||
[[package]]
|
[[package]]
|
||||||
name = "logger-ctdra"
|
name = "logger-ctdra"
|
||||||
version = "1.0.5"
|
version = "1.1.0"
|
||||||
dependencies = [
|
dependencies = [
|
||||||
"program-ctdra",
|
"program-ctdra",
|
||||||
"time",
|
"time",
|
||||||
|
|||||||
+1
-1
@@ -1,6 +1,6 @@
|
|||||||
[package]
|
[package]
|
||||||
name = "logger-ctdra"
|
name = "logger-ctdra"
|
||||||
version = "1.0.5"
|
version = "1.1.0"
|
||||||
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
-5
@@ -1,29 +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": [
|
||||||
|
"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": [
|
||||||
|
|||||||
+35
-2
@@ -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 {
|
||||||
eprintln!("{}", formatted);
|
if color_supported(std::io::stderr().is_terminal()) {
|
||||||
|
eprintln!("{}{}{}", ansi_color(&log_level), formatted, ANSI_RESET);
|
||||||
|
} else {
|
||||||
|
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