From 3acc266bcfc3175d98754641cd3872628f09dd68 Mon Sep 17 00:00:00 2001 From: Thomas Goodwin Date: Thu, 24 Oct 2024 16:42:11 -0400 Subject: [PATCH 1/6] github: append localconf.cbc to point at blinemedical/gst-plugins-rs Signed-off-by: Thomas Goodwin --- .../actions/build-gstreamer-for-windows/action.yml | 14 ++++++++++++++ 1 file changed, 14 insertions(+) diff --git a/.github/actions/build-gstreamer-for-windows/action.yml b/.github/actions/build-gstreamer-for-windows/action.yml index e50ccfd5f..97b4778fc 100644 --- a/.github/actions/build-gstreamer-for-windows/action.yml +++ b/.github/actions/build-gstreamer-for-windows/action.yml @@ -31,6 +31,14 @@ inputs: s3-upload-path: description: 'S3 path to upload to' required: false + gst-plugins-rs-repo: + description: 'Repository to use for gst-plugins-rs' + required: false + default: 'https://github.com/blinemedical/gst-plugins-rs' + gst-plugins-rs-ref: + description: 'Ref/tag to use for gst-plugins-rs' + required: false + default: '0.12-lldc' force: description: 'Whether to force the build' required: false @@ -185,6 +193,8 @@ runs: CERBERO_ARGS: ${{ inputs.cerbero-args }} CERBERO_PACKAGE_ARGS: ${{ inputs.cerbero-package-args }} CERBERO_PACKAGE_ORIGIN: ${{ steps.version-info.outputs.gstreamer-version }}-${{ steps.version-info.outputs.cerbero-short-sha }} + GST_PLUGINS_RS_SOURCE: ${{ inputs.gst-plugins-rs-repo }} + GST_PLUGINS_RS_REF: ${{ inputs.gst-plugins-rs-ref }} run: | # Set up Cerbero configuration echo "cerbero-sha=$(git rev-parse HEAD)" >> $GITHUB_OUTPUT @@ -199,6 +209,10 @@ runs: echo "vs_install_version = \"vs17\"" >> localconf.cbc echo "num_of_cpus = ${NUMBER_OF_PROCESSORS}" >> localconf.cbc echo "package_origin = \"${CERBERO_PACKAGE_ORIGIN}\"" >> localconf.cbc + + # Switch gst-plugins-rs provider to blinemedical + echo "recipes_remotes = {'gst-plugins-rs': {'patched': '${GST_PLUGINS_RS_SOURCE}'}}" >> localconf.cbc + echo "recipes_commits = {'gst-plugins-rs': 'patched/${GST_PLUGINS_RS_REF}'}" >> localconf.cbc cat localconf.cbc git clean -xdf -e localconf.cbc -e "${CERBERO_SOURCES}" From 357bce378e33f67331b44347abcecaa7c731b10b Mon Sep 17 00:00:00 2001 From: Thomas Goodwin Date: Fri, 25 Oct 2024 11:07:24 -0400 Subject: [PATCH 2/6] github: bumped gst-plugins-rs to 0.12.9-lldc.1 This patch release includes our aws3sink w/ cache and intersink changes --- .github/actions/build-gstreamer-for-windows/action.yml | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/.github/actions/build-gstreamer-for-windows/action.yml b/.github/actions/build-gstreamer-for-windows/action.yml index 97b4778fc..e203353b0 100644 --- a/.github/actions/build-gstreamer-for-windows/action.yml +++ b/.github/actions/build-gstreamer-for-windows/action.yml @@ -38,7 +38,7 @@ inputs: gst-plugins-rs-ref: description: 'Ref/tag to use for gst-plugins-rs' required: false - default: '0.12-lldc' + default: '0.12.9-lldc.1' force: description: 'Whether to force the build' required: false From 41220ad680bb64cafbc6840d5509b34105e6566a Mon Sep 17 00:00:00 2001 From: Thomas Goodwin Date: Fri, 25 Oct 2024 12:46:42 -0400 Subject: [PATCH 3/6] github: removing the remote name from the recipes_commits The spec for git reset --hard is , which does accept a remote name but goes to the head of the branch (`remote/branch` format). If we need to target a tag, our tag must be unique. --- .github/actions/build-gstreamer-for-windows/action.yml | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/.github/actions/build-gstreamer-for-windows/action.yml b/.github/actions/build-gstreamer-for-windows/action.yml index e203353b0..9798c28ea 100644 --- a/.github/actions/build-gstreamer-for-windows/action.yml +++ b/.github/actions/build-gstreamer-for-windows/action.yml @@ -212,7 +212,7 @@ runs: # Switch gst-plugins-rs provider to blinemedical echo "recipes_remotes = {'gst-plugins-rs': {'patched': '${GST_PLUGINS_RS_SOURCE}'}}" >> localconf.cbc - echo "recipes_commits = {'gst-plugins-rs': 'patched/${GST_PLUGINS_RS_REF}'}" >> localconf.cbc + echo "recipes_commits = {'gst-plugins-rs': '${GST_PLUGINS_RS_REF}'}" >> localconf.cbc cat localconf.cbc git clean -xdf -e localconf.cbc -e "${CERBERO_SOURCES}" From 6f0348bb229b0c2e65ce19066beb62d5d2306259 Mon Sep 17 00:00:00 2001 From: Thomas Goodwin Date: Mon, 28 Oct 2024 12:05:16 -0400 Subject: [PATCH 4/6] github: support empty values for gst-plugins-rs source/ref These were suggestions from PR comments. Co-authored-by: Jeff Wilson --- .github/actions/build-gstreamer-for-windows/action.yml | 10 +++++----- 1 file changed, 5 insertions(+), 5 deletions(-) diff --git a/.github/actions/build-gstreamer-for-windows/action.yml b/.github/actions/build-gstreamer-for-windows/action.yml index 9798c28ea..6b1abc2e4 100644 --- a/.github/actions/build-gstreamer-for-windows/action.yml +++ b/.github/actions/build-gstreamer-for-windows/action.yml @@ -34,11 +34,9 @@ inputs: gst-plugins-rs-repo: description: 'Repository to use for gst-plugins-rs' required: false - default: 'https://github.com/blinemedical/gst-plugins-rs' gst-plugins-rs-ref: description: 'Ref/tag to use for gst-plugins-rs' required: false - default: '0.12.9-lldc.1' force: description: 'Whether to force the build' required: false @@ -210,9 +208,11 @@ runs: echo "num_of_cpus = ${NUMBER_OF_PROCESSORS}" >> localconf.cbc echo "package_origin = \"${CERBERO_PACKAGE_ORIGIN}\"" >> localconf.cbc - # Switch gst-plugins-rs provider to blinemedical - echo "recipes_remotes = {'gst-plugins-rs': {'patched': '${GST_PLUGINS_RS_SOURCE}'}}" >> localconf.cbc - echo "recipes_commits = {'gst-plugins-rs': '${GST_PLUGINS_RS_REF}'}" >> localconf.cbc + # Handle custom gst-plugins-rs provider + if [ -n "${GST_PLUGINS_RS_SOURCE}" ] && [ -n "${GST_PLUGINS_RS_REF}" ]; then + echo "recipes_remotes = {'gst-plugins-rs': {'patched': '${GST_PLUGINS_RS_SOURCE}'}}" >> localconf.cbc + echo "recipes_commits = {'gst-plugins-rs': '${GST_PLUGINS_RS_REF}'}" >> localconf.cbc + fi cat localconf.cbc git clean -xdf -e localconf.cbc -e "${CERBERO_SOURCES}" From dc3533b7931fa177ed019e4104e8a356f3fc0feb Mon Sep 17 00:00:00 2001 From: Thomas Goodwin Date: Mon, 28 Oct 2024 12:06:57 -0400 Subject: [PATCH 5/6] github: update config_hash to use gst-plugins-rs -related fields --- .github/actions/build-gstreamer-for-windows/action.yml | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/.github/actions/build-gstreamer-for-windows/action.yml b/.github/actions/build-gstreamer-for-windows/action.yml index 6b1abc2e4..b1d0ff80e 100644 --- a/.github/actions/build-gstreamer-for-windows/action.yml +++ b/.github/actions/build-gstreamer-for-windows/action.yml @@ -221,7 +221,7 @@ runs: echo "CERBERO_ARGS=${CERBERO_ARGS}" >> $GITHUB_ENV echo "CERBERO_PACKAGE_ARGS=${CERBERO_PACKAGE_ARGS}" >> $GITHUB_ENV - config_hash=$(echo "${CERBERO_ARGS}${{ inputs.config }}" | sha256sum | cut -d' ' -f1) + config_hash=$(echo "${CERBERO_ARGS}${{ inputs.config }}${GST_PLUGINS_RS_SOURCE}${GST_PLUGINS_RS_REF}" | sha256sum | cut -d' ' -f1) echo "config-hash=${config_hash}" >> $GITHUB_OUTPUT - id: restore-cerbero-sources-cache From 305412825fc2e810ddc9be39f0d6ca3bc3a28b3e Mon Sep 17 00:00:00 2001 From: Thomas Goodwin Date: Mon, 28 Oct 2024 12:09:14 -0400 Subject: [PATCH 6/6] github: set gst-plugins-rs repo and ref from workflow --- .github/workflows/windows.yml | 2 ++ 1 file changed, 2 insertions(+) diff --git a/.github/workflows/windows.yml b/.github/workflows/windows.yml index 621964517..f9cc5bf8c 100644 --- a/.github/workflows/windows.yml +++ b/.github/workflows/windows.yml @@ -62,6 +62,8 @@ jobs: cerbero-repo: ${{ inputs.cerbero-repo || github.repository }} cerbero-ref: ${{ inputs.cerbero-ref || github.ref }} cerbero-args: --clocktime --timestamps -v visualstudio,noasserts,nochecks + gst-plugins-rs-repo: 'https://github.com/blinemedical/gst-plugins.rs' + gst-plugins-rs-ref: '0.12.9-lldc.1' force: ${{ inputs.force-build == true }} no-cache: ${{ inputs.no-cache == true }} bootstrap-system: true