diff --git a/.gitlab-ci.yml b/.gitlab-ci.yml index b4d3bc5..d737d72 100644 --- a/.gitlab-ci.yml +++ b/.gitlab-ci.yml @@ -9,16 +9,16 @@ variables: # AARCH64: $AARCH64 # X86_64: $X86_64 -#tarball_x86_64: -# image: ghcr.io/void-linux/void-linux:latest-thin-bb-x86_64 -# stage: build -# script: -# - xbps-install -Sy bash -# - bash ./build_tarball.sh "${CI_PROJECT_DIR}/Foxgirl-${pkgver}-${pkgrel}.${CARCH}.tar.bz2" -# artifacts: -# name: "Foxgirl-${pkgver}-${pkgrel}-${CARCH}" -# paths: -# - "Foxgirl-${pkgver}-${pkgrel}.${CARCH}.tar.bz2" +tarball_x86_64: + image: ghcr.io/void-linux/void-linux:latest-thin-bb-x86_64 + stage: build + script: + - xbps-install -Sy bash + - bash ./build_tarball.sh "${CI_PROJECT_DIR}/Foxgirl-${pkgver}-${pkgrel}.${CARCH}.tar.bz2" + artifacts: + name: "Foxgirl-${pkgver}-${pkgrel}-${CARCH}" + paths: + - "Foxgirl-${pkgver}-${pkgrel}.${CARCH}.tar.bz2" tarball_x86_64_musl: image: ghcr.io/void-linux/void-linux:latest-thin-bb-x86_64-musl diff --git a/scripts/3_Configure_Source_Code.sh b/scripts/3_Configure_Source_Code.sh index adb02dc..8af7ae6 100755 --- a/scripts/3_Configure_Source_Code.sh +++ b/scripts/3_Configure_Source_Code.sh @@ -7,7 +7,7 @@ set -e srcdir=$1; CI_PROJECT_DIR=${CI_PROJECT_DIR:-$(realpath $(dirname $0)/../)} #_COMMON_REPO='https://gitlab.com/librewolf-community/browser/common.git'; -_COMMON_REPO='https://git.sakamoto.pl/domi/librewolf-common.git'; +_COMMON_REPO='https://git.sakamoto.pl/domi/foxgirl-common.git'; _PKGVER_TAG="v${pkgver}-${pkgrel}" _COMMON_TAG=${COMMON_TAG:-${_PKGVER_TAG}} _COMMON_DIR="${CI_PROJECT_DIR}"/common @@ -206,7 +206,7 @@ patch -Np1 -i "${_PATCHES_DIR}/bookmarksbar.patch" patch -Np1 -i "${_PATCHES_DIR}/smile.patch" patch -Np1 -i "${_PATCHES_DIR}/strings.patch" patch -Np1 -i "${_PATCHES_DIR}/view-page-info.patch" -patch -Np1 -i "${_PATCHES_DIR}/useragent-override.patch" +#patch -Np1 -i "${_PATCHES_DIR}/useragent-override.patch" echo '[]' > browser/components/newtab/data/content/tippytop/top_sites.json echo '[]' > browser/components/urlbar/content/preloaded-top-urls.json