build/linux: Rename suffix of flatpak scripts to flatpakbuilder
Since the praxis in all other scripts is to name the suffix with the toolkit name
This commit is contained in:
parent
2aee80b77f
commit
9e1c1e314a
4 changed files with 6 additions and 6 deletions
|
|
@ -395,7 +395,7 @@ deps-flatpak-x64:
|
|||
#paths:
|
||||
#- .flatpak-builder/
|
||||
script:
|
||||
- sh build/linux/flatpak/1_build-deps-flatpak.sh
|
||||
- sh build/linux/flatpak/1_build-deps-flatpakbuilder.sh
|
||||
artifacts:
|
||||
paths:
|
||||
- .flatpak-builder.tar
|
||||
|
|
@ -411,7 +411,7 @@ gimp-flatpak-x64:
|
|||
variables:
|
||||
GIT_SUBMODULE_STRATEGY: recursive
|
||||
script:
|
||||
- sh build/linux/flatpak/2_build-gimp-flatpak.sh
|
||||
- sh build/linux/flatpak/2_build-gimp-flatpakbuilder.sh
|
||||
artifacts:
|
||||
paths:
|
||||
- repo.tar
|
||||
|
|
@ -751,7 +751,7 @@ dist-flatpak-weekly:
|
|||
needs: ["gimp-flatpak-x64"]
|
||||
stage: distribution
|
||||
script:
|
||||
- sh build/linux/flatpak/3_dist-gimp-flatpak.sh
|
||||
- sh build/linux/flatpak/3_dist-gimp-flatpakbuilder.sh
|
||||
artifacts:
|
||||
expose_as: 'Linux flatpak'
|
||||
paths:
|
||||
|
|
|
|||
|
|
@ -9,7 +9,7 @@ set -e
|
|||
|
||||
if [ -z "$GITLAB_CI" ]; then
|
||||
# Make the script work locally
|
||||
if [ "$0" != 'build/linux/flatpak/1_build-deps-flatpak.sh' ] && [ $(basename "$PWD") != 'flatpak' ]; then
|
||||
if [ "$0" != 'build/linux/flatpak/1_build-deps-flatpakbuilder.sh' ] && [ $(basename "$PWD") != 'flatpak' ]; then
|
||||
printf '\033[31m(ERROR)\033[0m: Script called from wrong dir. Please, read: https://developer.gimp.org/core/setup/build/linux/\n'
|
||||
exit 1
|
||||
elif [ $(basename "$PWD") = 'flatpak' ]; then
|
||||
|
|
@ -9,7 +9,7 @@ set -e
|
|||
|
||||
if [ -z "$GITLAB_CI" ]; then
|
||||
# Make the script work locally
|
||||
if [ "$0" != 'build/linux/flatpak/2_build-gimp-flatpak.sh' ] && [ $(basename "$PWD") != 'flatpak' ]; then
|
||||
if [ "$0" != 'build/linux/flatpak/2_build-gimp-flatpakbuilder.sh' ] && [ $(basename "$PWD") != 'flatpak' ]; then
|
||||
printf '\033[31m(ERROR)\033[0m: Script called from wrong dir. Please, read: https://developer.gimp.org/core/setup/build/linux/\n'
|
||||
exit 1
|
||||
elif [ $(basename "$PWD") = 'flatpak' ]; then
|
||||
|
|
@ -21,7 +21,7 @@ fi
|
|||
|
||||
|
||||
# Install part of the deps
|
||||
eval "$(sed -n '/Install part/,/End of check/p' build/linux/flatpak/1_build-deps-flatpak.sh)"
|
||||
eval "$(sed -n '/Install part/,/End of check/p' build/linux/flatpak/1_build-deps-flatpakbuilder.sh)"
|
||||
|
||||
if [ "$GITLAB_CI" ]; then
|
||||
# Extract deps from previous job
|
||||
Loading…
Reference in a new issue