github/chromebrew
1
1
Fork 0
mirror of https://github.com/chromebrew/chromebrew.git synced 2026-01-09 15:37:56 -05:00
Code Issues Packages Projects Releases Wiki Activity

maelstrom — audaspace → 1.8.0 (#13555)

Browse Source 
* Modify tools/build_updated_packages.rb to support rebuilds

* Modify .github/workflows/Build.yml to support rebuilds and pass arguments more cleanly

* Rework adding files in the generate PR workflow

* test

* maelstrom: Package File Update Run on linux/amd64 container.

* maelstrom: Package File Update Run on linux/arm/v7 container.

* fix pr title determining error caught by lint

---------

Co-authored-by: Zopolis4 <creatorsmithmdt@gmail.com>
Co-authored-by: chromebrew-actions[bot] <chromebrew-actions[bot]@users.noreply.github.com>
This commit is contained in:
chromebrew-actions[bot]
2025-11-22 02:11:55 -06:00
committed by GitHub
parent 5d96e03bda
commit 4cf2be9030
8 changed files with 68 additions and 71 deletions
Download Patch File Download Diff File Expand all files Collapse all files

33
.github/workflows/Build.yml vendored
View File

@@ -1,6 +1,6 @@
---
name: Build
run-name: Build ${{ inputs.branch || github.ref_name }} for ${{ ( inputs.build-on-i686 ) && ' i686 ' || '' }}${{ ( inputs.build-on-x86_64 ) && ' x86_64 ' || '' }}${{ ( inputs.build-on-armv7l ) && ' armv7l ' || '' }} by @${{ github.actor }}
run-name: Build ${{ inputs.branch || github.ref_name }} for ${{ inputs.build-on }} by @${{ github.actor }}
on:
workflow_dispatch:
inputs:
@@ -18,6 +18,11 @@ on:
required: false
type: boolean
default: 'false'
rebuild_packages:
description: "Rebuild packages even if they already have binaries."
required: false
type: boolean
default: 'false'
pr_title:
description: "Title of PR"
required: false
@@ -37,20 +42,10 @@ on:
required: false
type: number
default: 5.5
build-on-i686:
description: "Build on i686"
default: true
type: boolean
required: false
build-on-x86_64:
description: "Build on x86_64"
default: true
type: boolean
required: false
build-on-armv7l:
description: "Build on armv7l"
default: true
type: boolean
build-on:
description: "Architectures to build on"
default: 'i686 x86_64 armv7l'
type: string
required: false
env:
BRANCH: ${{ inputs.branch || github.ref_name }}
@@ -188,9 +183,9 @@ jobs:
armv7l_PACKAGES: ${{ steps.get-compatibility.outputs.armv7l_PACKAGES }}
run: |
function join_by { local IFS="$1"; shift; echo "$*"; }
[[ "${{ ( inputs.build-on-i686) }}" == 'true' ]] && [[ -n "${i686_PACKAGES}" ]] && export CONTAINER_ARCH+=( "\"i686\"" )
[[ "${{ ( inputs.build-on-x86_64) }}" == 'true' ]] && [[ -n "${x86_64_PACKAGES}" ]] && export CONTAINER_ARCH+=( "\"x86_64\"" )
[[ "${{ ( inputs.build-on-armv7l) }}" == 'true' ]] && [[ -n "${armv7l_PACKAGES}" ]] && export CONTAINER_ARCH+=( "\"armv7l\"" )
[[ "${{ ( inputs.build-on) }}" =~ "i686" ]] && [[ -n "${i686_PACKAGES}" ]] && export CONTAINER_ARCH+=( "\"i686\"" )
[[ "${{ ( inputs.build-on) }}" =~ "x86_64" ]] && [[ -n "${x86_64_PACKAGES}" ]] && export CONTAINER_ARCH+=( "\"x86_64\"" )
[[ "${{ ( inputs.build-on) }}" =~ "armv7l" ]] && [[ -n "${armv7l_PACKAGES}" ]] && export CONTAINER_ARCH+=( "\"armv7l\"" )
export ARCHES="$(join_by , "${CONTAINER_ARCH[@]}")"
echo "matrix=[${ARCHES}]" >> $GITHUB_OUTPUT
echo "matrix=[${ARCHES}]"
@@ -378,7 +373,7 @@ jobs:
--tmpfs /tmp \
--ulimit "nofile=$(ulimit -Sn):$(ulimit -Hn)" \
"${CONTAINER}" \
/bin/chromebrewstart "/output/tools/github_actions_update_builder${{ github.event.inputs.allow_fail == 'true' && '_allowing_failures' || ''}}.sh" > >(tee -a /tmp/build.log) 2> >(tee -a /tmp/build.log >&2)
/bin/chromebrewstart "/output/tools/github_actions_update_builder.sh ${{ github.event.inputs.allow_fail == 'true' && '--continue-after-failed-builds' || ''}} ${{ github.event.inputs.rebuild_packages == 'true' && '--rebuild' || ''}}" > >(tee -a /tmp/build.log) 2> >(tee -a /tmp/build.log >&2)
grep "Built and Uploaded:" /tmp/build.log || true
echo "Deleting build output directories."
sudo rm -rf release pkg_cache

5
.github/workflows/Generate-PR.yml vendored
View File

@@ -365,7 +365,7 @@ jobs:
--tmpfs /tmp \
--ulimit "nofile=$(ulimit -Sn):$(ulimit -Hn)" \
"${CONTAINER}" \
/bin/chromebrewstart "/output/tools/github_actions_update_builder_allowing_failures.sh" > >(tee -a /tmp/build.log) 2> >(tee -a /tmp/build.log >&2)
/bin/chromebrewstart "/output/tools/github_actions_update_builder.sh --continue-after-failed-builds" > >(tee -a /tmp/build.log) 2> >(tee -a /tmp/build.log >&2)
grep "Built and Uploaded:" /tmp/build.log || true
echo "Deleting build output directories."
sudo rm -rf release pkg_cache
@@ -378,8 +378,7 @@ jobs:
git stash || true
git fetch origin ${{ inputs.branch || github.ref_name }}
git stash pop || true
git add -A
git commit -m "${{ inputs.branch || github.ref_name }}: Package File Update Run on ${PLATFORM} container." && git push origin ${{ inputs.branch || github.ref_name }}
git commit -am "${{ inputs.branch || github.ref_name }}: Package File Update Run on ${PLATFORM} container." && git push origin ${{ inputs.branch || github.ref_name }}
git log --oneline -10
fi
build-check:

34
manifest/armv7l/a/audaspace.filelist
View File

@@ -1,4 +1,4 @@
# Total size: 2783209
# Total size: 2857019
/usr/local/include/audaspace/AUD_Device.h
/usr/local/include/audaspace/AUD_DynamicMusic.h
/usr/local/include/audaspace/AUD_Handle.h
@@ -34,6 +34,8 @@
/usr/local/include/audaspace/fx/ADSR.h
/usr/local/include/audaspace/fx/ADSRReader.h
/usr/local/include/audaspace/fx/Accumulator.h
/usr/local/include/audaspace/fx/AnimateableTimeStretchPitchScale.h
/usr/local/include/audaspace/fx/AnimateableTimeStretchPitchScaleReader.h
/usr/local/include/audaspace/fx/BaseIIRFilterReader.h
/usr/local/include/audaspace/fx/BinauralReader.h
/usr/local/include/audaspace/fx/BinauralSound.h
@@ -83,6 +85,8 @@
/usr/local/include/audaspace/fx/Source.h
/usr/local/include/audaspace/fx/Sum.h
/usr/local/include/audaspace/fx/Threshold.h
/usr/local/include/audaspace/fx/TimeStretchPitchScale.h
/usr/local/include/audaspace/fx/TimeStretchPitchScaleReader.h
/usr/local/include/audaspace/fx/Volume.h
/usr/local/include/audaspace/fx/VolumeReader.h
/usr/local/include/audaspace/fx/VolumeSound.h
@@ -99,6 +103,7 @@
/usr/local/include/audaspace/generator/TriangleReader.h
/usr/local/include/audaspace/plugin/PluginManager.h
/usr/local/include/audaspace/python/PyAPI.h
/usr/local/include/audaspace/python/PyAnimateableProperty.h
/usr/local/include/audaspace/python/PyDevice.h
/usr/local/include/audaspace/python/PyDynamicMusic.h
/usr/local/include/audaspace/python/PyHandle.h
@@ -142,6 +147,7 @@
/usr/local/include/audaspace/util/ThreadPool.h
/usr/local/include/python3.13/audaspace/Audaspace.h
/usr/local/include/python3.13/audaspace/PyAPI.h
/usr/local/include/python3.13/audaspace/PyAnimateableProperty.h
/usr/local/include/python3.13/audaspace/PyDevice.h
/usr/local/include/python3.13/audaspace/PyDynamicMusic.h
/usr/local/include/python3.13/audaspace/PyHandle.h
@@ -152,26 +158,26 @@
/usr/local/include/python3.13/audaspace/PySource.h
/usr/local/include/python3.13/audaspace/PyThreadPool.h
/usr/local/lib/libaudaspace-c.so
/usr/local/lib/libaudaspace-c.so.1.7
/usr/local/lib/libaudaspace-c.so.1.8
/usr/local/lib/libaudaspace-py.so
/usr/local/lib/libaudaspace-py.so.1.7
/usr/local/lib/libaudaspace-py.so.1.8
/usr/local/lib/libaudaspace.so
/usr/local/lib/libaudaspace.so.1.7
/usr/local/lib/libaudaspace.so.1.8
/usr/local/lib/pkgconfig/audaspace.pc
/usr/local/lib/python3.13/site-packages/aud.cpython-313-arm-linux-gnueabihf.so
/usr/local/lib/python3.13/site-packages/audaspace-1.7.0-py3.13.egg-info/PKG-INFO
/usr/local/lib/python3.13/site-packages/audaspace-1.7.0-py3.13.egg-info/SOURCES.txt
/usr/local/lib/python3.13/site-packages/audaspace-1.7.0-py3.13.egg-info/dependency_links.txt
/usr/local/lib/python3.13/site-packages/audaspace-1.7.0-py3.13.egg-info/top_level.txt
/usr/local/lib/python3.13/site-packages/audaspace-1.8.0-py3.13.egg-info/PKG-INFO
/usr/local/lib/python3.13/site-packages/audaspace-1.8.0-py3.13.egg-info/SOURCES.txt
/usr/local/lib/python3.13/site-packages/audaspace-1.8.0-py3.13.egg-info/dependency_links.txt
/usr/local/lib/python3.13/site-packages/audaspace-1.8.0-py3.13.egg-info/top_level.txt
/usr/local/share/audaspace/plugins/libaudffmpeg.so
/usr/local/share/audaspace/plugins/libaudffmpeg.so.1.7
/usr/local/share/audaspace/plugins/libaudffmpeg.so.1.8
/usr/local/share/audaspace/plugins/libaudjack.so
/usr/local/share/audaspace/plugins/libaudjack.so.1.7
/usr/local/share/audaspace/plugins/libaudjack.so.1.8
/usr/local/share/audaspace/plugins/libaudlibsndfile.so
/usr/local/share/audaspace/plugins/libaudlibsndfile.so.1.7
/usr/local/share/audaspace/plugins/libaudlibsndfile.so.1.8
/usr/local/share/audaspace/plugins/libaudopenal.so
/usr/local/share/audaspace/plugins/libaudopenal.so.1.7
/usr/local/share/audaspace/plugins/libaudopenal.so.1.8
/usr/local/share/audaspace/plugins/libaudpulseaudio.so
/usr/local/share/audaspace/plugins/libaudpulseaudio.so.1.7
/usr/local/share/audaspace/plugins/libaudpulseaudio.so.1.8
/usr/local/share/audaspace/plugins/libaudsdl.so
/usr/local/share/audaspace/plugins/libaudsdl.so.1.7
/usr/local/share/audaspace/plugins/libaudsdl.so.1.8

34
manifest/x86_64/a/audaspace.filelist
View File

@@ -1,4 +1,4 @@
# Total size: 3129667
# Total size: 3217257
/usr/local/include/audaspace/AUD_Device.h
/usr/local/include/audaspace/AUD_DynamicMusic.h
/usr/local/include/audaspace/AUD_Handle.h
@@ -34,6 +34,8 @@
/usr/local/include/audaspace/fx/ADSR.h
/usr/local/include/audaspace/fx/ADSRReader.h
/usr/local/include/audaspace/fx/Accumulator.h
/usr/local/include/audaspace/fx/AnimateableTimeStretchPitchScale.h
/usr/local/include/audaspace/fx/AnimateableTimeStretchPitchScaleReader.h
/usr/local/include/audaspace/fx/BaseIIRFilterReader.h
/usr/local/include/audaspace/fx/BinauralReader.h
/usr/local/include/audaspace/fx/BinauralSound.h
@@ -83,6 +85,8 @@
/usr/local/include/audaspace/fx/Source.h
/usr/local/include/audaspace/fx/Sum.h
/usr/local/include/audaspace/fx/Threshold.h
/usr/local/include/audaspace/fx/TimeStretchPitchScale.h
/usr/local/include/audaspace/fx/TimeStretchPitchScaleReader.h
/usr/local/include/audaspace/fx/Volume.h
/usr/local/include/audaspace/fx/VolumeReader.h
/usr/local/include/audaspace/fx/VolumeSound.h
@@ -99,6 +103,7 @@
/usr/local/include/audaspace/generator/TriangleReader.h
/usr/local/include/audaspace/plugin/PluginManager.h
/usr/local/include/audaspace/python/PyAPI.h
/usr/local/include/audaspace/python/PyAnimateableProperty.h
/usr/local/include/audaspace/python/PyDevice.h
/usr/local/include/audaspace/python/PyDynamicMusic.h
/usr/local/include/audaspace/python/PyHandle.h
@@ -142,6 +147,7 @@
/usr/local/include/audaspace/util/ThreadPool.h
/usr/local/include/python3.13/audaspace/Audaspace.h
/usr/local/include/python3.13/audaspace/PyAPI.h
/usr/local/include/python3.13/audaspace/PyAnimateableProperty.h
/usr/local/include/python3.13/audaspace/PyDevice.h
/usr/local/include/python3.13/audaspace/PyDynamicMusic.h
/usr/local/include/python3.13/audaspace/PyHandle.h
@@ -152,26 +158,26 @@
/usr/local/include/python3.13/audaspace/PySource.h
/usr/local/include/python3.13/audaspace/PyThreadPool.h
/usr/local/lib/libaudaspace-c.so
/usr/local/lib/libaudaspace-c.so.1.7
/usr/local/lib/libaudaspace-c.so.1.8
/usr/local/lib/libaudaspace-py.so
/usr/local/lib/libaudaspace-py.so.1.7
/usr/local/lib/libaudaspace-py.so.1.8
/usr/local/lib/libaudaspace.so
/usr/local/lib/libaudaspace.so.1.7
/usr/local/lib/libaudaspace.so.1.8
/usr/local/lib/pkgconfig/audaspace.pc
/usr/local/lib64/python3.13/site-packages/aud.cpython-313-x86_64-linux-gnu.so
/usr/local/lib64/python3.13/site-packages/audaspace-1.7.0-py3.13.egg-info/PKG-INFO
/usr/local/lib64/python3.13/site-packages/audaspace-1.7.0-py3.13.egg-info/SOURCES.txt
/usr/local/lib64/python3.13/site-packages/audaspace-1.7.0-py3.13.egg-info/dependency_links.txt
/usr/local/lib64/python3.13/site-packages/audaspace-1.7.0-py3.13.egg-info/top_level.txt
/usr/local/lib64/python3.13/site-packages/audaspace-1.8.0-py3.13.egg-info/PKG-INFO
/usr/local/lib64/python3.13/site-packages/audaspace-1.8.0-py3.13.egg-info/SOURCES.txt
/usr/local/lib64/python3.13/site-packages/audaspace-1.8.0-py3.13.egg-info/dependency_links.txt
/usr/local/lib64/python3.13/site-packages/audaspace-1.8.0-py3.13.egg-info/top_level.txt
/usr/local/share/audaspace/plugins/libaudffmpeg.so
/usr/local/share/audaspace/plugins/libaudffmpeg.so.1.7
/usr/local/share/audaspace/plugins/libaudffmpeg.so.1.8
/usr/local/share/audaspace/plugins/libaudjack.so
/usr/local/share/audaspace/plugins/libaudjack.so.1.7
/usr/local/share/audaspace/plugins/libaudjack.so.1.8
/usr/local/share/audaspace/plugins/libaudlibsndfile.so
/usr/local/share/audaspace/plugins/libaudlibsndfile.so.1.7
/usr/local/share/audaspace/plugins/libaudlibsndfile.so.1.8
/usr/local/share/audaspace/plugins/libaudopenal.so
/usr/local/share/audaspace/plugins/libaudopenal.so.1.7
/usr/local/share/audaspace/plugins/libaudopenal.so.1.8
/usr/local/share/audaspace/plugins/libaudpulseaudio.so
/usr/local/share/audaspace/plugins/libaudpulseaudio.so.1.7
/usr/local/share/audaspace/plugins/libaudpulseaudio.so.1.8
/usr/local/share/audaspace/plugins/libaudsdl.so
/usr/local/share/audaspace/plugins/libaudsdl.so.1.7
/usr/local/share/audaspace/plugins/libaudsdl.so.1.8

9
packages/audaspace.rb
View File

@@ -3,7 +3,7 @@ require 'buildsystems/cmake'
class Audaspace < CMake
description 'A high level and feature rich audio library written in C++ with language bindings.'
homepage 'https://github.com/audaspace/audaspace'
version '1.7.0'
version '1.8.0'
license 'Apache-2.0'
compatibility 'aarch64 armv7l x86_64'
source_url 'https://github.com/audaspace/audaspace.git'
@@ -11,9 +11,9 @@ class Audaspace < CMake
binary_compression 'tar.zst'
binary_sha256({
aarch64: '835cf27f1986f3ad80a2f934f294c9337d4df96f9af49d655534ad3b1f1befb7',
armv7l: '835cf27f1986f3ad80a2f934f294c9337d4df96f9af49d655534ad3b1f1befb7',
x86_64: 'f76c47cc84a520d4e99794132d94cb79396e615cdeffe41ecfce0da1fcd9a98d'
aarch64: 'fc777ccb60695a4388c44ae0ff04efbad4668ce6b0391c313e840e1534425fb1',
armv7l: 'fc777ccb60695a4388c44ae0ff04efbad4668ce6b0391c313e840e1534425fb1',
x86_64: '3c707d185f52a49a4ab7a3b33b7a1c5d574585498ff7a59edb9506fe1ef3bc0b'
})
depends_on 'ffmpeg' # R
@@ -28,6 +28,7 @@ class Audaspace < CMake
depends_on 'pulseaudio' # R
depends_on 'py3_numpy' => :build
depends_on 'python3' # R
depends_on 'rubberband' # R
depends_on 'sdl2' # R
# audaspace needs the single-precision build of fftw, which we do not provide.

7
tools/build_updated_packages.rb
View File

@@ -30,7 +30,7 @@ require_gem 'timeout'
# Add >LOCAL< lib to LOAD_PATH
$LOAD_PATH.unshift File.join(crew_local_repo_root, 'lib')
OPTIONS = %w[-h --help --check-all-python --check-all-ruby --continue-after-failed-builds --skip -v --verbose -vv]
OPTIONS = %w[-h --help --check-all-python --check-all-ruby --continue-after-failed-builds --rebuild --skip -v --verbose -vv]
if ARGV.include?('-h') || ARGV.include?('--help')
abort <<~EOM
@@ -38,6 +38,7 @@ if ARGV.include?('-h') || ARGV.include?('--help')
Example: ./build_updated_packages.rb abcde -v
If <package> is omitted, recently updated files will be checked for needed builds.
Passing --continue-after-failed-builds will continue if builds fail.
Passing --rebuild will rebuild packages even if binaries already exist upstream.
Passing --skip will skip update checks.
Passing --check-all-python will check py3_ pip packages for updates.
Passing --check-all-ruby will check ruby_ gem packages for updates.
@@ -51,6 +52,7 @@ abort "\nGITLAB_TOKEN_USERNAME environment variable not set.\n".lightred if ENV[
puts "Setting the CREW_AGREE_TIMEOUT_SECONDS environment variable to less than the default of #{CREW_AGREE_TIMEOUT_SECONDS} may speed this up...".orange if ENV['CREW_AGREE_TIMEOUT_SECONDS'].nil?
CONTINUE_AFTER_FAILED_BUILDS = ARGV.include?('--continue-after-failed-builds')
REBUILD_PACKAGES = ARGV.include?('--rebuild')
SKIP_UPDATE_CHECKS = ARGV.include?('--skip')
CHECK_ALL_PYTHON = ARGV.include?('--check-all-python')
CHECK_ALL_RUBY = ARGV.include?('--check-all-ruby')
@@ -103,6 +105,9 @@ def self.check_build_uploads(architectures_to_check = nil, name = nil)
return [] if @pkg_obj.is_fake?
architectures_to_check.delete('aarch64')
architectures_to_check = %w[x86_64 armv7l i686] if (architectures_to_check & %w[x86_64 armv7l i686]).nil?
return architectures_to_check if REBUILD_PACKAGES
remote_binary = { armv7l: nil, i686: nil, x86_64: nil }
remote_binary.keys.each do |arch|
arch_specific_url = "#{CREW_GITLAB_PKG_REPO}/generic/#{name}/#{@pkg_obj.version}_#{arch}/#{name}-#{@pkg_obj.version}-chromeos-#{arch}.#{@pkg_obj.binary_compression}"

2
tools/github_actions_update_builder.sh
View File

@@ -12,4 +12,4 @@ export CREW_AGREE_TIMEOUT_SECONDS=1
# Deal with a regexp_parser gem issue
gem install regexp_parser
yes | crew install ruby_rubocop
tools/build_updated_packages.rb --skip || exit 1
tools/build_updated_packages.rb --skip $1 $2 || exit 1

15
tools/github_actions_update_builder_allowing_failures.sh
View File

@@ -1,15 +0,0 @@
#!/bin/bash
# Mapping of /output should be set in the docker run options for the
# run-updater step of the generate job in .github/workflows/Updater.yml
# Version 1.0
cd /output/ || exit 1
crew update && yes | crew upgrade || true
unset LD_AUDIT
yes | crew upgrade || true
source ~/.bashrc
git config --global --add safe.directory /output
export CREW_AGREE_TIMEOUT_SECONDS=1
# Deal with a regexp_parser gem issue
gem install regexp_parser
yes | crew install ruby_rubocop
tools/build_updated_packages.rb --skip --continue-after-failed-builds || exit 1