From 2a83ddd2107e28df279eb2ad84e7b9aa9946cf95 Mon Sep 17 00:00:00 2001 From: phunkyfish Date: Tue, 13 Feb 2024 17:14:31 +0000 Subject: [PATCH] [github] Updated deprecated workflows actions --- .github/workflows/build.yml | 15 ++++----------- .github/workflows/changelog-and-release.yml | 14 +++++++------- .github/workflows/increment-version.yml | 8 ++++---- .github/workflows/release.yml | 8 ++++---- .../sync-addon-metadata-translations.yml | 7 ++++--- 5 files changed, 23 insertions(+), 29 deletions(-) diff --git a/.github/workflows/build.yml b/.github/workflows/build.yml index 14ff7cce..9d97b263 100644 --- a/.github/workflows/build.yml +++ b/.github/workflows/build.yml @@ -15,13 +15,6 @@ jobs: CC: gcc CXX: g++ DEBIAN_BUILD: true - #- os: ubuntu-latest - #CC: gcc - #CXX: g++ - #- os: ubuntu-latest - #CC: clang - #CXX: clang++ - #- os: macos-10.15 steps: - name: Install needed ubuntu depends env: @@ -31,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: Nexus path: xbmc - - name: Checkout pvr.argustv repo - uses: actions/checkout@v2 + - name: Checkout add-on repo + uses: actions/checkout@v4 with: path: ${{ env.app_id }} - name: Configure @@ -48,7 +41,7 @@ jobs: run: | if [[ $DEBIAN_BUILD != true ]]; then cd ${app_id} && mkdir -p build && cd build; fi if [[ $DEBIAN_BUILD != true ]]; then cmake -DADDONS_TO_BUILD=${app_id} -DADDON_SRC_PREFIX=${{ github.workspace }} -DCMAKE_BUILD_TYPE=Debug -DCMAKE_INSTALL_PREFIX=${{ github.workspace }}/xbmc/addons -DPACKAGE_ZIP=1 ${{ github.workspace }}/xbmc/cmake/addons; fi - if [[ $DEBIAN_BUILD == true ]]; then wget https://raw.githubusercontent.com/xbmc/xbmc/master/xbmc/addons/kodi-dev-kit/tools/debian-addon-package-test.sh && chmod +x ./debian-addon-package-test.sh; fi + if [[ $DEBIAN_BUILD == true ]]; then wget https://raw.githubusercontent.com/xbmc/xbmc/Nexus/xbmc/addons/kodi-dev-kit/tools/debian-addon-package-test.sh && chmod +x ./debian-addon-package-test.sh; fi if [[ $DEBIAN_BUILD == true ]]; then sudo apt-get build-dep ${{ github.workspace }}/${app_id}; fi - name: Build env: diff --git a/.github/workflows/changelog-and-release.yml b/.github/workflows/changelog-and-release.yml index c952b584..46c50865 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 diff --git a/.github/workflows/increment-version.yml b/.github/workflows/increment-version.yml index a0bd137d..6a419494 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 0e126881..7bf49f1e 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,11 +42,11 @@ 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} diff --git a/.github/workflows/sync-addon-metadata-translations.yml b/.github/workflows/sync-addon-metadata-translations.yml index 33b10248..c907fd79 100644 --- a/.github/workflows/sync-addon-metadata-translations.yml +++ b/.github/workflows/sync-addon-metadata-translations.yml @@ -21,18 +21,18 @@ jobs: steps: - name: Checkout repository - uses: actions/checkout@v2 + uses: actions/checkout@v4 with: path: project - name: Checkout sync_addon_metadata_translations repository - uses: actions/checkout@v2 + uses: actions/checkout@v4 with: repository: xbmc/sync_addon_metadata_translations 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