Skip to content
Merged
Show file tree
Hide file tree
Changes from all commits
Commits
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
3 changes: 2 additions & 1 deletion .github/workflows/build_linux.yml
Original file line number Diff line number Diff line change
Expand Up @@ -368,6 +368,7 @@ jobs:
build-plugin-deb:
name: Build Plugin (${{ matrix.image.tag }}, ${{ matrix.variant }})
needs: [configure, build-projectm-deb, build-projectm-shared-deb]
if: ${{ !cancelled() && !failure() }}
runs-on: ${{ matrix.image.runner }}
strategy:
matrix:
Expand Down Expand Up @@ -450,7 +451,7 @@ jobs:
build-plugin-rpm:
name: Build Plugin (${{ matrix.image.tag }}, ${{ matrix.variant }})
needs: [configure, build-projectm-rpm, build-projectm-shared-rpm]
if: ${{ needs.configure.outputs.build_images_rpm != '[]' }}
if: ${{ !cancelled() && !failure() && needs.configure.outputs.build_images_rpm != '[]' }}
runs-on: ubuntu-latest
container:
image: ${{ matrix.image.container }}
Expand Down
22 changes: 16 additions & 6 deletions .github/workflows/build_portable.yml
Original file line number Diff line number Diff line change
Expand Up @@ -2,8 +2,6 @@ name: Linux Portable

on:
push:
branches:
- master
tags:
- "v*"

Expand Down Expand Up @@ -51,16 +49,19 @@ jobs:
shell: bash
run: |
python3 << 'PYEOF'
import json, os, re
import json, os, re, hashlib

versions = json.loads('''${{ env.APPIMAGE_GSTREAMER_VERSIONS }}''')

result = []
for v in versions:
meson_extra = v.get("meson_extra", "")
meson_hash = hashlib.sha256(meson_extra.encode()).hexdigest()[:8]
entry = {
"version": v["version"],
"tag": re.sub(r'[.]', '_', v["version"]),
"meson_extra": v.get("meson_extra", ""),
"meson_extra": meson_extra,
"cache_key": f"{v['version']}-{meson_hash}",
}
result.append(entry)

Expand Down Expand Up @@ -354,7 +355,7 @@ jobs:
- '# Any arguments are forwarded to gst-launch-1.0 as-is.'
- 'export GST_PLUGIN_PATH=/app/lib/gstreamer-1.0'
- 'if [ $# -eq 0 ]; then'
- ' exec gst-launch-1.0 autoaudiosrc ! audioconvert ! audioresample ! "audio/x-raw, format=S16LE, rate=44100, channels=2, layout=interleaved" ! queue ! projectm ! "video/x-raw(memory:GLMemory),width=1024,height=768,framerate=60/1" ! glimagesink sync=false'
- ' exec gst-launch-1.0 autoaudiosrc ! audioconvert ! audioresample ! "audio/x-raw, format=S16LE, rate=44100, channels=2, layout=interleaved" ! queue ! projectm ! "video/x-raw(memory:GLMemory),width=1024,height=768,framerate=30/1" ! glimagesink'
- 'else'
- ' exec gst-launch-1.0 "$@"'
- 'fi'
Expand Down Expand Up @@ -429,7 +430,15 @@ jobs:
matrix:
gst: ${{ fromJSON(needs.configure-portable.outputs.gstreamer_versions) }}
steps:
- name: Cache GStreamer build
id: cache-gst
uses: actions/cache@v4
with:
path: /opt/gstreamer
key: gstreamer-appimage-${{ matrix.gst.cache_key }}-ubuntu2204-v1

- name: Install build dependencies
if: steps.cache-gst.outputs.cache-hit != 'true'
run: |
apt-get update
DEBIAN_FRONTEND=noninteractive apt-get install -y \
Expand All @@ -453,6 +462,7 @@ jobs:
liborc-0.4-dev

- name: Build GStreamer from source
if: steps.cache-gst.outputs.cache-hit != 'true'
shell: bash
run: |
GST_VERSION="${{ matrix.gst.version }}"
Expand Down Expand Up @@ -739,7 +749,7 @@ jobs:
# With no arguments, runs a default visualization pipeline.
# Any arguments are forwarded to gst-launch-1.0 as-is.
if [ \$# -eq 0 ]; then
exec "\${HERE}/gst-launch-1.0" autoaudiosrc ! audioconvert ! audioresample ! "audio/x-raw, format=S16LE, rate=44100, channels=2, layout=interleaved" ! queue ! projectm ! "video/x-raw(memory:GLMemory),width=1024,height=768,framerate=60/1" ! glimagesink sync=false
exec "\${HERE}/gst-launch-1.0" autoaudiosrc ! audioconvert ! audioresample ! "audio/x-raw, format=S16LE, rate=44100, channels=2, layout=interleaved" ! queue ! projectm ! "video/x-raw(memory:GLMemory),width=1024,height=768,framerate=30/1" ! glimagesink
else
exec "\${HERE}/gst-launch-1.0" "\$@"
fi
Expand Down
18 changes: 0 additions & 18 deletions .github/workflows/build_windows.yml
Original file line number Diff line number Diff line change
Expand Up @@ -41,22 +41,13 @@ jobs:
strategy:
matrix:
include: ${{ fromJson(needs.configure.outputs.projectm_matrix) }}
env:
VCPKG_BINARY_SOURCES: "clear;x-gha,readwrite"
steps:
- uses: actions/checkout@v4
with:
repository: 'projectM-visualizer/projectm'
ref: ${{ env.PROJECTM_REF }}
submodules: 'recursive'

- name: Export GitHub Actions cache environment variables
uses: actions/github-script@v7
with:
script: |
core.exportVariable('ACTIONS_CACHE_URL', process.env.ACTIONS_CACHE_URL || '');
core.exportVariable('ACTIONS_RUNTIME_TOKEN', process.env.ACTIONS_RUNTIME_TOKEN || '');

- name: Restore vcpkg cache (PR only)
if: github.event_name == 'pull_request'
uses: actions/cache/restore@v4
Expand Down Expand Up @@ -112,20 +103,11 @@ jobs:
strategy:
matrix:
include: ${{ fromJson(needs.configure.outputs.plugin_matrix) }}
env:
VCPKG_BINARY_SOURCES: "clear;x-gha,readwrite"
steps:
- uses: actions/checkout@v4
with:
submodules: 'recursive'

- name: Export GitHub Actions cache environment variables
uses: actions/github-script@v7
with:
script: |
core.exportVariable('ACTIONS_CACHE_URL', process.env.ACTIONS_CACHE_URL || '');
core.exportVariable('ACTIONS_RUNTIME_TOKEN', process.env.ACTIONS_RUNTIME_TOKEN || '');

- name: Restore vcpkg cache (PR only)
if: github.event_name == 'pull_request'
uses: actions/cache/restore@v4
Expand Down
Loading