From bdebed0cf8b359cfac382acfb827efe6dd03a94d Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Odd=20Str=C3=A5b=C3=B8?= Date: Mon, 5 Feb 2024 17:38:01 +0000 Subject: [PATCH] =?UTF-8?q?Use=20fully=20qualified=20version=20numbers=20f?= =?UTF-8?q?or=20CI=20=F0=9F=A7=B9=20Clean=20up=20CI=20after=20removing=20p?= =?UTF-8?q?y2?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .github/workflows/build.yaml | 17 ++++++------- .github/workflows/codeql.yaml | 19 +++++++-------- .../workflows/create-prepare-release-pr.yaml | 2 +- .github/workflows/publish.yaml | 24 ++++++++----------- .github/workflows/test.yaml | 6 ++--- 5 files changed, 29 insertions(+), 39 deletions(-) diff --git a/.github/workflows/build.yaml b/.github/workflows/build.yaml index 8248a585c..b0e6de815 100644 --- a/.github/workflows/build.yaml +++ b/.github/workflows/build.yaml @@ -10,15 +10,12 @@ on: jobs: build: runs-on: ubuntu-latest - strategy: - matrix: - py_version: [ 'py3' ] steps: - name: Checkout repository - uses: actions/checkout@v4 + uses: actions/checkout@v4.1.1 - - name: Set up Python 3.x - uses: actions/setup-python@v5 + - name: Set up Python + uses: actions/setup-python@v5.0.0 with: python-version: 3.9 @@ -27,13 +24,13 @@ jobs: python -m pip install --upgrade pip python -m pip install pyyaml - - name: Create ${{ matrix.py_version }} addon.xml - run: python build.py --version ${{ matrix.py_version }} + - name: Build addon + run: python build.py - name: Publish Build Artifact - uses: actions/upload-artifact@v3 + uses: actions/upload-artifact@v3.1.3 with: retention-days: 14 - name: ${{ matrix.py_version }}-build-artifact + name: py3-build-artifact path: | *.zip diff --git a/.github/workflows/codeql.yaml b/.github/workflows/codeql.yaml index 2723bdfed..3b11f4831 100644 --- a/.github/workflows/codeql.yaml +++ b/.github/workflows/codeql.yaml @@ -16,26 +16,23 @@ jobs: if: ${{ github.repository == 'jellyfin/jellyfin-kodi' }} strategy: fail-fast: false - matrix: - language: [ 'python' ] - version: ['3.9'] steps: - name: Checkout repository - uses: actions/checkout@v4 + uses: actions/checkout@v4.1.1 - name: Initialize CodeQL - uses: github/codeql-action/init@v3 + uses: github/codeql-action/init@v3.24.0 with: - languages: ${{ matrix.language }} + languages: 'python' queries: +security-and-quality - - name: Set up Python ${{ matrix.version }} - uses: actions/setup-python@v5 + - name: Set up Python + uses: actions/setup-python@v5.0.0 with: - python-version: ${{ matrix.version }} + python-version: 3.9 - name: Autobuild - uses: github/codeql-action/autobuild@v3 + uses: github/codeql-action/autobuild@v3.24.0 - name: Perform CodeQL Analysis - uses: github/codeql-action/analyze@v3 + uses: github/codeql-action/analyze@v3.24.0 diff --git a/.github/workflows/create-prepare-release-pr.yaml b/.github/workflows/create-prepare-release-pr.yaml index 0cfbafc75..faafcdd91 100644 --- a/.github/workflows/create-prepare-release-pr.yaml +++ b/.github/workflows/create-prepare-release-pr.yaml @@ -21,7 +21,7 @@ jobs: yq-version: v4.9.1 - name: Checkout repository - uses: actions/checkout@v4 + uses: actions/checkout@v4.1.1 - name: Parse Changelog run: | diff --git a/.github/workflows/publish.yaml b/.github/workflows/publish.yaml index cf82c2fb5..1bfcd7276 100644 --- a/.github/workflows/publish.yaml +++ b/.github/workflows/publish.yaml @@ -6,23 +6,19 @@ on: jobs: publish: runs-on: ubuntu-latest - strategy: - matrix: - py_version: [ 'py3' ] steps: - name: Update Draft uses: release-drafter/release-drafter@v6.0.0 - if: ${{ matrix.py_version == 'py3' }} with: publish: true env: GITHUB_TOKEN: ${{ secrets.JF_BOT_TOKEN }} - name: Checkout repository - uses: actions/checkout@v4 + uses: actions/checkout@v4.1.1 - - name: Set up Python 3.x - uses: actions/setup-python@v5 + - name: Set up Python + uses: actions/setup-python@v5.0.0 with: python-version: 3.9 @@ -31,19 +27,19 @@ jobs: python -m pip install --upgrade pip python -m pip install pyyaml - - name: Create ${{ matrix.py_version }} addon.xml - run: python build.py --version ${{ matrix.py_version }} + - name: Build addon + run: python build.py - name: Publish Build Artifact - uses: actions/upload-artifact@v3 + uses: actions/upload-artifact@v3.1.3 with: retention-days: 14 - name: ${{ matrix.py_version }}-build-artifact + name: py3-build-artifact path: | *.zip - name: Upload to repo server - uses: burnett01/rsync-deployments@5.2 + uses: burnett01/rsync-deployments@6.0.0 with: switches: -vrptz path: '*.zip' @@ -60,5 +56,5 @@ jobs: key: ${{ secrets.DEPLOY_KEY }} script_stop: true script: | - python3 /usr/local/bin/kodirepo add /srv/repository/incoming/kodi/plugin.video.jellyfin+${{ matrix.py_version }}.zip --datadir /srv/repository/releases/client/kodi/${{ matrix.py_version }}; - rm /srv/repository/incoming/kodi/plugin.video.jellyfin+${{ matrix.py_version }}.zip; + python3 /usr/local/bin/kodirepo add /srv/repository/incoming/kodi/plugin.video.jellyfin+py3.zip --datadir /srv/repository/releases/client/kodi/py3; + rm /srv/repository/incoming/kodi/plugin.video.jellyfin+py3.zip; diff --git a/.github/workflows/test.yaml b/.github/workflows/test.yaml index 3bf783feb..5a274d836 100644 --- a/.github/workflows/test.yaml +++ b/.github/workflows/test.yaml @@ -22,10 +22,10 @@ jobs: runs-on: ${{ matrix.os }} steps: - name: Checkout repository - uses: actions/checkout@v4 + uses: actions/checkout@v4.1.1 - name: Set up Python ${{ matrix.py_version }} - uses: actions/setup-python@v5 + uses: actions/setup-python@v5.0.0 with: python-version: ${{ matrix.py_version }} @@ -56,7 +56,7 @@ jobs: if: ${{ matrix.py_version == '3.11' }} - name: Publish Test Artifact - uses: actions/upload-artifact@v3 + uses: actions/upload-artifact@v3.1.3 with: retention-days: 14 name: ${{ matrix.py_version }}-test-results