Skip to content
GitLab
Explore
Sign in
Register
Primary navigation
Search or go to…
Project
X
x264
Manage
Activity
Members
Labels
Plan
Issues
0
Issue boards
Milestones
Wiki
Code
Merge requests
0
Repository
Branches
Commits
Tags
Repository graph
Compare revisions
Build
Pipelines
Jobs
Pipeline schedules
Artifacts
Deploy
Releases
Package Registry
Model registry
Operate
Environments
Terraform modules
Monitor
Incidents
Service Desk
Analyze
Value stream analytics
Contributor analytics
CI/CD analytics
Repository analytics
Model experiments
Help
Help
Support
GitLab documentation
Compare GitLab plans
Community forum
Contribute to GitLab
Provide feedback
Keyboard shortcuts
?
Snippets
Groups
Projects
Show more breadcrumbs
Brad Smith
x264
Commits
7241d020
Commit
7241d020
authored
1 year ago
by
Anton Mitrofanov
Browse files
Options
Downloads
Patches
Plain Diff
CI: Switch 32/64-bit windows builds to LLVM
Use same Docker images as VLC for contrib compilation.
parent
ea08f586
No related branches found
Branches containing commit
No related tags found
No related merge requests found
Changes
1
Hide whitespace changes
Inline
Side-by-side
Showing
1 changed file
.gitlab-ci.yml
+7
-4
7 additions, 4 deletions
.gitlab-ci.yml
with
7 additions
and
4 deletions
.gitlab-ci.yml
+
7
−
4
View file @
7241d020
...
...
@@ -17,13 +17,13 @@ stages:
_TRIPLET
:
"
i686-w64-mingw32"
_PLATFORMSUFFIX
:
"
.exe"
_WRAPPER
:
"
wine"
_CONTRIB_URL
:
"
https://artifacts.videolan.org/vlc/win32/"
_CONTRIB_URL
:
"
https://artifacts.videolan.org/vlc/win32
-llvm
/"
.variables-win64
:
&variables-win64
_TRIPLET
:
"
x86_64-w64-mingw32"
_PLATFORMSUFFIX
:
"
.exe"
_WRAPPER
:
"
wine"
_CONTRIB_URL
:
"
https://artifacts.videolan.org/vlc/win64/"
_CONTRIB_URL
:
"
https://artifacts.videolan.org/vlc/win64
-llvm
/"
.variables-win-armv7
:
&variables-win-armv7
_TRIPLET
:
"
armv7-w64-mingw32"
...
...
@@ -84,7 +84,7 @@ stages:
build-debian-amd64
:
extends
:
.build
image
:
registry.videolan.org/
x264
-debian-unstable:202
31113190916
image
:
registry.videolan.org/
vlc
-debian-unstable:202
40212151604
tags
:
-
docker
-
amd64
...
...
@@ -100,9 +100,11 @@ build-debian-aarch64:
.build-win
:
extends
:
build-debian-amd64
image
:
registry.videolan.org/vlc-debian-llvm-msvcrt:20240212151604
script
:
|
set -x
LOCAL_INSTALL_DIR=`pwd`/${_TRIPLET}
export PKGCONFIG=pkg-config
export PKG_CONFIG_LIBDIR=${LOCAL_INSTALL_DIR}/lib/pkgconfig
curl -f -o vlc-contrib.txt ${_CONTRIB_URL}
CONTRIB_NAME=$(sed -n -e "s@.*href=\"\(vlc-contrib-${_TRIPLET}-[^\"]*\.tar\.bz2\)\".*@\1@p" vlc-contrib.txt | sed -n -e '1p')
...
...
@@ -129,7 +131,7 @@ build-win64:
.build-llvm-mingw
:
extends
:
.build
image
:
registry.videolan.org/vlc-debian-llvm-
mingw:2021102009451
4
image
:
registry.videolan.org/vlc-debian-llvm-
ucrt:2024021215160
4
tags
:
-
docker
-
amd64
...
...
@@ -229,6 +231,7 @@ test-macos-x86_64:
test-aarch64-qemu
:
<<
:
*test
extends
:
build-debian-amd64
image
:
registry.videolan.org/x264-debian-unstable:20231113190916
dependencies
:
-
build-debian-aarch64
variables
:
*variables-debian-amd64
...
...
This diff is collapsed.
Click to expand it.
Preview
0%
Loading
Try again
or
attach a new file
.
Cancel
You are about to add
0
people
to the discussion. Proceed with caution.
Finish editing this message first!
Save comment
Cancel
Please
register
or
sign in
to comment