Skip to content
New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Fix current CI #408

Merged
merged 7 commits into from
Jun 29, 2024
Merged

Fix current CI #408

Show file tree
Hide file tree
Changes from 5 commits
Commits
Show all changes
7 commits
Select commit Hold shift + click to select a range
a470ec3
ci: drop debian buster
gnattu Jun 28, 2024
5bdce2f
ci: use kernel.org gnu mirro
gnattu Jun 28, 2024
f09a0a3
ci: pin harfbuzz commit for windows image build
gnattu Jun 28, 2024
d4e81d3
ci: pull full repo for harfbuzz
gnattu Jun 28, 2024
1cc3264
ci: use google & github mirror for libiconv
gnattu Jun 28, 2024
efc31ad
Apply suggestions from code review
gnattu Jun 29, 2024
cafffc2
ci: remove debian buster
gnattu Jun 29, 2024
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
2 changes: 1 addition & 1 deletion .github/workflows/build.yaml
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -22,7 +22,7 @@ jobs:
uses: ./.github/workflows/_meta.yaml
with:
distro: 'debian'
codenames: '["buster", "bullseye", "bookworm"]'
gnattu marked this conversation as resolved.
Show resolved Hide resolved
codenames: '["bullseye", "bookworm"]'
architectures: '["amd64", "arm64", "armhf"]'
release: false

Expand Down
3 changes: 1 addition & 2 deletions .github/workflows/publish.yaml
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -10,7 +10,7 @@ jobs:
uses: ./.github/workflows/_meta.yaml
with:
distro: 'debian'
codenames: '["buster", "bullseye", "bookworm"]'
codenames: '["bullseye", "bookworm"]'
architectures: '["amd64", "arm64", "armhf"]'
release: true
secrets:
Expand Down Expand Up @@ -72,7 +72,6 @@ jobs:
max-parallel: 1
matrix:
arrays: [
{distro: 'debian', codename: 'buster'},
{distro: 'debian', codename: 'bullseye'},
{distro: 'debian', codename: 'bookworm'},
{distro: 'ubuntu', codename: 'focal'},
Expand Down
2 changes: 1 addition & 1 deletion builder/images/macos/01-gettext.sh
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -1,6 +1,6 @@
#!/bin/bash
ffbuild_macbase() {
wget https://ftpmirror.gnu.org/gettext/gettext-0.22.5.tar.gz -O gettext.tar.gz
wget https://mirrors.kernel.org/gnu/gettext/gettext-0.22.5.tar.gz -O gettext.tar.gz
tar xvf gettext.tar.gz
cd gettext-0.22.5
./configure --disable-silent-rules --disable-shared --enable-static --with-included-glib --with-included-libcroco --with-included-libunistring --with-included-libxml --with-emacs --with-lispdir="$FFBUILD_PREFIX"/share --disable-java --disable-csharp --without-git --without-cvs --without-xz --with-included-gettext --prefix="$FFBUILD_PREFIX"
Expand Down
4 changes: 2 additions & 2 deletions builder/scripts.d/20-libiconv.sh
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -1,6 +1,6 @@
#!/bin/bash

SCRIPT_REPO="https://git.savannah.gnu.org/git/libiconv.git"
SCRIPT_REPO="https://skia.googlesource.com/third_party/libiconv"
SCRIPT_COMMIT="v1.17"
SCRIPT_TAGFILTER="v?.*"

Expand All @@ -17,7 +17,7 @@ ffbuild_dockerbuild() {

cat <<EOF > ./.gitmodules
[subcheckout "gnulib"]
url = https://git.savannah.gnu.org/git/gnulib.git
url = https://github.com/coreutils/gnulib.git
path = gnulib
EOF

Expand Down
2 changes: 1 addition & 1 deletion builder/scripts.d/25-gmp.sh
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -2,7 +2,7 @@

SCRIPT_VERSION="6.3.0"
SCRIPT_SHA512="e85a0dab5195889948a3462189f0e0598d331d3457612e2d3350799dba2e244316d256f8161df5219538eb003e4b5343f989aaa00f96321559063ed8c8f29fd2"
SCRIPT_URL="https://ftp.gnu.org/gnu/gmp/gmp-${SCRIPT_VERSION}.tar.xz"
SCRIPT_URL="https://mirrors.kernel.org/gnu/gmp/gmp-${SCRIPT_VERSION}.tar.xz"

ffbuild_enabled() {
return 0
Expand Down
7 changes: 4 additions & 3 deletions docker-build-win64.sh
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -31,7 +31,7 @@ popd
mkdir iconv
pushd iconv
iconv_ver="1.17"
iconv_link="https://ftp.gnu.org/pub/gnu/libiconv/libiconv-${iconv_ver}.tar.gz"
iconv_link="https://mirrors.kernel.org/gnu/libiconv/libiconv-${iconv_ver}.tar.gz"
wget ${iconv_link} -O iconv.tar.gz
tar xaf iconv.tar.gz
pushd libiconv-${iconv_ver}
Expand Down Expand Up @@ -104,7 +104,7 @@ popd
mkdir gmp
pushd gmp
gmp_ver="6.3.0"
gmp_link="https://ftp.gnu.org/gnu/gmp/gmp-${gmp_ver}.tar.xz"
gmp_link="https://mirrors.kernel.org/gnu/gmp/gmp-${gmp_ver}.tar.xz"
wget ${gmp_link} -O gmp.tar.gz
tar xaf gmp.tar.gz
pushd gmp-${gmp_ver}
Expand Down Expand Up @@ -195,8 +195,9 @@ popd
popd

# HARFBUZZ
git clone --depth=1 https://github.com/harfbuzz/harfbuzz.git
git clone https://github.com/harfbuzz/harfbuzz.git
gnattu marked this conversation as resolved.
Show resolved Hide resolved
pushd harfbuzz
git checkout bc90b29b37fe3809f9e48aa7be08fbf2208e481a
gnattu marked this conversation as resolved.
Show resolved Hide resolved
./autogen.sh \
--prefix=${FF_DEPS_PREFIX} \
--host=${FF_TOOLCHAIN} \
Expand Down
2 changes: 1 addition & 1 deletion docker-build.sh
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -37,7 +37,7 @@ prepare_extra_common() {
mkdir iconv
pushd iconv
iconv_ver="1.17"
iconv_link="https://ftp.gnu.org/pub/gnu/libiconv/libiconv-${iconv_ver}.tar.gz"
iconv_link="https://mirrors.kernel.org/gnu/libiconv/libiconv-${iconv_ver}.tar.gz"
wget ${iconv_link} -O iconv.tar.gz
tar xaf iconv.tar.gz
pushd libiconv-${iconv_ver}
Expand Down
Loading