diff --git a/.drone.jsonnet b/.drone.jsonnet index 0c41502a6..0d501a9cf 100644 --- a/.drone.jsonnet +++ b/.drone.jsonnet @@ -1,6 +1,6 @@ -local distro = "fedora-34"; -local distro_name = 'Fedora 34'; -local distro_docker = 'fedora:34'; +local distro = "opensuse-tumbleweed"; +local distro_name = 'OpenSUSE Tumbleweed'; +local distro_docker = 'opensuse/tumbleweed'; local submodules = { name: 'submodules', @@ -8,7 +8,7 @@ local submodules = { commands: ['git fetch --tags', 'git submodule update --init --recursive --depth=1'] }; -local dnf(arch) = 'dnf -y --setopt install_weak_deps=False --setopt cachedir=/cache/'+distro+'/'+arch+'/${DRONE_STAGE_MACHINE} '; +local zypper(arch) = 'zypper -n --cache-dir /cache/'+distro+'/'+arch+'/${DRONE_STAGE_MACHINE} '; local rpm_pipeline(image, buildarch='amd64', rpmarch='x86_64', jobs=6) = { kind: 'pipeline', @@ -26,12 +26,13 @@ local rpm_pipeline(image, buildarch='amd64', rpmarch='x86_64', jobs=6) = { }, commands: [ 'echo "Building on ${DRONE_STAGE_MACHINE}"', - dnf(rpmarch) + 'distro-sync', - dnf(rpmarch) + 'install rpm-build git-archive-all dnf-plugins-core ccache', - dnf(rpmarch) + 'config-manager --add-repo https://rpm.oxen.io/fedora/oxen.repo', + zypper(rpmarch) + 'up', + zypper(rpmarch) + 'install rpm-build python3-pip ccache git', + 'pip3 install git-archive-all', 'pkg_src_base="$(rpm -q --queryformat=\'%{NAME}-%{VERSION}\n\' --specfile SPECS/lokinet.spec | head -n 1)"', 'git-archive-all --prefix $pkg_src_base/ SOURCES/$pkg_src_base.src.tar.gz', - dnf(rpmarch) + 'builddep --spec SPECS/lokinet.spec', + zypper(rpmarch) + 'addrepo https://rpm.oxen.io/opensuse/oxen.repo', + zypper(rpmarch) + '-n install $(rpmspec --parse SPECS/lokinet.spec | grep BuildRequires | sed -e "s/^BuildRequires: *//")', 'if [ -n "$CCACHE_DIR" ]; then mkdir -pv ~/.cache; ln -sv "$CCACHE_DIR" ~/.cache/ccache; fi', 'rpmbuild --define "_topdir $(pwd)" -bb SPECS/lokinet.spec', './SPECS/ci-upload.sh ' + distro + ' ' + rpmarch, @@ -42,5 +43,5 @@ local rpm_pipeline(image, buildarch='amd64', rpmarch='x86_64', jobs=6) = { [ rpm_pipeline(distro_docker), - rpm_pipeline("arm64v8/" + distro_docker, buildarch='arm64', rpmarch="aarch64", jobs=4) + //rpm_pipeline("arm64v8/" + distro_docker, buildarch='arm64', rpmarch="aarch64", jobs=4) ] diff --git a/SPECS/lokinet.spec b/SPECS/lokinet.spec index c754d4f6f..407a26b74 100644 --- a/SPECS/lokinet.spec +++ b/SPECS/lokinet.spec @@ -20,7 +20,7 @@ BuildRequires: systemd-devel BuildRequires: systemd-rpm-macros BuildRequires: libcurl-devel BuildRequires: jemalloc-devel -BuildRequires: libsqlite3x-devel +BuildRequires: sqlite3-devel # Puts the rpm version instead of the git tag in the version string: Patch1: version-as-rpm-version.patch @@ -160,6 +160,7 @@ fi - 0.9.6 release. - bundle bootstrap.signed instead of downloading - drop default upstream dns patch (fixed in 0.9.6) +- Clone/update fedora/34 build for opensuse 15.3 * Thu Aug 12 2021 Jason Rhinelander - 0.9.5-6 - Change default dns port from 1053 to 953 so that it is still privileged.