Skip to content

Commit 9d461e3

Browse files
committed
Enable gstreamer+protobuf
1 parent c480bd1 commit 9d461e3

File tree

3 files changed

+26
-16
lines changed

3 files changed

+26
-16
lines changed

.github/workflows/main.yml

+8-5
Original file line numberDiff line numberDiff line change
@@ -34,6 +34,9 @@ jobs:
3434
submodules: 'true'
3535
- run: sudo apt-get update && sudo apt-get install ant -y && sudo rm -rf /var/lib/apt/lists/* && sudo rm -f /bin/ant && sudo ln -s /usr/share/ant/bin/ant /bin/ant
3636
name: Install Ant
37+
- run: sudo apt-get update && sudo apt-get install --quiet -y --no-install-recommends gstreamer1.0-gl gstreamer1.0-opencv gstreamer1.0-plugins-bad gstreamer1.0-plugins-good gstreamer1.0-plugins-ugly gstreamer1.0-tools libgstreamer-plugins-base1.0-dev libgstreamer1.0-0 libgstreamer1.0-dev
38+
name: Install gstreamer
39+
if: matrix.artifact-name == 'Linux'
3740
- run: rm -rf /usr/local/arm-linux-gnueabihf && curl -SL https://github.com/wpilibsuite/opensdk/releases/download/v2023-9/armhf-raspi-bullseye-2023-x86_64-linux-gnu-Toolchain-10.2.0.tgz | sh -c 'mkdir -p /usr/local && cd /usr/local && tar xzf - --strip-components=2'
3841
name: Replace arm32 compiler
3942
if: matrix.artifact-name == 'Arm32'
@@ -178,7 +181,7 @@ jobs:
178181
steps:
179182
- uses: actions/checkout@v4
180183
with:
181-
repository: wpilibsuite/build-tools
184+
repository: photonvision/build-tools
182185
- uses: actions/download-artifact@v4
183186
with:
184187
path: combiner/products/build/allOutputs
@@ -191,15 +194,15 @@ jobs:
191194
working-directory: combiner
192195
- name: Combine (Release)
193196
if: |
194-
github.repository_owner == 'wpilibsuite' &&
197+
github.repository_owner == 'PhotonVision' &&
195198
startsWith(github.ref, 'refs/tags/v')
196199
run: |
197200
./gradlew publish -Pthirdparty
198201
working-directory: combiner
199202
env:
200-
RUN_AZURE_ARTIFACTORY_RELEASE: 'TRUE'
201-
ARTIFACTORY_PUBLISH_USERNAME: ${{ secrets.ARTIFACTORY_USERNAME }}
202-
ARTIFACTORY_PUBLISH_PASSWORD: ${{ secrets.ARTIFACTORY_PASSWORD }}
203+
MAVEN_PUBLISH_URL: 'https://maven.photonvision.org/releases'
204+
MAVEN_PUBLISH_USERNAME: ghactions
205+
MAVEN_PUBLISH_PASSWORD: ${{ secrets.ARTIFACTORY_PASSWORD }}
203206
- uses: actions/upload-artifact@v4
204207
with:
205208
name: Maven

build.gradle

+2-2
Original file line numberDiff line numberDiff line change
@@ -39,7 +39,7 @@ ext {
3939
'-DWITH_OPENCL=OFF',
4040
'-DWITH_FFMPEG=OFF',
4141
'-DWITH_OPENEXR=OFF',
42-
'-DWITH_GSTREAMER=OFF',
42+
'-DWITH_GSTREAMER=ON',
4343
'-DWITH_LAPACK=OFF',
4444
'-DWITH_GTK=OFF',
4545
'-DWITH_1394=OFF',
@@ -54,7 +54,7 @@ ext {
5454
'-DWITH_WEBP=OFF',
5555
'-DBUILD_JAVA=ON',
5656
'-DBUILD_WITH_STATIC_CRT=OFF',
57-
'-DWITH_PROTOBUF=OFF',
57+
'-DWITH_PROTOBUF=ON',
5858
'-DWITH_DIRECTX=OFF',
5959
'-DENABLE_CXX11=ON',
6060
'-DOPENCV_JAVA_SOURCE_VERSION=1.8',

publish.gradle

+16-9
Original file line numberDiff line numberDiff line change
@@ -18,10 +18,10 @@ def pubVersion = "${project.ext.version}-4"
1818
def outputsFolder = file("$project.buildDir/outputs")
1919

2020
def baseArtifactId = 'opencv'
21-
def artifactGroupId = 'edu.wpi.first.thirdparty.frc2024.opencv'
22-
def zipBaseName = '_GROUP_edu_wpi_first_thirdparty_frc2024_opencv_ID_opencv-cpp_CLS'
23-
def jniBaseName = "_GROUP_edu_wpi_first_thirdparty_frc2024_opencv_ID_opencv-jni_CLS"
24-
def javaBaseName = "_GROUP_edu_wpi_first_thirdparty_frc2024_opencv_ID_opencv-java_CLS"
21+
def artifactGroupId = 'org.photonvision.thirdparty.frc2024.opencv'
22+
def zipBaseName = '_GROUP_org_photonvision_thirdparty_frc2024_opencv_ID_opencv-cpp_CLS'
23+
def jniBaseName = "_GROUP_org_photonvision_thirdparty_frc2024_opencv_ID_opencv-jni_CLS"
24+
def javaBaseName = "_GROUP_org_photonvision_thirdparty_frc2024_opencv_ID_opencv-java_CLS"
2525

2626
def versionFile = file("$outputsFolder/version.txt")
2727

@@ -402,6 +402,18 @@ if (!project.hasProperty('jenkinsBuild')) {
402402
}
403403
}
404404

405+
publishing {
406+
repositories {
407+
maven {
408+
url ('https://maven.photonvision.org/releases')
409+
credentials {
410+
username "ghactions"
411+
password System.getenv("PUBLISH_PASSWORD")
412+
}
413+
}
414+
}
415+
}
416+
405417
model {
406418
publishing {
407419
publications {
@@ -435,10 +447,5 @@ model {
435447
version pubVersion
436448
}
437449
}
438-
repositories {
439-
maven {
440-
url "${System.getProperty('user.home')}/releases/maven/${project.repo}"
441-
}
442-
}
443450
}
444451
}

0 commit comments

Comments
 (0)