From 33724d40a81f174303f3881a4d185270c441ac6a Mon Sep 17 00:00:00 2001 From: Emilien Devos Date: Tue, 24 Aug 2021 23:15:41 +0200 Subject: [PATCH] moved APKBUILD files to iv-org/lsquic.cr/docker and remove docker cache --- .github/workflows/container-release.yml | 21 +---------- docker/APKBUILD-boringssl | 46 ------------------------- docker/APKBUILD-lsquic | 43 ----------------------- 3 files changed, 1 insertion(+), 109 deletions(-) delete mode 100644 docker/APKBUILD-boringssl delete mode 100644 docker/APKBUILD-lsquic diff --git a/.github/workflows/container-release.yml b/.github/workflows/container-release.yml index 756374da..9cc39783 100644 --- a/.github/workflows/container-release.yml +++ b/.github/workflows/container-release.yml @@ -30,15 +30,6 @@ jobs: username: ${{ secrets.QUAY_USERNAME }} password: ${{ secrets.QUAY_PASSWORD }} - - name: Cache Docker layers - if: github.ref == 'refs/heads/master' - uses: actions/cache@v2 - with: - path: /tmp/.buildx-cache - key: ${{ runner.os }}-multi-buildx-${{ github.sha }} - restore-keys: | - ${{ runner.os }}-multi-buildx - - name: Build and push Docker AMD64 image for Push Event if: github.ref == 'refs/heads/master' uses: docker/build-push-action@v2 @@ -49,8 +40,6 @@ jobs: labels: quay.expires-after=12w push: true tags: quay.io/invidious/invidious:${{ github.sha }},quay.io/invidious/invidious:latest - cache-from: type=local,src=/tmp/.buildx-cache - cache-to: type=local,mode=max,dest=/tmp/.buildx-cache-new - name: Build and push Docker ARM64 image for Push Event if: github.ref == 'refs/heads/master' @@ -61,12 +50,4 @@ jobs: platforms: linux/arm64/v8 labels: quay.expires-after=12w push: true - tags: quay.io/invidious/invidious:${{ github.sha }}-arm64,quay.io/invidious/invidious:latest-arm64 - cache-from: type=local,src=/tmp/.buildx-cache - cache-to: type=local,mode=max,dest=/tmp/.buildx-cache-new - - - name: Override old Docker cache - if: github.ref == 'refs/heads/master' - run: | - rm -rf /tmp/.buildx-cache - mv /tmp/.buildx-cache-new /tmp/.buildx-cache + tags: quay.io/invidious/invidious:${{ github.sha }}-arm64,quay.io/invidious/invidious:latest-arm64 \ No newline at end of file diff --git a/docker/APKBUILD-boringssl b/docker/APKBUILD-boringssl deleted file mode 100644 index 61caa4f1..00000000 --- a/docker/APKBUILD-boringssl +++ /dev/null @@ -1,46 +0,0 @@ -# Based on https://aur.archlinux.org/packages/boringssl-git/ -# Maintainer: Omar Roth -pkgname=boringssl -pkgver=1.1.0 -pkgrel=0 -pkgdesc="BoringSSL is a fork of OpenSSL that is designed to meet Google's needs" -url="https://boringssl.googlesource.com/boringssl" -arch="all" -license="MIT" -replaces="openssl libressl" -depends="!openssl-libs-static" -makedepends_host="linux-headers" -makedepends="cmake git go perl" -subpackages="$pkgname-static $pkgname-dev $pkgname-doc" -source="251b516.tar.gz::https://github.com/google/boringssl/tarball/251b516" -builddir="$srcdir/google-boringssl-251b516" - -prepare() { - : -} - -build() { - cmake -DCMAKE_BUILD_TYPE=Release . - make ssl crypto -} - -check() { - make all_tests -} - -package() { - for i in *.md ; do - install -Dm644 $i "$pkgdir/usr/share/doc/$pkgname/$i" - done - install -d "$pkgdir/usr/lib" - install -d "$pkgdir/usr/include" - cp -R include/openssl "$pkgdir/usr/include" - - install -Dm755 crypto/libcrypto.a "$pkgdir/usr/lib/libcrypto.a" - install -Dm755 ssl/libssl.a "$pkgdir/usr/lib/libssl.a" -# install -Dm755 decrepit/libdecrepit.a "$pkgdir/usr/lib/libdecrepit.a" -# install -Dm755 libboringssl_gtest.a "$pkgdir/usr/lib/libboringssl_gtest.a" -} -sha512sums=" -b1d42ed188cf0cce89d40061fa05de85b387ee4244f1236ea488a431536a2c6b657b4f03daed0ac9328c7f5c4c9330499283b8a67f1444dcf9ba5e97e1199c4e 251b516.tar.gz -" diff --git a/docker/APKBUILD-lsquic b/docker/APKBUILD-lsquic deleted file mode 100644 index 51630a0e..00000000 --- a/docker/APKBUILD-lsquic +++ /dev/null @@ -1,43 +0,0 @@ -# Maintainer: Omar Roth -pkgname=lsquic -pkgver=2.18.1 -pkgrel=0 -pkgdesc="LiteSpeed QUIC and HTTP/3 Library" -url="https://github.com/litespeedtech/lsquic" -arch="all" -license="MIT" -depends="boringssl-dev boringssl-static zlib-static libevent-static" -makedepends="cmake git go perl bsd-compat-headers linux-headers" -subpackages="$pkgname-static" -source="v$pkgver.tar.gz::https://github.com/litespeedtech/lsquic/tarball/v2.18.1 -ls-qpack-$pkgver.tar.gz::https://github.com/litespeedtech/ls-qpack/tarball/a8ae6ef -ls-hpack-$pkgver.tar.gz::https://github.com/litespeedtech/ls-hpack/tarball/bd5d589" -builddir="$srcdir/litespeedtech-$pkgname-692a910" - -prepare() { - cp -r -T "$srcdir/litespeedtech-ls-qpack-a8ae6ef" "$builddir/src/liblsquic/ls-qpack" - cp -r -T "$srcdir/litespeedtech-ls-hpack-bd5d589" "$builddir/src/lshpack" -} - -build() { - cmake \ - -DCMAKE_BUILD_TYPE=None \ - -DBORINGSSL_INCLUDE=/usr/include/openssl \ - -DBORINGSSL_LIB_crypto=/usr/lib \ - -DBORINGSSL_LIB_ssl=/usr/lib . - make lsquic -} - -check() { - make tests -} - -package() { - install -d "$pkgdir/usr/lib" - install -Dm755 src/liblsquic/liblsquic.a "$pkgdir/usr/lib/liblsquic.a" -} -sha512sums=" -d015a72f1e88750ecb364768a40f532678f11ded09c6447a2e698b20f43fa499ef143a53f4c92a5938dfece0e39e687dc9df4aea97c618faee0c63da771561c3 v2.18.1.tar.gz -c5629085a3881815fb0b72a321eeba8de093eff9417b8ac7bde1ee1264971be0dca6d61d74799b02ae03a4c629b2a9cf21387deeb814935339a8a2503ea33fee ls-qpack-2.18.1.tar.gz -1b9f7ce4c82dadfca8154229a415b0335a61761eba698f814d4b94195c708003deb5cb89318a1ab78ac8fa88b141bc9df283fb1c6e40b3ba399660feaae353a0 ls-hpack-2.18.1.tar.gz -"