From daf627f79c564c8fdd1038a6885d0ffa0436dd38 Mon Sep 17 00:00:00 2001 From: karczuRF Date: Fri, 21 Jun 2024 14:17:16 +0200 Subject: [PATCH] cleanup --- .github/workflows/check-tapp.yml | 27 +-------- .github/workflows/update-registry.yml | 7 ++- CODEOWNERS | 3 +- registry.manifest.json | 57 ------------------- .../tapp-example/assets/logo.svg | 18 ------ .../tapp-example/tapplet.manifest.json | 35 ------------ tapplets-registry.manifest.json | 29 +--------- 7 files changed, 9 insertions(+), 167 deletions(-) delete mode 100644 registry.manifest.json delete mode 100644 src/registered-tapplets/tapp-example/assets/logo.svg delete mode 100644 src/registered-tapplets/tapp-example/tapplet.manifest.json diff --git a/.github/workflows/check-tapp.yml b/.github/workflows/check-tapp.yml index 4de6396..a8f4b70 100644 --- a/.github/workflows/check-tapp.yml +++ b/.github/workflows/check-tapp.yml @@ -49,35 +49,10 @@ jobs: - name: Register tapplet id: tapp-register - uses: karczuRF/ga-test@refactor/tapp-reg-manifest-bump + uses: karczuRF/ga-test@main with: package-name: ${{needs.read-variables.outputs.name}} package-version: ${{needs.read-variables.outputs.version}} env: GITHUB_TOKEN: ${{ secrets.GITHUB_TOKEN }} - - # update-registry: - # runs-on: ubuntu-latest - # needs: check-tapp - - # steps: - # - name: Checkout repository - # uses: actions/checkout@v4 - - # - name: Commit updated files - # id: push-commit - # run: | - # if [ ${{ needs.check-tapp.outputs.status }} ]; then - # git config user.name "${{ github.actor }}" - # git config --global user.email "${GITHUB_ACTOR_ID}+${GITHUB_ACTOR}@users.noreply.github.com" - # git add -A - # git commit -m "Register tapplet" - # git fetch origin - # git rebase --strategy-option=theirs origin/main - # git push --force - # fi - - # env: - # GITHUB_TOKEN: ${{ secrets.GITHUB_TOKEN }} - # EMAIL: ${{ secrets.EMAIL }} diff --git a/.github/workflows/update-registry.yml b/.github/workflows/update-registry.yml index 7453a86..ed39315 100644 --- a/.github/workflows/update-registry.yml +++ b/.github/workflows/update-registry.yml @@ -10,8 +10,11 @@ permissions: contents: write jobs: - check-tapp: + register-tapp: runs-on: ubuntu-latest + outputs: + registry-version: ${{steps.tapp-register.outputs.registry-version}} + steps: - name: Checkout repository uses: actions/checkout@v4 @@ -26,7 +29,7 @@ jobs: git config user.name "${{ github.actor }}" git config --global user.email "${GITHUB_ACTOR_ID}+${GITHUB_ACTOR}@users.noreply.github.com" git add -A - git commit -m "Register tapplet" + git commit -m "Update registry to v${{steps.tapp-register.outputs.registry-version}}" git fetch origin git rebase --strategy-option=theirs origin/main git push --force diff --git a/CODEOWNERS b/CODEOWNERS index bc5b672..7cebdd1 100644 --- a/CODEOWNERS +++ b/CODEOWNERS @@ -1,3 +1,2 @@ # Repository CODEOWNERS -@karczuRF/tapplet-example/ @karczuRF -tapp-example/ @karczuRF + diff --git a/registry.manifest.json b/registry.manifest.json deleted file mode 100644 index 16485c2..0000000 --- a/registry.manifest.json +++ /dev/null @@ -1,57 +0,0 @@ -{ - "registeredTapplets": { - "tapp-example": { - "id": "tapp-example", - "metadata": { - "displayName": "Tapplet human readable name", - "author": { - "name": "karczuRF", - "website": "https://github.com/karczuRF" - }, - "codeowners": [ - "@karczuRF" - ], - "audits": [], - "category": "test", - "logoPath": "./dist/images/logo.svg" - }, - "versions": { - "1.0.2": { - "integrity": "sha512-SdcQQ5fIbmWckZc5hWrjQU5sMsqXW0sO80K0fcTW6scxPhiYJuMt3oO35PNzAIXOTt0CQOGbWNMX+x1Gic/YaA==", - "registryUrl": "https://registry.npmjs.org/tapp-example/-/tapp-example-1.0.2.tgz" - }, - "1.0.0": { - "integrity": "sha512-Teya54P3ObC68rLu8E0IvPfjju0hlIgrej9llyIcNMF5CXoO5eCIBbvNnMaDt6z5nRqrWi6tHFZwlCK1yYpMaw==", - "registryUrl": "https://registry.npmjs.org/tapp-example/-/tapp-example-1.0.0.tgz" - }, - "1.0.1": { - "integrity": "sha512-AC2x8xfG93T4QFeKWIb2h7gohc/HzNrqZUbCXOQ54apOPbeSRN/cMSj/iVmIhJ+1NrQJeppSsJjoVVzIYmuOKg==", - "registryUrl": "https://registry.npmjs.org/tapp-example/-/tapp-example-1.0.1.tgz" - } - } - }, - "tapplet-example": { - "id": "tapplet-example", - "metadata": { - "displayName": "Tapplet human readable name", - "author": { - "name": "MCozhusheck", - "website": "https://github.com/MCozhusheck" - }, - "codeowners": [ - "@MCozhusheck" - ], - "audits": [], - "category": "test", - "logoPath": "./dist/images/logo.svg" - }, - "versions": { - "0.0.1": { - "integrity": "sha512-ivQM1oWaCaZrHARDCD2rib/RFmNDdSDuCQofOsEc3HLo/zgGjLXiySwm/uu3s/5lt9S+/oPC6wFE3m5agzdizA==", - "registryUrl": "https://registry.npmjs.org/tapplet-example/-/tapplet-example-0.0.2.tgz" - } - } - } - }, - "manifestVersion": "1.0.1" -} \ No newline at end of file diff --git a/src/registered-tapplets/tapp-example/assets/logo.svg b/src/registered-tapplets/tapp-example/assets/logo.svg deleted file mode 100644 index 38947b1..0000000 --- a/src/registered-tapplets/tapp-example/assets/logo.svg +++ /dev/null @@ -1,18 +0,0 @@ - - - node-icon - - - - - - - - - - - - - - - \ No newline at end of file diff --git a/src/registered-tapplets/tapp-example/tapplet.manifest.json b/src/registered-tapplets/tapp-example/tapplet.manifest.json deleted file mode 100644 index a594e13..0000000 --- a/src/registered-tapplets/tapp-example/tapplet.manifest.json +++ /dev/null @@ -1,35 +0,0 @@ -{ - "packageName": "tapp-example", - "version": "1.0.2", - "displayName": "Tapplet human readable name", - "status": "MVP", - "category": "test", - "author": { - "name": "karczuRF", - "website": "https://github.com/karczuRF" - }, - "about": { - "summary": "Demo", - "description": "This is the simplest example of a tapplet." - }, - "design": { - "logoPath": "./dist/images/logo.svg", - "backgroundPath": "./dist/images/logo.svg" - }, - "repository": { - "type": "git", - "url": "https://github.com/karczuRF/tapp-example.git", - "codeowners": ["@karczuRF"] - }, - "source": { - "location": { - "npm": { - "packageName": "tapp-example", - "registry": "https://registry.npmjs.org/", - "distTarball": "https://registry.npmjs.org/tapp-example/-/tapp-example-1.0.2.tgz", - "integrity": "sha512-SdcQQ5fIbmWckZc5hWrjQU5sMsqXW0sO80K0fcTW6scxPhiYJuMt3oO35PNzAIXOTt0CQOGbWNMX+x1Gic/YaA==" - } - } - }, - "manifestVersion": "0.1.1" -} diff --git a/tapplets-registry.manifest.json b/tapplets-registry.manifest.json index e6a6ba7..a2e277a 100644 --- a/tapplets-registry.manifest.json +++ b/tapplets-registry.manifest.json @@ -1,29 +1,4 @@ { - "manifestVersion": "1.0.0", - "registeredTapplets": { - "tapp-example": { - "id": "tapp-example", - "metadata": { - "displayName": "Tapplet human readable name", - "author": { - "name": "karczuRF", - "website": "https://github.com/karczuRF" - }, - "codeowners": ["karczuRF"], - "audits": [], - "category": "test", - "logoPath": "src/registered-tapplets/tapp-example/assets/logo.svg" - }, - "versions": { - "0.1.0": { - "integrity": "sha512-AC2x8xfG93T4QFeKWIb2h7gohc/HzNrqZUbCXOQ54apOPbeSRN/cMSj/iVmIhJ+1NrQJeppSsJjoVVzIYmuOKg==", - "registryUrl": "https://registry.npmjs.org//tapp-example/-/tapp-example-0.1.0.tgz" - }, - "1.0.2": { - "integrity": "sha512-SdcQQ5fIbmWckZc5hWrjQU5sMsqXW0sO80K0fcTW6scxPhiYJuMt3oO35PNzAIXOTt0CQOGbWNMX+x1Gic/YaA==", - "registryUrl": "https://registry.npmjs.org//tapp-example/-/tapp-example-1.0.2.tgz" - } - } - } - } + "registeredTapplets": {}, + "manifestVersion": "1.0.0" }