Skip to content
New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

[VIDEO-3086] Configure gst-plugins-rs source, ref #18

Merged
merged 6 commits into from
Oct 28, 2024
Merged

[VIDEO-3086] Configure gst-plugins-rs source, ref #18

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
6 commits
Select commit Hold shift + click to select a range
3acc266
github: append localconf.cbc to point at blinemedical/gst-plugins-rs
btgoodwin Oct 24, 2024
357bce3
github: bumped gst-plugins-rs to 0.12.9-lldc.1
btgoodwin Oct 25, 2024
41220ad
github: removing the remote name from the recipes_commits
btgoodwin Oct 25, 2024
6f0348b
github: support empty values for gst-plugins-rs source/ref
btgoodwin Oct 28, 2024
dc3533b
github: update config_hash to use gst-plugins-rs -related fields
btgoodwin Oct 28, 2024
3054128
github: set gst-plugins-rs repo and ref from workflow
btgoodwin Oct 28, 2024
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
16 changes: 15 additions & 1 deletion .github/actions/build-gstreamer-for-windows/action.yml
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -31,6 +31,12 @@ 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
gst-plugins-rs-ref:
description: 'Ref/tag to use for gst-plugins-rs'
required: false
force:
description: 'Whether to force the build'
required: false
Expand Down Expand Up @@ -185,6 +191,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
Expand All @@ -199,6 +207,12 @@ 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

# 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}"
Expand All @@ -207,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
Expand Down
2 changes: 2 additions & 0 deletions .github/workflows/windows.yml
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -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
Expand Down
Loading