Commit 679e7988 authored by Bartłomiej Piotrowski's avatar Bartłomiej Piotrowski
Browse files

Bug 1677959 - upgrade freedesktop-sdk runtime to 20.08 r=mtabara a=release

The BaseApp has been renamed to follow org.mozilla.firefox ID.
Additionally update the Docker image used to run the flatpak build.

Differential Revision: https://phabricator.services.mozilla.com/D100647
parent 29b1a238
FROM freedesktopsdk/flatpak:19.08-x86_64 FROM freedesktopsdk/flatpak:20.08-x86_64
MAINTAINER release@mozilla.com MAINTAINER release@mozilla.com
RUN mkdir /scripts/ RUN mkdir /scripts/
......
...@@ -25,8 +25,8 @@ export DATE ...@@ -25,8 +25,8 @@ export DATE
SCRIPT_DIRECTORY="$( cd "$( dirname "${BASH_SOURCE[0]}" )" && pwd )" SCRIPT_DIRECTORY="$( cd "$( dirname "${BASH_SOURCE[0]}" )" && pwd )"
TARGET_TAR_XZ_FULL_PATH="$ARTIFACTS_DIR/target.flatpak.tar.xz" TARGET_TAR_XZ_FULL_PATH="$ARTIFACTS_DIR/target.flatpak.tar.xz"
SOURCE_DEST="${WORKSPACE}/source" SOURCE_DEST="${WORKSPACE}/source"
FREEDESKTOP_VERSION="19.08" FREEDESKTOP_VERSION="20.08"
FIREFOX_BASEAPP_CHANNEL="stable" FIREFOX_BASEAPP_CHANNEL="20.08"
# XXX: these commands are temporarily, there's an upcoming fix in the upstream Docker image # XXX: these commands are temporarily, there's an upcoming fix in the upstream Docker image
...@@ -75,12 +75,12 @@ cd "${WORKSPACE}" ...@@ -75,12 +75,12 @@ cd "${WORKSPACE}"
flatpak remote-add --user --if-not-exists --from flathub https://dl.flathub.org/repo/flathub.flatpakrepo flatpak remote-add --user --if-not-exists --from flathub https://dl.flathub.org/repo/flathub.flatpakrepo
# XXX: added --user to `flatpak install` to avoid ambiguity # XXX: added --user to `flatpak install` to avoid ambiguity
flatpak install --user -y flathub org.mozilla.Firefox.BaseApp//${FIREFOX_BASEAPP_CHANNEL} --no-deps flatpak install --user -y flathub org.mozilla.firefox.BaseApp//${FIREFOX_BASEAPP_CHANNEL} --no-deps
# XXX: this command is temporarily, there's an upcoming fix in the upstream Docker image # XXX: this command is temporarily, there's an upcoming fix in the upstream Docker image
# that we work on top of, from `freedesktopsdk`, that will make these two lines go away eventually # that we work on top of, from `freedesktopsdk`, that will make these two lines go away eventually
mkdir -p build mkdir -p build
cp -r ~/.local/share/flatpak/app/org.mozilla.Firefox.BaseApp/current/active/files build/files cp -r ~/.local/share/flatpak/app/org.mozilla.firefox.BaseApp/current/active/files build/files
ARCH=$(flatpak --default-arch) ARCH=$(flatpak --default-arch)
cat <<EOF > build/metadata cat <<EOF > build/metadata
...@@ -88,8 +88,7 @@ cat <<EOF > build/metadata ...@@ -88,8 +88,7 @@ cat <<EOF > build/metadata
name=org.mozilla.firefox name=org.mozilla.firefox
runtime=org.freedesktop.Platform/${ARCH}/${FREEDESKTOP_VERSION} runtime=org.freedesktop.Platform/${ARCH}/${FREEDESKTOP_VERSION}
sdk=org.freedesktop.Sdk/${ARCH}/${FREEDESKTOP_VERSION} sdk=org.freedesktop.Sdk/${ARCH}/${FREEDESKTOP_VERSION}
base=app/org.mozilla.Firefox.BaseApp/${ARCH}/${FIREFOX_BASEAPP_CHANNEL} base=app/org.mozilla.firefox.BaseApp/${ARCH}/${FIREFOX_BASEAPP_CHANNEL}
[Extension org.mozilla.firefox.Locale] [Extension org.mozilla.firefox.Locale]
directory=share/runtime/langpack directory=share/runtime/langpack
autodelete=true autodelete=true
......
Supports Markdown
0% or .
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment