diff options
| -rw-r--r-- | .gitlab-ci.yml | 8 | ||||
| -rwxr-xr-x | scripts/upload-to-flatpak-repo.sh | 9 |
2 files changed, 6 insertions, 11 deletions
diff --git a/.gitlab-ci.yml b/.gitlab-ci.yml index ec5cc00d..1a23a689 100644 --- a/.gitlab-ci.yml +++ b/.gitlab-ci.yml @@ -170,15 +170,13 @@ build-flatpak-amd64: before_script: - apt-get update && apt-get -y install flatpak-builder git python3 curl python3-aiohttp python3-tenacity gir1.2-ostree-1.0 - flatpak remote-add --user --if-not-exists flathub https://flathub.org/repo/flathub.flatpakrepo - - flatpak --noninteractive install --user flathub org.kde.Platform//5.15-22.08 - - flatpak --noninteractive install --user flathub org.kde.Sdk//5.15-22.08 # see https://github.com/flatpak/flatpak-builder/issues/495 - git config --global protocol.file.allow always script: - export VERSION=$(git describe) - mkdir -p build-flatpak - cd build-flatpak - - flatpak-builder --user --disable-rofiles-fuse --ccache --repo=repo --default-branch=${CI_COMMIT_REF_NAME//\//_} --subject="Build of Nheko ${VERSION} `date`" app ../io.github.NhekoReborn.Nheko.yaml + - flatpak-builder --install-deps-from=flathub --user --disable-rofiles-fuse --ccache --repo=repo --default-branch=${CI_COMMIT_REF_NAME//\//_} --subject="Build of Nheko ${VERSION} `date`" app ../io.github.NhekoReborn.Nheko.yaml - flatpak build-bundle repo nheko-amd64.flatpak io.github.NhekoReborn.Nheko ${CI_COMMIT_REF_NAME//\//_} after_script: - (cd ./scripts && ./upload-to-flatpak-repo.sh ../build-flatpak/repo) || true @@ -202,8 +200,6 @@ build-flatpak-arm64: before_script: - apt-get update && apt-get -y install flatpak-builder git python3 curl python3-aiohttp python3-tenacity gir1.2-ostree-1.0 - flatpak remote-add --user --if-not-exists flathub https://flathub.org/repo/flathub.flatpakrepo - - flatpak --noninteractive install --user flathub org.kde.Platform//5.15-22.08 - - flatpak --noninteractive install --user flathub org.kde.Sdk//5.15-22.08 # see https://github.com/flatpak/flatpak-builder/issues/495 - git config --global protocol.file.allow always script: @@ -211,7 +207,7 @@ build-flatpak-arm64: - if [ "$(grep MemTotal /proc/meminfo | tr -cd '[0-9]')" -lt "6000000" ]; then export EXTRA_FLAGS='--jobs=3'; fi - mkdir -p build-flatpak - cd build-flatpak - - flatpak-builder --user --disable-rofiles-fuse --ccache $EXTRA_FLAGS --repo=repo --default-branch=${CI_COMMIT_REF_NAME//\//_} --subject="Build of Nheko ${VERSION} `date` for arm64" app ../io.github.NhekoReborn.Nheko.yaml + - flatpak-builder --install-deps-from=flathub --user --disable-rofiles-fuse --ccache $EXTRA_FLAGS --repo=repo --default-branch=${CI_COMMIT_REF_NAME//\//_} --subject="Build of Nheko ${VERSION} `date` for arm64" app ../io.github.NhekoReborn.Nheko.yaml - flatpak build-bundle repo nheko-arm64.flatpak io.github.NhekoReborn.Nheko ${CI_COMMIT_REF_NAME//\//_} after_script: - (cd ./scripts && ./upload-to-flatpak-repo.sh ../build-flatpak/repo) || true diff --git a/scripts/upload-to-flatpak-repo.sh b/scripts/upload-to-flatpak-repo.sh index fdb37f82..6f6bff92 100755 --- a/scripts/upload-to-flatpak-repo.sh +++ b/scripts/upload-to-flatpak-repo.sh @@ -6,9 +6,9 @@ if [ -z "$1" ]; then fi if [ -n "${CI_COMMIT_TAG}" ]; then - BUILD_URL=$(./flat-manager-client create https://flatpak.neko.dev stable) + BUILD_URL=$(./flat-manager-client create --public_download https://flatpak.neko.dev stable) elif [ "master" = "${CI_COMMIT_REF_NAME}" ]; then - BUILD_URL=$(./flat-manager-client create https://flatpak.neko.dev nightly) + BUILD_URL=$(./flat-manager-client create --public_download https://flatpak.neko.dev nightly) fi if [ -z "${BUILD_URL}" ]; then @@ -18,7 +18,6 @@ fi BUILD_URL=${BUILD_URL/http:/https:} -./flat-manager-client push $BUILD_URL $1 -./flat-manager-client commit --wait $BUILD_URL -./flat-manager-client publish --wait $BUILD_URL +./flat-manager-client push --commit --wait --wait-update $BUILD_URL $1 +./flat-manager-client publish --wait --wait-update $BUILD_URL |