update workflows to nexus

Author: anxdpanic

.github/workflows/addon-validations.yml

@@ -16,13 +16,13 @@ jobs:
     runs-on: ubuntu-latest
 
     steps:
-      - name: Set up Python v3.6
-        uses: actions/setup-python@v2
+      - name: Set up Python v3.9
+        uses: actions/setup-python@v3
         with:
-          python-version: '3.6'
+          python-version: '3.9'
 
       - name: Checkout Add-on
-        uses: actions/checkout@v2
+        uses: actions/checkout@v3
         with:
           path: ${{ github.event.repository.name }}
 
@@ -31,20 +31,7 @@ jobs:
           python -m pip install --upgrade pip
           python -m pip install git+https://github.com/xbmc/addon-check.git
 
-      - name: Kodi Add-on Checker (Jarvis)
-        id: kodi-addon-checker-jarvis
+      - name: Kodi Add-on Checker (Nexus)
+        id: kodi-addon-checker-nexus
         run: |
-          kodi-addon-checker ${{ github.event.repository.name }} --branch=jarvis
-
-      - name: Staging for Matrix
-        run: |
-          git reset
-          git checkout .
-          git clean -fdx
-          git apply .patches/matrix.patch
-        working-directory: ${{ github.event.repository.name }}
-
-      - name: Kodi Add-on Checker (Matrix)
-        id: kodi-addon-checker-matrix
-        run: |
-          kodi-addon-checker ${{ github.event.repository.name }} --branch=matrix
+          kodi-addon-checker ${{ github.event.repository.name }} --branch=nexus

.github/workflows/make-release.yml

@@ -26,12 +26,13 @@ jobs:
           fi
 
       - name: Checkout Add-on
-        uses: actions/checkout@v2
+        uses: actions/checkout@v3
         with:
           path: ${{ github.event.repository.name }}
 
       - name: Install dependencies
         run: |
+          sudo apt-get update
           sudo apt-get install libxml2-utils xmlstarlet zip
 
       - name: Get Variables
@@ -46,8 +47,8 @@ jobs:
           echo ::set-output name=version::$version
         working-directory: ${{ github.event.repository.name }}
 
-      - name: Create Zip (Jarvis)
-        id: zip-jarvis
+      - name: Create Zip (Nexus)
+        id: zip-nexus
         run: |
           git reset
           git checkout .
@@ -62,25 +63,6 @@ jobs:
           echo ::set-output name=filename::$filename
         working-directory: ${{ github.event.repository.name }}
 
-      - name: Create Zip (Matrix)
-        id: zip-matrix
-        run: |
-          git reset
-          git checkout .
-          git clean -fdx
-          git apply .patches/matrix.patch
-          mv .git ..
-          rm -rf .??*
-          rm *.md
-          xmlstarlet ed -L -u '/addon/@version' -v "${{ steps.variables.outputs.version }}+matrix.1" addon.xml
-          version=$(xmlstarlet sel -t -v 'string(/addon/@version)' addon.xml)
-          filename=${{ github.event.repository.name }}-${version}.zip
-          cd ..
-          zip -r $filename ${{ github.event.repository.name }}
-          mv .git ${{ github.event.repository.name }}
-          echo ::set-output name=filename::$filename
-        working-directory: ${{ github.event.repository.name }}
-
       - name: Create Release
         id: create-release
         uses: actions/create-release@v1
@@ -93,24 +75,13 @@ jobs:
           draft: false
           prerelease: ${{ steps.release.outputs.pre-release }}
 
-      - name: Upload Zip (Jarvis)
-        id: upload-jarvis
-        uses: actions/upload-release-asset@v1
-        env:
-          GITHUB_TOKEN: ${{ secrets.GITHUB_TOKEN }}
-        with:
-          upload_url: ${{ steps.create-release.outputs.upload_url }}
-          asset_name: ${{ steps.zip-jarvis.outputs.filename }}
-          asset_path: ${{ steps.zip-jarvis.outputs.filename }}
-          asset_content_type: application/zip
-
-      - name: Upload Zip (Matrix)
-        id: upload-matrix
+      - name: Upload Zip (Nexus)
+        id: upload-nexus
         uses: actions/upload-release-asset@v1
         env:
           GITHUB_TOKEN: ${{ secrets.GITHUB_TOKEN }}
         with:
           upload_url: ${{ steps.create-release.outputs.upload_url }}
-          asset_name: ${{ steps.zip-matrix.outputs.filename }}
-          asset_path: ${{ steps.zip-matrix.outputs.filename }}
+          asset_name: ${{ steps.zip-nexus.outputs.filename }}
+          asset_path: ${{ steps.zip-nexus.outputs.filename }}
           asset_content_type: application/zip

.github/workflows/submit-release.yml

@@ -19,18 +19,17 @@ jobs:
 
     steps:
       - name: Checkout Add-on
-        uses: actions/checkout@v2
+        uses: actions/checkout@v3
         with:
           path: ${{ github.event.repository.name }}
 
       - name: Set up Python ${{ matrix.python-version }}
-        uses: actions/setup-python@v2
+        uses: actions/setup-python@v3
         with:
           python-version: ${{ matrix.python-version }}
 
       - name: Install dependencies
         run: |
-          sudo apt-get install libxml2-utils xmlstarlet
           python -m pip install --upgrade pip
           python -m pip install git+https://github.com/romanvm/kodi-addon-submitter.git
 
@@ -49,38 +48,10 @@ jobs:
           git commit -m "Remove unwanted files"
         working-directory: ${{ github.event.repository.name }}
 
-      - name: Submit to Official Repository (Jarvis)
-        id: submit-jarvis
+      - name: Submit to Official Repository (Nexus)
+        id: submit-nexus
         run: |
-          submit-addon -r repo-scripts -b jarvis --pull-request ${{ github.event.repository.name }}
-        working-directory: ${{ github.event.repository.name }}
-        env:
-          GH_USERNAME: anxdpanic
-          GH_TOKEN: ${{ secrets.ADDON_SUBMISSION_TOKEN }}
-          EMAIL: [email protected]
-
-      - name: Staging for Official Repository (Matrix)
-        id: stage-matrix
-        run: |
-          git reset --hard ${{ github.sha }}
-          git checkout .
-          git clean -fdx
-          git apply .patches/matrix.patch
-          mv .git ..
-          rm -rf .??*
-          mv ../.git .
-          rm *.md
-          rm changelog.txt
-          version=$(xmlstarlet sel -t -v 'string(/addon/@version)' addon.xml)
-          xmlstarlet ed -L -u '/addon/@version' -v "${version}+matrix.1" addon.xml
-          git add .
-          git commit -m "Kodi 19 Patch"
-        working-directory: ${{ github.event.repository.name }}
-
-      - name: Submit to Official Repository (Matrix)
-        id: submit-matrix
-        run: |
-          submit-addon -r repo-scripts -b matrix --pull-request ${{ github.event.repository.name }}
+          submit-addon -r repo-scripts -b nexus --pull-request ${{ github.event.repository.name }}
         working-directory: ${{ github.event.repository.name }}
         env:
           GH_USERNAME: anxdpanic