domi/foxgirl-linux
1
0
Fork 0
Code Issues Pull requests Packages Projects Releases Wiki Activity

update .gitlab-ci.yml file/artifact naming; also add bzip2 to flatpak script

Browse source
This commit is contained in:
ohfp 2020-03-30 11:58:28 +02:00
parent baa005aade
commit daf0d739ab
2 changed files with 13 additions and 13 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

24
.gitlab-ci.yml
View file

@ -27,39 +27,39 @@ stages:
.tarball_build_config: &tarball_build_config .tarball_build_config: &tarball_build_config
stage: build stage: build
script: script:
- ./binary_tarball/build_tarball.sh "${CI_PROJECT_DIR}/LibreWolf.${CARCH}.tar.bz2" - ./binary_tarball/build_tarball.sh "${CI_PROJECT_DIR}/LibreWolf-${pkgver}-${pkgrel}.${CARCH}.tar.bz2"
artifacts: artifacts:
name: "Librewolf-${CI_COMMIT_TAG}-${CARCH}" name: "Librewolf-Tarball-${pkgver}-${pkgrel}-${CARCH}"
paths: paths:
- "LibreWolf.${CARCH}.tar.bz2" - "LibreWolf-${pkgver}-${pkgrel}.${CARCH}.tar.bz2"
.arch_build_config: &arch_build_config .arch_build_config: &arch_build_config
stage: build stage: build
script: script:
- ./arch/01_build.sh - ./arch/01_build.sh
artifacts: artifacts:
name: "Librewolf-Arch-${CI_COMMIT_TAG}-${CARCH}" name: "Librewolf-Arch-${pkgver}-${pkgrel}-${CARCH}"
paths: paths:
- "librewolf*pkg.tar*" - "librewolf-${pkgver}-${pkgrel}-${CARCH}.pkg.tar*"
.flatpak_config: &flatpak_config .flatpak_config: &flatpak_config
stage: paks stage: paks
artifacts: artifacts:
name: "Librewolf-${CI_COMMIT_TAG}-Flatpak-${CARCH}" name: "Librewolf-${pkgver}-${pkgrel}-Flatpak-${CARCH}"
paths: paths:
- "LibreWolf.${CARCH}.flatpak" - "LibreWolf-${pkgver}-${pkgrel}-${CARCH}.flatpak"
- "${CI_PROJECT_DIR}/librewolf-${CARCH}-flatpak-repo" - "${CI_PROJECT_DIR}/librewolf-${pkgver}-${pkgrel}-${CARCH}-flatpak-repo"
script: script:
- ./flatpak/build_flatpak.sh "${CI_PROJECT_DIR}/LibreWolf.${CARCH}.tar.bz2" "${CI_PROJECT_DIR}/librewolf-${CARCH}-flatpak-repo" "${CI_PROJECT_DIR}/LibreWolf.${CARCH}.flatpak" - ./flatpak/build_flatpak.sh "${CI_PROJECT_DIR}/LibreWolf-${pkgver}-${pkgrel}.${CARCH}.tar.bz2" "${CI_PROJECT_DIR}/librewolf-${pkgver}-${pkgrel}-${CARCH}-flatpak-repo" "LibreWolf-${pkgver}-${pkgrel}-${CARCH}.flatpak"
.appimage_config: &appimage_config .appimage_config: &appimage_config
stage: paks stage: paks
artifacts: artifacts:
name: "Librewolf-${CI_COMMIT_TAG}-AppImage-${CARCH}" name: "Librewolf-${pkgver}-${pkgrel}-AppImage-${CARCH}"
paths: paths:
- "LibreWolf.${CARCH}.AppImage" - "LibreWolf-${pkgver}-${pkgrel}.${CARCH}.AppImage"
script: script:
- ./appimage/build_appimage.sh "${CI_PROJECT_DIR}/LibreWolf.${CARCH}.tar.bz2" "${CI_PROJECT_DIR}/LibreWolf.${CARCH}.AppImage" - ./appimage/build_appimage.sh "${CI_PROJECT_DIR}/LibreWolf-${pkgver}-${pkgrel}.${CARCH}.tar.bz2" "${CI_PROJECT_DIR}/LibreWolf-${pkgver}-${pkgrel}.${CARCH}.AppImage"
arch_x86_64: arch_x86_64:
image: archlinux/base image: archlinux/base

2
flatpak/build_flatpak.sh
View file

@ -33,7 +33,7 @@ printf "\nInstalling flatpak build dependencies\n";
# we're using a pre-prepared flatpak-image witch aarch64 # we're using a pre-prepared flatpak-image witch aarch64
apt update && apt install -y software-properties-common apt update && apt install -y software-properties-common
add-apt-repository -y ppa:alexlarsson/flatpak add-apt-repository -y ppa:alexlarsson/flatpak
apt update && apt install -y flatpak-builder apt update && apt install -y flatpak-builder bzip2
flatpak remote-add --if-not-exists $_FLATHUB_REPO; flatpak remote-add --if-not-exists $_FLATHUB_REPO;
flatpak install -y flathub $_FLATHUB_PACKAGES_TO_INSTALL; flatpak install -y flathub $_FLATHUB_PACKAGES_TO_INSTALL;