From f27d606616584f075967a4b2ec40744fcd181a0c Mon Sep 17 00:00:00 2001 From: "Joshua M. Boniface" Date: Mon, 12 Feb 2024 10:08:20 -0500 Subject: Use proper format for GITHUB_ENV --- .github/workflows/release-build.yaml | 36 ++++++++++++++++++------------------ 1 file changed, 18 insertions(+), 18 deletions(-) (limited to '.github/workflows') diff --git a/.github/workflows/release-build.yaml b/.github/workflows/release-build.yaml index 784ebf8..110815b 100644 --- a/.github/workflows/release-build.yaml +++ b/.github/workflows/release-build.yaml @@ -46,7 +46,7 @@ jobs: - name: "Run builder for ${{ matrix.version }} ${{ matrix.arch }}" run: |- - sudo ./build.py ${JELLYFIN_VERSION} debian ${{ matrix.arch }} ${{ matrix.release }} + sudo ./build.py ${{ env.JELLYFIN_VERSION }} debian ${{ matrix.arch }} ${{ matrix.release }} - name: "Upload artifacts to repository server" uses: appleboy/scp-action@v0.1.7 @@ -56,7 +56,7 @@ jobs: key: "${{ secrets.REPO_KEY }}" source: "out/debian/*" strip_components: 2 - target: "/srv/incoming/${JELLYFIN_VERSION}/debian/${{ matrix.arch }}/${{ matrix.release }}" + target: "/srv/incoming/${{ env.JELLYFIN_VERSION }}/debian/${{ matrix.arch }}/${{ matrix.release }}" - name: "Import artifacts into reprepro" uses: appleboy/ssh-action@v1.0.3 @@ -66,19 +66,19 @@ jobs: key: "${{ secrets.REPO_KEY }}" script: | set -o xtrace - echo ${JELLYFIN_VERSION} + echo ${{ env.JELLYFIN_VERSION }} if [[ ${{ inputs.version }} != "master" ]]; then COMPONENT="main" else COMPONENT="unstable" fi # Only include the architecture-dependent deb here, as the others are done only for amd64 - flock /run/lock/github-reprepro-debian.lock sudo reprepro --basedir /srv/debian --component ${COMPONENT} includedeb ${{ matrix.release }} /srv/incoming/${JELLYFIN_VERSION}/debian/${{ matrix.arch }}/${{ matrix.release }}/*_${{ matrix.arch }}.deb + flock /run/lock/github-reprepro-debian.lock sudo reprepro --basedir /srv/debian --component ${COMPONENT} includedeb ${{ matrix.release }} /srv/incoming/${{ env.JELLYFIN_VERSION }}/debian/${{ matrix.arch }}/${{ matrix.release }}/*_${{ matrix.arch }}.deb if [[ ${{ matrix.arch }} == "amd64" ]]; then # Only include the architecture-independent packages for amd64; the other architectures are the same and conflict - flock /run/lock/github-reprepro-debian.lock sudo reprepro --basedir /srv/debian --component ${COMPONENT} includedeb ${{ matrix.release }} /srv/incoming/${JELLYFIN_VERSION}/debian/${{ matrix.arch }}/${{ matrix.release }}/*_all.deb + flock /run/lock/github-reprepro-debian.lock sudo reprepro --basedir /srv/debian --component ${COMPONENT} includedeb ${{ matrix.release }} /srv/incoming/${{ env.JELLYFIN_VERSION }}/debian/${{ matrix.arch }}/${{ matrix.release }}/*_all.deb # Only include the source DSC for amd64; the other architectures are the same and conflict - flock /run/lock/github-reprepro-debian.lock sudo reprepro --basedir /srv/debian --component ${COMPONENT} includedsc ${{ matrix.release }} /srv/incoming/${JELLYFIN_VERSION}/debian/${{ matrix.arch }}/${{ matrix.release }}/*.dsc + flock /run/lock/github-reprepro-debian.lock sudo reprepro --basedir /srv/debian --component ${COMPONENT} includedsc ${{ matrix.release }} /srv/incoming/${{ env.JELLYFIN_VERSION }}/debian/${{ matrix.arch }}/${{ matrix.release }}/*.dsc fi - name: "Move artifacts into repository" @@ -88,10 +88,10 @@ jobs: username: "${{ secrets.REPO_USER }}" key: "${{ secrets.REPO_KEY }}" script: | - sudo mkdir -p /srv/repository/mirror/releases/server/debian/versions/${JELLYFIN_VERSION}/${{ matrix.arch }} - sudo mv -t /srv/repository/mirror/releases/server/debian/versions/${JELLYFIN_VERSION}/${{ matrix.arch }}/ /srv/incoming/${JELLYFIN_VERSION}/debian/${{ matrix.arch }}/${{ matrix.release }}/* + sudo mkdir -p /srv/repository/mirror/releases/server/debian/versions/${{ env.JELLYFIN_VERSION }}/${{ matrix.arch }} + sudo mv -t /srv/repository/mirror/releases/server/debian/versions/${{ env.JELLYFIN_VERSION }}/${{ matrix.arch }}/ /srv/incoming/${{ env.JELLYFIN_VERSION }}/debian/${{ matrix.arch }}/${{ matrix.release }}/* if [[ ${{ inputs.version }} != "master" ]]; then - sudo ln -s /srv/repository/mirror/releases/server/debian/versions/${JELLYFIN_VERSION}/${{ matrix.arch }} /srv/repository/mirror/releases/server/debian/latest-server + sudo ln -s /srv/repository/mirror/releases/server/debian/versions/${{ env.JELLYFIN_VERSION }}/${{ matrix.arch }} /srv/repository/mirror/releases/server/debian/latest-server fi Ubuntu: @@ -129,7 +129,7 @@ jobs: - name: "Run builder for ${{ matrix.version }} ${{ matrix.arch }}" run: |- - sudo ./build.py ${JELLYFIN_VERSION} ubuntu ${{ matrix.arch }} ${{ matrix.release }} + sudo ./build.py ${{ env.JELLYFIN_VERSION }} ubuntu ${{ matrix.arch }} ${{ matrix.release }} - name: "Upload artifacts to repository server" uses: appleboy/scp-action@v0.1.7 @@ -139,7 +139,7 @@ jobs: key: "${{ secrets.REPO_KEY }}" source: "out/ubuntu/*" strip_components: 2 - target: "/srv/incoming/${JELLYFIN_VERSION}/ubuntu/${{ matrix.arch }}/${{ matrix.release }}" + target: "/srv/incoming/${{ env.JELLYFIN_VERSION }}/ubuntu/${{ matrix.arch }}/${{ matrix.release }}" - name: "Import artifacts into reprepro" uses: appleboy/ssh-action@v1.0.3 @@ -149,19 +149,19 @@ jobs: key: "${{ secrets.REPO_KEY }}" script: | set -o xtrace - echo ${JELLYFIN_VERSION} + echo ${{ env.JELLYFIN_VERSION }} if [[ ${{ inputs.version }} != "master" ]]; then COMPONENT="main" else COMPONENT="unstable" fi # Only include the architecture-dependent deb here, as the others are done only for amd64 - flock /run/lock/github-reprepro-ubuntu.lock sudo reprepro --basedir /srv/ubuntu --component ${COMPONENT} includedeb ${{ matrix.release }} /srv/incoming/${JELLYFIN_VERSION}/ubuntu/${{ matrix.arch }}/${{ matrix.release }}/*_${{ matrix.arch }}.deb + flock /run/lock/github-reprepro-ubuntu.lock sudo reprepro --basedir /srv/ubuntu --component ${COMPONENT} includedeb ${{ matrix.release }} /srv/incoming/${{ env.JELLYFIN_VERSION }}/ubuntu/${{ matrix.arch }}/${{ matrix.release }}/*_${{ matrix.arch }}.deb if [[ ${{ matrix.arch }} == "amd64" ]]; then # Only include the architecture-independent packages for amd64; the other architectures are the same and conflict - flock /run/lock/github-reprepro-ubuntu.lock sudo reprepro --basedir /srv/ubuntu --component ${COMPONENT} includedeb ${{ matrix.release }} /srv/incoming/${JELLYFIN_VERSION}/ubuntu/${{ matrix.arch }}/${{ matrix.release }}/*_all.deb + flock /run/lock/github-reprepro-ubuntu.lock sudo reprepro --basedir /srv/ubuntu --component ${COMPONENT} includedeb ${{ matrix.release }} /srv/incoming/${{ env.JELLYFIN_VERSION }}/ubuntu/${{ matrix.arch }}/${{ matrix.release }}/*_all.deb # Only include the source DSC for amd64; the other architectures are the same and conflict - flock /run/lock/github-reprepro-ubuntu.lock sudo reprepro --basedir /srv/ubuntu --component ${COMPONENT} includedsc ${{ matrix.release }} /srv/incoming/${JELLYFIN_VERSION}/ubuntu/${{ matrix.arch }}/${{ matrix.release }}/*.dsc + flock /run/lock/github-reprepro-ubuntu.lock sudo reprepro --basedir /srv/ubuntu --component ${COMPONENT} includedsc ${{ matrix.release }} /srv/incoming/${{ env.JELLYFIN_VERSION }}/ubuntu/${{ matrix.arch }}/${{ matrix.release }}/*.dsc fi - name: "Move artifacts into repository" @@ -171,9 +171,9 @@ jobs: username: "${{ secrets.REPO_USER }}" key: "${{ secrets.REPO_KEY }}" script: | - sudo mkdir -p /srv/repository/mirror/releases/server/ubuntu/versions/${JELLYFIN_VERSION}/${{ matrix.arch }} - sudo mv -t /srv/repository/mirror/releases/server/ubuntu/versions/${JELLYFIN_VERSION}/${{ matrix.arch }} /srv/incoming/${JELLYFIN_VERSION}/ubuntu/${{ matrix.arch }}/${{ matrix.release }}/* + sudo mkdir -p /srv/repository/mirror/releases/server/ubuntu/versions/${{ env.JELLYFIN_VERSION }}/${{ matrix.arch }} + sudo mv -t /srv/repository/mirror/releases/server/ubuntu/versions/${{ env.JELLYFIN_VERSION }}/${{ matrix.arch }} /srv/incoming/${{ env.JELLYFIN_VERSION }}/ubuntu/${{ matrix.arch }}/${{ matrix.release }}/* if [[ ${{ inputs.version }} != "master" ]]; then - sudo ln -s /srv/repository/mirror/releases/server/ubuntu/versions/${JELLYFIN_VERSION}/${{ matrix.arch }} /srv/repository/mirror/releases/server/ubuntu/latest-server + sudo ln -s /srv/repository/mirror/releases/server/ubuntu/versions/${{ env.JELLYFIN_VERSION }}/${{ matrix.arch }} /srv/repository/mirror/releases/server/ubuntu/latest-server fi -- cgit