Skip to content

Commit 1fa5099

Browse files
nyanmisakanyanmisaka
authored
Merge pull request jellyfin#365 from jellyfin/ci-update
Additional non-critical build corrections
2 parents 9044550 + 612b6f9 commit 1fa5099

9 files changed

+15
-18
lines changed

‎.github/workflows/_meta.yaml

+6-5
Original file line numberDiff line numberDiff line change
@@ -104,7 +104,7 @@ jobs:
104104
key: ${{ secrets.deploy-key }}
105105
source: artifact/*
106106
strip_components: 1
107-
target: /srv/incoming/ffmpeg/${{ steps.set_version.outputs.no-v }}/${{ inputs.distro }}/${{ matrix.arch }}
107+
target: /srv/incoming/ffmpeg/${{ steps.set_version.outputs.no-v }}/${{ inputs.distro }}/${{ matrix.arch }}/${{ matrix.release }}
108108

109109
- name: Move incoming release into repository
110110
uses: appleboy/ssh-action@029f5b4aeeeb58fdfe1410a5d17f967dacf36262 # v1.0.3
@@ -120,8 +120,9 @@ jobs:
120120
sudo rm -r /srv/repository/main/ffmpeg/${{ inputs.distro }}/${{ steps.set_version.outputs.major }}.x/${{ steps.set_version.outputs.no-v }}/${{ matrix.arch }}
121121
fi
122122
# Create the target folder and move arch directory into it
123-
sudo mkdir -p /srv/repository/main/ffmpeg/${{ inputs.distro }}/${{ steps.set_version.outputs.major }}.x/${{ steps.set_version.outputs.no-v }}
124-
sudo mv -t /srv/repository/main/ffmpeg/${{ inputs.distro }}/${{ steps.set_version.outputs.major }}.x/${{ steps.set_version.outputs.no-v }}/ /srv/incoming/ffmpeg/${{ steps.set_version.outputs.no-v }}/${{ inputs.distro }}/${{ matrix.arch }}
123+
sudo mkdir -p /srv/repository/main/ffmpeg/${{ inputs.distro }}/${{ steps.set_version.outputs.major }}.x/${{ steps.set_version.outputs.no-v }}/${{ matrix.arch }}
124+
sudo mv -t /srv/repository/main/ffmpeg/${{ inputs.distro }}/${{ steps.set_version.outputs.major }}.x/${{ steps.set_version.outputs.no-v }}/${{ matrix.arch }}/ /srv/incoming/ffmpeg/${{ steps.set_version.outputs.no-v }}/${{ inputs.distro }}/${{ matrix.arch }}/${{ matrix.release }}/*
125+
sudo chown -R root:root /srv/repository/main/ffmpeg/${{ inputs.distro }}/${{ steps.set_version.outputs.major }}.x/${{ steps.set_version.outputs.no-v }}/${{ matrix.arch }}
125126
# Update symlink for latest-X.x
126-
sudo rm -f /srv/repository/main/ffmpeg/${{ inputs.distro }}/latest-${{ steps.set_version.outputs.major }}.x
127-
sudo ln -s /srv/repository/main/ffmpeg/${{ inputs.distro }}/${{ steps.set_version.outputs.major }}.x/${{ steps.set_version.outputs.no-v }} /srv/repository/main/ffmpeg/${{ inputs.distro }}/latest-${{ steps.set_version.outputs.major }}.x
127+
sudo rm -f /srv/repository/main/ffmpeg/${{ inputs.distro }}/latest-${{ steps.set_version.outputs.major }}.x || true
128+
sudo ln -s /srv/repository/main/ffmpeg/${{ inputs.distro }}/${{ steps.set_version.outputs.major }}.x/${{ steps.set_version.outputs.no-v }} /srv/repository/main/ffmpeg/${{ inputs.distro }}/latest-${{ steps.set_version.outputs.major }}.x || true

‎.github/workflows/_meta_mac_portable.yaml

+3-2
Original file line numberDiff line numberDiff line change
@@ -115,6 +115,7 @@ jobs:
115115
# Create the target folder and move arch directory into it
116116
sudo mkdir -p /srv/repository/main/ffmpeg/macos/${{ steps.set_version.outputs.major }}.x/${{ steps.set_version.outputs.no-v }}
117117
sudo mv -t /srv/repository/main/ffmpeg/macos/${{ steps.set_version.outputs.major }}.x/${{ steps.set_version.outputs.no-v }}/ /srv/incoming/ffmpeg/${{ steps.set_version.outputs.no-v }}/macos/${{ matrix.arch }}
118+
sudo chown -R root:root /srv/repository/main/ffmpeg/macos/${{ steps.set_version.outputs.major }}.x/${{ steps.set_version.outputs.no-v }}
118119
# Update symlink for latest-X.x
119-
sudo rm -f /srv/repository/main/ffmpeg/macos/latest-${{ steps.set_version.outputs.major }}.x
120-
sudo ln -s /srv/repository/main/ffmpeg/macos/${{ steps.set_version.outputs.major }}.x/${{ steps.set_version.outputs.no-v }} /srv/repository/main/ffmpeg/macos/latest-${{ steps.set_version.outputs.major }}.x
120+
sudo rm -f /srv/repository/main/ffmpeg/macos/latest-${{ steps.set_version.outputs.major }}.x || true
121+
sudo ln -s /srv/repository/main/ffmpeg/macos/${{ steps.set_version.outputs.major }}.x/${{ steps.set_version.outputs.no-v }} /srv/repository/main/ffmpeg/macos/latest-${{ steps.set_version.outputs.major }}.x || true

‎.github/workflows/_meta_portable.yaml

+3-2
Original file line numberDiff line numberDiff line change
@@ -112,6 +112,7 @@ jobs:
112112
# Create the target folder and move arch directory into it
113113
sudo mkdir -p /srv/repository/main/ffmpeg/${{ inputs.os }}/${{ steps.set_version.outputs.major }}.x/${{ steps.set_version.outputs.no-v }}
114114
sudo mv -t /srv/repository/main/ffmpeg/${{ inputs.os }}/${{ steps.set_version.outputs.major }}.x/${{ steps.set_version.outputs.no-v }}/ /srv/incoming/ffmpeg/${{ steps.set_version.outputs.no-v }}/${{ inputs.os }}/${{ matrix.arch }}
115+
sudo chown -R root:root /srv/repository/main/ffmpeg/${{ inputs.os }}/${{ steps.set_version.outputs.major }}.x/${{ steps.set_version.outputs.no-v }}
115116
# Update symlink for latest-X.x
116-
sudo rm -f /srv/repository/main/ffmpeg/${{ inputs.os }}/latest-${{ steps.set_version.outputs.major }}.x
117-
sudo ln -s /srv/repository/main/ffmpeg/${{ inputs.os }}/${{ steps.set_version.outputs.major }}.x/${{ steps.set_version.outputs.no-v }} /srv/repository/main/ffmpeg/${{ inputs.os }}/latest-${{ steps.set_version.outputs.major }}.x
117+
sudo rm -f /srv/repository/main/ffmpeg/${{ inputs.os }}/latest-${{ steps.set_version.outputs.major }}.x || true
118+
sudo ln -s /srv/repository/main/ffmpeg/${{ inputs.os }}/${{ steps.set_version.outputs.major }}.x/${{ steps.set_version.outputs.no-v }} /srv/repository/main/ffmpeg/${{ inputs.os }}/latest-${{ steps.set_version.outputs.major }}.x || true

‎build-linux-amd64

+1-1
Original file line numberDiff line numberDiff line change
@@ -21,4 +21,4 @@ else
2121
path="${1}"
2222
fi
2323
mkdir ${path} &>/dev/null || true
24-
mv builder/artifacts/jellyfin-ffmpeg*portable_linux64-gpl*.{tar.xz,sha256sum} "${path}"
24+
mv builder/artifacts/jellyfin-ffmpeg*portable_linux64-gpl*.tar.xz "${path}"

‎build-linux-arm64

+1-1
Original file line numberDiff line numberDiff line change
@@ -21,4 +21,4 @@ else
2121
path="${1}"
2222
fi
2323
mkdir ${path} &>/dev/null || true
24-
mv builder/artifacts/jellyfin-ffmpeg*portable_linuxarm64-gpl*.{tar.xz,sha256sum} "${path}"
24+
mv builder/artifacts/jellyfin-ffmpeg*portable_linuxarm64-gpl*.tar.xz "${path}"

‎build-windows-win64

+1-1
Original file line numberDiff line numberDiff line change
@@ -36,4 +36,4 @@ else
3636
path="${1}"
3737
fi
3838
mkdir ${path} &>/dev/null || true
39-
mv "${package_temporary_dir}"/zip/jellyfin-ffmpeg*.{zip,sha256sum} "${path}"
39+
mv "${package_temporary_dir}"/zip/jellyfin-ffmpeg*.zip "${path}"

‎builder/build.sh

-3
Original file line numberDiff line numberDiff line change
@@ -100,9 +100,6 @@ else
100100
tar cJf "${ARTIFACTS_PATH}/${OUTPUT_FNAME}" *
101101
fi
102102
cd -
103-
cd "${ARTIFACTS_PATH}"
104-
sha256sum ./${OUTPUT_FNAME} > ./${OUTPUT_FNAME}.sha256sum
105-
cd -
106103

107104
rm -rf ffbuild
108105

‎builder/buildmac.sh

-2
Original file line numberDiff line numberDiff line change
@@ -108,8 +108,6 @@ mkdir -p artifacts
108108
mv ../ffmpeg ./
109109
mv ../ffprobe ./
110110
tar -cJf "${ARTIFACTS_PATH}/${OUTPUT_FNAME}" ffmpeg ffprobe
111-
cd "${ARTIFACTS_PATH}"
112-
sha256sum ./${OUTPUT_FNAME} > ./${OUTPUT_FNAME}.sha256sum
113111
cd "$BUILDER_ROOT"/..
114112

115113
if [[ -n "$GITHUB_ACTIONS" ]]; then

‎docker-build-win64.sh

-1
Original file line numberDiff line numberDiff line change
@@ -644,7 +644,6 @@ pushd ${FF_PREFIX}/bin
644644
ffpackage="jellyfin-ffmpeg_${ffversion}-portable_win64"
645645
zip -9 -r ${ARTIFACT_DIR}/zip/${ffpackage}.zip ./*.{exe,dll}
646646
pushd ${ARTIFACT_DIR}/zip
647-
sha256sum ./${ffpackage}.zip > ./${ffpackage}.zip.sha256sum
648647
chown -Rc $(stat -c %u:%g ${ARTIFACT_DIR}) ${ARTIFACT_DIR}
649648
popd
650649
popd

0 commit comments

Comments
 (0)