proxmox-mirrors/fwupd
1
0
Fork 0
mirror of https://git.proxmox.com/git/fwupd synced 2025-08-07 10:27:36 +00:00
Code Issues Actions Packages Projects Releases Wiki Activity

trivial: Use the correct branch when building a flatpak bundle

Browse Source
This commit is contained in:
Richard Hughes 2018-05-31 21:13:19 +01:00
parent 7e683c96eb
commit 121aa439b9
2 changed files with 27 additions and 3 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

28
contrib/ci/flatpak.sh
View File

@ -2,13 +2,37 @@
set -e set -e
set -x set -x
# get the correct branch to use
if [ -z "$FWUPD_BRANCH" ]; then
if [ -n $TRAVIS_BRANCH ]; then
export FWUPD_BRANCH=$TRAVIS_BRANCH
fi
if [ -n $TRAVIS_PULL_REQUEST_BRANCH ]; then
export FWUPD_BRANCH=$TRAVIS_PULL_REQUEST_BRANCH
fi
fi
if [ -z "$FWUPD_BRANCH" ]; then
GIT_BRANCH=`git rev-parse --abbrev-ref HEAD`
if [ $GIT_BRANCH != "HEAD" ]; then
export FWUPD_BRANCH=$GIT_BRANCH
fi
fi
if [ -z "$FWUPD_BRANCH" ]; then
exit 0
fi
# install the runtimes # install the runtimes
flatpak remote-add --if-not-exists flathub https://dl.flathub.org/repo/flathub.flatpakrepo flatpak remote-add --if-not-exists flathub https://dl.flathub.org/repo/flathub.flatpakrepo
flatpak install flathub runtime/org.gnome.Sdk/x86_64/3.28 flatpak install flathub runtime/org.gnome.Sdk/x86_64/3.28
flatpak install flathub runtime/org.gnome.Platform/x86_64/3.28 flatpak install flathub runtime/org.gnome.Platform/x86_64/3.28
# build the bundle # copy in the branch
flatpak-builder --repo=repo --force-clean --disable-rofiles-fuse build-dir contrib/org.freedesktop.fwupd.json rm -rf build
mkdir build
envsubst < contrib/org.freedesktop.fwupd.json > build/org.freedesktop.fwupd.json
# build the repo
flatpak-builder --repo=repo --force-clean --disable-rofiles-fuse build-dir build/org.freedesktop.fwupd.json
# show the files that were included # show the files that were included
tree build-dir tree build-dir

2
contrib/org.freedesktop.fwupd.json
View File

@ -167,7 +167,7 @@
{ {
"type": "git", "type": "git",
"url": "https://github.com/hughsie/fwupd.git", "url": "https://github.com/hughsie/fwupd.git",
"branch": "master" "branch": "$FWUPD_BRANCH"
} }
] ]
} }