diff options
| author | ohfp <1813007-ohfp@users.noreply.gitlab.com> | 2020-03-30 11:58:28 +0200 |
|---|---|---|
| committer | ohfp <1813007-ohfp@users.noreply.gitlab.com> | 2020-03-30 11:58:28 +0200 |
| commit | daf0d739ab837640aacfd8d76a72af5e8804f276 (patch) | |
| tree | 80ed0d7f495df64cdb99681264eedeccc7d31252 | |
| parent | bzip2 dependency for appimage script (diff) | |
| download | librewolf-linux-daf0d739ab837640aacfd8d76a72af5e8804f276.tar.gz librewolf-linux-daf0d739ab837640aacfd8d76a72af5e8804f276.tar.bz2 librewolf-linux-daf0d739ab837640aacfd8d76a72af5e8804f276.zip | |
update .gitlab-ci.yml file/artifact naming; also add bzip2 to flatpak script
| -rw-r--r-- | .gitlab-ci.yml | 24 | ||||
| -rwxr-xr-x | flatpak/build_flatpak.sh | 2 |
2 files changed, 13 insertions, 13 deletions
diff --git a/.gitlab-ci.yml b/.gitlab-ci.yml index 5dafff8..7e7c68c 100644 --- a/.gitlab-ci.yml +++ b/.gitlab-ci.yml @@ -27,39 +27,39 @@ stages: .tarball_build_config: &tarball_build_config stage: build 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: - name: "Librewolf-${CI_COMMIT_TAG}-${CARCH}" + name: "Librewolf-Tarball-${pkgver}-${pkgrel}-${CARCH}" paths: - - "LibreWolf.${CARCH}.tar.bz2" + - "LibreWolf-${pkgver}-${pkgrel}.${CARCH}.tar.bz2" .arch_build_config: &arch_build_config stage: build script: - ./arch/01_build.sh artifacts: - name: "Librewolf-Arch-${CI_COMMIT_TAG}-${CARCH}" + name: "Librewolf-Arch-${pkgver}-${pkgrel}-${CARCH}" paths: - - "librewolf*pkg.tar*" + - "librewolf-${pkgver}-${pkgrel}-${CARCH}.pkg.tar*" .flatpak_config: &flatpak_config stage: paks artifacts: - name: "Librewolf-${CI_COMMIT_TAG}-Flatpak-${CARCH}" + name: "Librewolf-${pkgver}-${pkgrel}-Flatpak-${CARCH}" paths: - - "LibreWolf.${CARCH}.flatpak" - - "${CI_PROJECT_DIR}/librewolf-${CARCH}-flatpak-repo" + - "LibreWolf-${pkgver}-${pkgrel}-${CARCH}.flatpak" + - "${CI_PROJECT_DIR}/librewolf-${pkgver}-${pkgrel}-${CARCH}-flatpak-repo" 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 stage: paks artifacts: - name: "Librewolf-${CI_COMMIT_TAG}-AppImage-${CARCH}" + name: "Librewolf-${pkgver}-${pkgrel}-AppImage-${CARCH}" paths: - - "LibreWolf.${CARCH}.AppImage" + - "LibreWolf-${pkgver}-${pkgrel}.${CARCH}.AppImage" 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: image: archlinux/base diff --git a/flatpak/build_flatpak.sh b/flatpak/build_flatpak.sh index 72691b0..f5fe739 100755 --- a/flatpak/build_flatpak.sh +++ b/flatpak/build_flatpak.sh @@ -33,7 +33,7 @@ printf "\nInstalling flatpak build dependencies\n"; # we're using a pre-prepared flatpak-image witch aarch64 apt update && apt install -y software-properties-common 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 install -y flathub $_FLATHUB_PACKAGES_TO_INSTALL; |