From 467f6653032a9e01d35aaa7a17fba433de42ed2f Mon Sep 17 00:00:00 2001 From: MrUnknownDE Date: Mon, 6 Apr 2026 18:19:12 +0200 Subject: [PATCH] rename repo "again" ^^ --- .github/workflows/release.yml | 53 +++++++++++++++++++---------------- index.json | 16 +++++------ package.json | 8 +++--- 3 files changed, 41 insertions(+), 36 deletions(-) diff --git a/.github/workflows/release.yml b/.github/workflows/release.yml index d6037e3..9467a10 100644 --- a/.github/workflows/release.yml +++ b/.github/workflows/release.yml @@ -3,13 +3,13 @@ name: VCC Release Automation on: push: tags: - - "v*" # Startet bei v1.0.2, v1.1.0 etc. + - "v*" # Startet z.B. bei v1.0.3 jobs: release: runs-on: ubuntu-latest permissions: - contents: write + contents: write # Garantiert Rechte für Releases und Code-Pushes steps: - name: Checkout Code uses: actions/checkout@v4 @@ -19,45 +19,43 @@ jobs: - name: Extract Metadata id: metadata run: | - VERSION=$(jq -r .version package.json) - PKG_NAME=$(jq -r .name package.json) - DISPLAY_NAME=$(jq -r .displayName package.json) - DESCRIPTION=$(jq -r .description package.json) - echo "version=$VERSION" >> $GITHUB_OUTPUT - echo "pkg_name=$PKG_NAME" >> $GITHUB_OUTPUT - echo "display_name=$DISPLAY_NAME" >> $GITHUB_OUTPUT - echo "description=$DESCRIPTION" >> $GITHUB_OUTPUT + echo "version=$(jq -r .version package.json)" >> $GITHUB_OUTPUT + echo "pkg_name=$(jq -r .name package.json)" >> $GITHUB_OUTPUT + echo "display_name=$(jq -r .displayName package.json)" >> $GITHUB_OUTPUT + echo "description=$(jq -r .description package.json)" >> $GITHUB_OUTPUT - name: Create VCC Package Zip run: | - # Wir packen nur die relevanten Dateien ohne den Repo-Hauptordner zip -r ${{ steps.metadata.outputs.pkg_name }}-${{ github.ref_name }}.zip package.json README.md Editor/ Editor.meta package.json.meta README.md.meta - name: Upload GitHub Release Asset uses: softprops/action-gh-release@v2 with: files: ${{ steps.metadata.outputs.pkg_name }}-${{ github.ref_name }}.zip - generate_release_notes: true - draft: false - prerelease: false - name: Update VCC Index run: | - # Wechsel zum gh-pages Branch (oder erstelle ihn, falls er fehlt) git config --global user.name "github-actions[bot]" git config --global user.email "github-actions[bot]@users.noreply.github.com" - git fetch origin gh-pages || git checkout --orphan gh-pages - git checkout gh-pages || git checkout -b gh-pages - - # Falls die index.json noch nicht existiert, Basis-Struktur anlegen - if [ ! -f index.json ]; then - echo '{"name":"mrunknownde VCC Repo","id":"de.mrunknownde.vccrepo","url":"https://${{ github.repository_owner }}.github.io/${{ github.event.repository.name }}/index.json","author":"mrunknownde","packages":{}}' > index.json + # Prüfen, ob der gh-pages Branch auf dem Server existiert + if git ls-remote --heads origin gh-pages | grep -q gh-pages; then + git checkout gh-pages + else + # Wenn nicht: Erstelle ihn als komplett leeren (orphan) Branch + git checkout --orphan gh-pages + git rm -rf . # Löscht alle Main-Dateien aus diesem Branch fi - # Neue Version in die index.json injizieren + # Basis-Struktur der index.json erstellen, falls sie noch nicht existiert + if [ ! -f index.json ]; then + echo '{"name":"mrunknownde VCC Tools","id":"de.mrunknownde.vccrepo","url":"https://${{ github.repository_owner }}.github.io/${{ github.event.repository.name }}/index.json","author":"mrunknownde","packages":{}}' > index.json + fi + + # URL zur gerade hochgeladenen ZIP-Datei im Release generieren ZIP_URL="https://github.com/${{ github.repository }}/releases/download/${{ github.ref_name }}/${{ steps.metadata.outputs.pkg_name }}-${{ github.ref_name }}.zip" + # Neue Version per jq sauber in die index.json injizieren jq --arg ver "${{ steps.metadata.outputs.version }}" \ --arg name "${{ steps.metadata.outputs.pkg_name }}" \ --arg disp "${{ steps.metadata.outputs.display_name }}" \ @@ -72,6 +70,13 @@ jobs: "url": $url }' index.json > temp.json && mv temp.json index.json + # Änderungen stagen git add index.json - git commit -m "Add version ${{ github.ref_name }} to VCC index" - git push origin gh-pages \ No newline at end of file + + # Nur committen und pushen, wenn sich die JSON wirklich verändert hat (verhindert Action-Crash) + if ! git diff --cached --quiet; then + git commit -m "Auto-update VCC index.json for ${{ github.ref_name }}" + git push origin gh-pages + else + echo "Keine Änderungen an der index.json festgestellt. Überspringe Push." + fi \ No newline at end of file diff --git a/index.json b/index.json index 79d92a0..5b29003 100644 --- a/index.json +++ b/index.json @@ -1,24 +1,24 @@ { "name": "MrUnknownDE's VCC Tools", - "id": "de.mrunknownde.vccrepo", + "id": "de.mrunknownde.vcc-tools", "url": "https://vcc.mrunk.de/index.json", "author": "mrunknownde", "packages": { - "de.mrunknownde.gittool": { + "de.mrunknownde.vcc-tools": { "versions": { "1.0.1": { - "name": "de.mrunknownde.gittool", + "name": "de.mrunknownde.vcc-tools", "version": "1.0.1", - "displayName": "VRChat Git Control Tool", - "url": "https://github.com/MrUnknownDE/unity-gittool/archive/refs/tags/v1.0.1.zip", + "displayName": "VRChat Tools", + "url": "https://github.com/MrUnknownDE/vcc-tools/archive/refs/tags/v1.0.1.zip", "unity": "2022.3", "description": "A lightweight, integrated Git panel for Unity." }, "1.0.0": { - "name": "de.mrunknownde.gittool", + "name": "de.mrunknownde.vcc-tools", "version": "1.0.0", - "displayName": "VRChat Git Control Tool", - "url": "https://github.com/MrUnknownDE/unity-gittool/archive/refs/tags/v1.0.0.zip", + "displayName": "VRChat Tools", + "url": "https://github.com/MrUnknownDE/vcc-tools/archive/refs/tags/v1.0.0.zip", "unity": "2022.3", "description": "A lightweight, integrated Git panel for Unity." } diff --git a/package.json b/package.json index b9f20bb..f32d09e 100644 --- a/package.json +++ b/package.json @@ -1,11 +1,11 @@ { - "name": "de.mrunknownde.gittool", + "name": "de.mrunknownde.vcc-tools", "version": "1.0.0", - "displayName": "VRChat Git Control Tool", - "description": "A lightweight, integrated Git panel for Unity. Ideal for VRChat World/Avatar Creators to easily push commits directly from the editor to Gitea/GitHub/GitLab and other Git hosting services.", + "displayName": "MrUnknownDE's VRChat Tools", + "description": "A lightweight, integrated Git panel for Unity.", "unity": "2022.3", "author": { - "name": "mrunknownde" + "name": "MrUnknownDE" }, "dependencies": {}, "vpmDependencies": {}