mirrors/gstreamer
mirrors/gstreamer
1
1
Fork 0
mirror of https://gitlab.freedesktop.org/gstreamer/gstreamer.git synced 2024-12-25 09:40:37 +00:00
Code Issues 1 Projects Releases Wiki Activity

cerbero ci: Try to fix deps build on the gstreamer namespace

Browse source 
Can't ln twice: it does a cp on MSYS.

Part-of: <https://gitlab.freedesktop.org/gstreamer/gst-ci/-/merge_requests/344>
This commit is contained in:
Nirbheek Chauhan 2020-09-17 16:36:59 +05:30
parent f24e7b721a
commit dab27ee564
2 changed files with 12 additions and 4 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

6
gitlab/cerbero_setup.sh
View file

@ -1,3 +1,5 @@
#!/bin/bash
set -ex set -ex
show_ccache_sum() { show_ccache_sum() {
@ -32,8 +34,12 @@ cerbero_before_script() {
pwd pwd
mkdir -p "../../gstreamer" mkdir -p "../../gstreamer"
ln -sf "$(pwd)" "../../gstreamer/cerbero" ln -sf "$(pwd)" "../../gstreamer/cerbero"
# Don't try to symlink twice because on MSYS `ln` does a `cp` since it
# doesn't support the new NTFS symlink feature.
if [[ ${CI_PROJECT_NAMESPACE} != gstreamer ]]; then
mkdir -p "../../${CI_PROJECT_NAMESPACE}" mkdir -p "../../${CI_PROJECT_NAMESPACE}"
ln -sf "$(pwd)" "../../${CI_PROJECT_NAMESPACE}/cerbero" ln -sf "$(pwd)" "../../${CI_PROJECT_NAMESPACE}/cerbero"
fi
# Make sure there isn't a pre-existing config hanging around # Make sure there isn't a pre-existing config hanging around
rm -v -f localconf.cbc rm -v -f localconf.cbc

6
gitlab/ci_template.yml
View file

@ -47,7 +47,8 @@ variables:
WINDOWS_IMAGE: 'registry.freedesktop.org/gstreamer/gst-ci/amd64/windows:v12-master' WINDOWS_IMAGE: 'registry.freedesktop.org/gstreamer/gst-ci/amd64/windows:v12-master'
CERBERO_SCRIPT_URL: "https://gitlab.freedesktop.org/gstreamer/gst-ci/raw/${GST_UPSTREAM_BRANCH}/gitlab/cerbero_setup.sh" # FIXME: reset back to gstreamer/master after merging
CERBERO_SCRIPT_URL: "https://gitlab.freedesktop.org/nirbheek/gst-ci/raw/fix-msvc-deps-job/gitlab/cerbero_setup.sh"
GIT_STRATEGY: none GIT_STRATEGY: none
MESON_BUILDTYPE_ARGS: --default-library=both MESON_BUILDTYPE_ARGS: --default-library=both
@ -682,6 +683,7 @@ valgrind ges:
# location where cerbero is cached on the host # location where cerbero is cached on the host
CERBERO_HOST_DIR: "/cerbero/" CERBERO_HOST_DIR: "/cerbero/"
before_script: before_script:
- echo "Fetching ${CERBERO_SCRIPT_URL}"
- curl -L -o cerbero_script.sh "${CERBERO_SCRIPT_URL}" - curl -L -o cerbero_script.sh "${CERBERO_SCRIPT_URL}"
- chmod +x cerbero_script.sh - chmod +x cerbero_script.sh
- ./cerbero_script.sh cerbero_before_script - ./cerbero_script.sh cerbero_before_script
@ -1204,7 +1206,7 @@ build gst-omx tizonia fedora x86_64:
before_script: before_script:
- $env:CI_PROJECT_DIR = $env:CI_PROJECT_DIR.replace('\', '/') - $env:CI_PROJECT_DIR = $env:CI_PROJECT_DIR.replace('\', '/')
- $env:CERBERO_SCRIPTS_PATH = "$env:CI_PROJECT_DIR/cerbero_setup.sh" - $env:CERBERO_SCRIPTS_PATH = "$env:CI_PROJECT_DIR/cerbero_setup.sh"
- echo "Fetching $env:CERBERO_SCRIPT_URL"
- Invoke-WebRequest -Uri $env:CERBERO_SCRIPT_URL -OutFile $env:CERBERO_SCRIPTS_PATH - Invoke-WebRequest -Uri $env:CERBERO_SCRIPT_URL -OutFile $env:CERBERO_SCRIPTS_PATH
- C:\MinGW\msys\1.0\bin\bash.exe --login -c "cd $env:CI_PROJECT_DIR && $env:CERBERO_SCRIPTS_PATH cerbero_before_script" - C:\MinGW\msys\1.0\bin\bash.exe --login -c "cd $env:CI_PROJECT_DIR && $env:CERBERO_SCRIPTS_PATH cerbero_before_script"