From 96895c863bb57eae3b0f873a328016e14eb890c7 Mon Sep 17 00:00:00 2001 From: phunkyfish Date: Mon, 12 Feb 2024 21:43:49 +0000 Subject: [PATCH] [github] Updated deprecated workflows actions --- .github/workflows/build.yml | 4 ++-- .github/workflows/changelog-and-release.yml | 16 ++++++++-------- .github/workflows/increment-version.yml | 8 ++++---- .github/workflows/release.yml | 10 +++++----- .../sync-addon-metadata-translations.yml | 3 ++- 5 files changed, 21 insertions(+), 20 deletions(-) diff --git a/.github/workflows/build.yml b/.github/workflows/build.yml index a7b0142..4aac5f8 100644 --- a/.github/workflows/build.yml +++ b/.github/workflows/build.yml @@ -24,13 +24,13 @@ jobs: if [[ $DEBIAN_BUILD == true ]]; then sudo apt-get update; fi if [[ $DEBIAN_BUILD == true ]]; then sudo apt-get install fakeroot; fi - name: Checkout Kodi repo - uses: actions/checkout@v2 + uses: actions/checkout@v4 with: repository: xbmc/xbmc ref: master path: xbmc - name: Checkout add-on repo - uses: actions/checkout@v2 + uses: actions/checkout@v4 with: path: ${{ env.app_id }} - name: Configure diff --git a/.github/workflows/changelog-and-release.yml b/.github/workflows/changelog-and-release.yml index c952b58..0340319 100644 --- a/.github/workflows/changelog-and-release.yml +++ b/.github/workflows/changelog-and-release.yml @@ -39,14 +39,14 @@ jobs: # Checkout the current repository into a directory (repositories name) - name: Checkout Repository - uses: actions/checkout@v2 + uses: actions/checkout@v4 with: fetch-depth: 0 path: ${{ github.event.repository.name }} # Checkout the required scripts from kodi-pvr/pvr-scripts into the 'scripts' directory - name: Checkout Scripts - uses: actions/checkout@v2 + uses: actions/checkout@v4 with: fetch-depth: 0 repository: kodi-pvr/pvr-scripts @@ -60,7 +60,7 @@ jobs: # Setup python version 3.9 - name: Set up Python - uses: actions/setup-python@v2 + uses: actions/setup-python@v5 with: python-version: '3.9' @@ -97,12 +97,12 @@ jobs: changes="${changes//$'\r'/'%0D'}" changes="${changes//$'\\n'/'%0A'}" changes="${changes//$'\\r'/'%0D'}" - echo ::set-output name=changes::$changes + echo "changes=$changes" >> $GITHUB_OUTPUT version=$(xmlstarlet fo -R "$(find . -name addon.xml.in)" | xmlstarlet sel -t -v 'string(/addon/@version)') - echo ::set-output name=version::$version + echo "version=$version" >> $GITHUB_OUTPUT branch=$(echo ${GITHUB_REF#refs/heads/}) - echo ::set-output name=branch::$branch - echo ::set-output name=today::$(date +'%Y-%m-%d') + echo "branch=$branch" >> $GITHUB_OUTPUT + echo "today=$(date +'%Y-%m-%d')" >> $GITHUB_OUTPUT working-directory: ${{ github.event.repository.name }} # Create a commit of the incremented version and changelog, news changes @@ -133,7 +133,7 @@ jobs: shell: bash # Create a release at {steps.required-variables.outputs.branch} - # - tag and release name format: {steps.required-variables.outputs.version}-{steps.required-variables.outputs.branch} ie. 20.0.0-Nexus + # - tag and release name format: {steps.required-variables.outputs.version}-{steps.required-variables.outputs.branch} ie. 21.0.0-Omega # - release body: {steps.required-variables.outputs.changes} - name: Create Release id: create-release diff --git a/.github/workflows/increment-version.yml b/.github/workflows/increment-version.yml index 4a9c3b6..ca2aa63 100644 --- a/.github/workflows/increment-version.yml +++ b/.github/workflows/increment-version.yml @@ -15,20 +15,20 @@ jobs: steps: - name: Checkout Repository - uses: actions/checkout@v2 + uses: actions/checkout@v4 with: fetch-depth: 0 path: ${{ github.event.repository.name }} - name: Checkout Scripts - uses: actions/checkout@v2 + uses: actions/checkout@v4 with: fetch-depth: 0 repository: xbmc/weblate-supplementary-scripts path: scripts - name: Set up Python - uses: actions/setup-python@v2 + uses: actions/setup-python@v5 with: python-version: '3.9' @@ -48,7 +48,7 @@ jobs: id: required-variables run: | version=$(xmlstarlet fo -R "$(find . -name addon.xml.in)" | xmlstarlet sel -t -v 'string(/addon/@version)') - echo ::set-output name=version::$version + echo "version=$version" >> $GITHUB_OUTPUT working-directory: ${{ github.event.repository.name }} - name: Create PR for incrementing add-on versions diff --git a/.github/workflows/release.yml b/.github/workflows/release.yml index 0e12688..769998e 100644 --- a/.github/workflows/release.yml +++ b/.github/workflows/release.yml @@ -14,7 +14,7 @@ jobs: # Checkout the current repository into a directory (repositories name) - name: Checkout Repository - uses: actions/checkout@v2 + uses: actions/checkout@v4 with: fetch-depth: 0 path: ${{ github.event.repository.name }} @@ -42,15 +42,15 @@ jobs: changes="${changes//$'\r'/'%0D'}" changes="${changes//$'\\n'/'%0A'}" changes="${changes//$'\\r'/'%0D'}" - echo ::set-output name=changes::$changes + echo "changes=$changes" >> $GITHUB_OUTPUT version=$(xmlstarlet fo -R "$(find . -name addon.xml.in)" | xmlstarlet sel -t -v 'string(/addon/@version)') - echo ::set-output name=version::$version + echo "version=$version" >> $GITHUB_OUTPUT branch=$(echo ${GITHUB_REF#refs/heads/}) - echo ::set-output name=branch::$branch + echo "branch=$branch" >> $GITHUB_OUTPUT working-directory: ${{ github.event.repository.name }} # Create a release at {steps.required-variables.outputs.branch} - # - tag and release name format: {steps.required-variables.outputs.version}-{steps.required-variables.outputs.branch} ie. 20.0.0-Nexus + # - tag and release name format: {steps.required-variables.outputs.version}-{steps.required-variables.outputs.branch} ie. 21.0.0-Omega # - release body: {steps.required-variables.outputs.changes} - name: Create Release id: create-release diff --git a/.github/workflows/sync-addon-metadata-translations.yml b/.github/workflows/sync-addon-metadata-translations.yml index 1adbf82..7580c5f 100644 --- a/.github/workflows/sync-addon-metadata-translations.yml +++ b/.github/workflows/sync-addon-metadata-translations.yml @@ -32,7 +32,7 @@ jobs: path: sync_addon_metadata_translations - name: Set up Python ${{ matrix.python-version }} - uses: actions/setup-python@v2 + uses: actions/setup-python@v5 with: python-version: ${{ matrix.python-version }} @@ -55,3 +55,4 @@ jobs: branch: amt-sync delete-branch: true path: ./project + reviewers: gade01