Fix variable passing to preserve dates

This commit is contained in:
Joshua M. Boniface
2025-02-17 03:15:39 -05:00
parent 4f1458b266
commit e48b93fb82

View File

@@ -24,6 +24,9 @@ jobs:
arch:
- amd64
# - arm64
outputs:
JELLYFIN_VERSION: ${{ steps.version.outputs.JELLYFIN_VERSION }}
JELLYFIN_RELEASE_TYPE: ${{ steps.version.outputs.JELLYFIN_RELEASE_TYPE }}
continue-on-error: false # true in prod, false for testing
steps:
- name: "Set dated version for unstable builds"
@@ -31,10 +34,14 @@ jobs:
run: |-
if grep --silent --extended-regexp '^v[0-9]+' <<< "${{ inputs.version || 'master' }}"; then
echo "JELLYFIN_VERSION=${{ inputs.version }}" >> $GITHUB_ENV
echo "JELLYFIN_VERSION=${{ inputs.version }}" >> $GITHUB_OUTPUT
echo "JELLYFIN_RELEASE_TYPE=stable" >> $GITHUB_ENV
echo "JELLYFIN_RELEASE_TYPE=stable" >> $GITHUB_OUTPUT
else
echo "JELLYFIN_VERSION=$(date +'%Y%m%d%H')" >> $GITHUB_ENV
echo "JELLYFIN_VERSION=$(date +'%Y%m%d%H')" >> $GITHUB_OUTPUT
echo "JELLYFIN_RELEASE_TYPE=unstable" >> $GITHUB_ENV
echo "JELLYFIN_RELEASE_TYPE=unstable" >> $GITHUB_OUTPUT
fi
- name: "Install dependencies"
@@ -91,7 +98,8 @@ jobs:
path: out/windows/jellyfin_*-amd64.zip
WindowsInstaller:
needs: Windows
needs:
- Windows
runs-on: windows-latest
strategy:
fail-fast: false
@@ -106,12 +114,12 @@ jobs:
id: version
shell: pwsh
run: |
$version = "${{ inputs.version || 'master' }}"
$version = "${{ needs.Windows.outputs.JELLYFIN_VERSION }}"
if ($version -match "^v[0-9]+") {
$cleanVersion = $version.Substring(1) # Remove the leading 'v'
$cleanVersion = $version.Substring(1)
} else {
$cleanVersion = Get-Date -Format "yyyyMMddHH" # Fallback to timestamp
$cleanVersion = $version
}
echo "JELLYFIN_VERSION=$cleanVersion" | Out-File -FilePath $env:GITHUB_ENV -Append
@@ -179,7 +187,9 @@ jobs:
path: jellyfin-server-windows\nsis\jellyfin_*_windows-x64.exe
WindowsInstallerUpload:
needs: WindowsInstaller
needs:
- Windows
- WindowsInstaller
runs-on: ubuntu-24.04
strategy:
fail-fast: false
@@ -188,16 +198,11 @@ jobs:
- amd64
continue-on-error: false # true in prod, false for testing
steps:
- name: "Set dated version for unstable builds"
- name: "Set version from previous job"
id: version
run: |-
if grep --silent --extended-regexp '^v[0-9]+' <<< "${{ inputs.version || 'master' }}"; then
echo "JELLYFIN_VERSION=${{ inputs.version }}" >> $GITHUB_ENV
echo "JELLYFIN_RELEASE_TYPE=stable" >> $GITHUB_ENV
else
echo "JELLYFIN_VERSION=$(date +'%Y%m%d%H')" >> $GITHUB_ENV
echo "JELLYFIN_RELEASE_TYPE=unstable" >> $GITHUB_ENV
fi
echo "JELLYFIN_VERSION=${{ needs.Windows.outputs.JELLYFIN_VERSION }}" >> $GITHUB_ENV
echo "JELLYFIN_RELEASE_TYPE=${{ needs.Windows.outputs.JELLYFIN_RELEASE_TYPE }}" >> $GITHUB_ENV
- name: "Fetch artifact from previous stage"
uses: actions/download-artifact@fa0a91b85d4f404e444e00e005971372dc801d16 # v4