Skip to content

Commit 17dd6a5

Browse files
committed
Build appimage with master branch (Picard 3)
1 parent 15370c9 commit 17dd6a5

File tree

5 files changed

+14
-24
lines changed

5 files changed

+14
-24
lines changed

.github/workflows/build.yml

Lines changed: 2 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -24,6 +24,8 @@ jobs:
2424
runs-on: ubuntu-22.04
2525
steps:
2626
- uses: actions/checkout@v6
27+
- name: Install uv
28+
uses: astral-sh/setup-uv@v7
2729
- name: Install gettext
2830
run: |
2931
sudo apt-get update

appimage/appimage.patch

Lines changed: 0 additions & 15 deletions
This file was deleted.

appimagecraft.yml

Lines changed: 3 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -46,11 +46,11 @@ appimage:
4646
--desktop-file "$PROJECT_ROOT"/source/org.musicbrainz.Picard.desktop \
4747
--custom-apprun "$PROJECT_ROOT"/appimage/AppRun \
4848
--executable "$BUILD_DIR"/chromaprint-fpcalc/fpcalc \
49-
--library /usr/lib/x86_64-linux-gnu/libssl.so.1.1 \
50-
--library /usr/lib/x86_64-linux-gnu/libcrypto.so.1.1 \
5149
--plugin clean
50+
# --library /usr/lib/x86_64-linux-gnu/libssl.so.3 \
51+
# --library /usr/lib/x86_64-linux-gnu/libcrypto.so.3 \
5252
environment:
53-
PIP_REQUIREMENTS: . zstandard
53+
PIP_REQUIREMENTS: .
5454
raw_environment:
5555
- PIP_WORKDIR="$PROJECT_ROOT/source/"
5656
- OUTPUT=MusicBrainz-Picard-daily-"$ARCH".AppImage

build-appimage.sh

Lines changed: 7 additions & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -9,14 +9,17 @@ SOURCE_DIR="$ROOT_DIR/source/"
99
cd "$ROOT_DIR"
1010

1111
[ ! -d "$SOURCE_DIR" ] || rm -rf "$SOURCE_DIR"
12-
git clone --depth 500 --branch 2.x "https://github.com/metabrainz/picard.git" "$SOURCE_DIR"
12+
git clone --depth 500 --branch master "https://github.com/metabrainz/picard.git" "$SOURCE_DIR"
1313
pushd "$SOURCE_DIR"
1414
git fetch --depth=1 origin "+refs/tags/release-*:refs/tags/release-*"
15-
patch -p1 < ../appimage/appimage.patch
15+
# patch -p1 < ../appimage/appimage.patch
16+
uv sync
17+
uv run ../patch-version.sh
18+
uv run python setup.py build --disable-locales
19+
uv run python setup.py build_locales
20+
uv run python setup.py build_ext -i
1621
popd
1722

18-
./patch-version.sh
19-
2023
curl -Lo appimagecraft.AppImage "$APPIMAGECRAFT_URL"
2124
chmod +x appimagecraft.AppImage
2225

patch-version.sh

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -4,8 +4,8 @@ set -e
44
cd "$(dirname $0)/source"
55
RELEASE_TAG=$(git describe --match "release-*" --abbrev=0 --always HEAD)
66
CHANGE_COUNT=$(git rev-list --count "$RELEASE_TAG..HEAD")
7-
COMIT_HASH=$(git rev-parse --short HEAD)
7+
COMMIT_HASH=$(git rev-parse --short HEAD)
88

9-
python setup.py patch_version --platform="$CHANGE_COUNT-$COMIT_HASH"
9+
python setup.py patch_version --platform="$CHANGE_COUNT-$COMMIT_HASH"
1010

1111
echo $(python -c "import picard; print(picard.__version__)")

0 commit comments

Comments
 (0)