From 5c6e2a0acdef0c8c4e216071370b969e1503c7c3 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?=C4=90o=C3=A0n=20Tr=E1=BA=A7n=20C=C3=B4ng=20Danh?= Date: Thu, 21 Oct 2021 08:31:05 +0700 Subject: [PATCH 1/3] changed_templates: use $GIT_CMD instead of git everywhere --- common/travis/changed_templates.sh | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/common/travis/changed_templates.sh b/common/travis/changed_templates.sh index 8c5d8a880a68..686436ce4327 100755 --- a/common/travis/changed_templates.sh +++ b/common/travis/changed_templates.sh @@ -8,13 +8,13 @@ elif command -v git >/dev/null 2>&1; then GIT_CMD=$(command -v git) fi -tip="$(git rev-list -1 --parents HEAD)" +tip="$($GIT_CMD rev-list -1 --parents HEAD)" case "$tip" in *" "*" "*) tip="${tip##* }" ;; *) tip="${tip%% *}" ;; esac -base="$(git merge-base FETCH_HEAD "$tip")" || { +base="$($GIT_CMD merge-base FETCH_HEAD "$tip")" || { echo "Your branches is based on too old copy." echo "Please rebase to newest copy." exit 1 From 4c66c43fb9f85cd3ed84d7e0cecd7326147a1193 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?=C4=90o=C3=A0n=20Tr=E1=BA=A7n=20C=C3=B4ng=20Danh?= Date: Thu, 21 Oct 2021 08:39:00 +0700 Subject: [PATCH 2/3] github/workflow: don't install git --- .github/workflows/build.yaml | 4 ---- 1 file changed, 4 deletions(-) diff --git a/.github/workflows/build.yaml b/.github/workflows/build.yaml index 08445b742177..8ecd4d0e658a 100644 --- a/.github/workflows/build.yaml +++ b/.github/workflows/build.yaml @@ -57,8 +57,6 @@ jobs: xbps-install -Syu || xbps-install -yu xbps # Upgrade again (in case there was a xbps update) xbps-install -yu - # Install git - xbps-install -y git - uses: actions/checkout@v1 with: @@ -71,8 +69,6 @@ jobs: common/travis/fetch_upstream.sh && common/travis/fetch-xtools.sh - run: common/travis/changed_templates.sh - - name: Remove git after checkout to not interfere with build - run: xbps-remove -yR git - name: Build and check packages run: | From 1fdba5baf8642c4b961cf10dbe41a5921b87a8b4 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?=C4=90o=C3=A0n=20Tr=E1=BA=A7n=20C=C3=B4ng=20Danh?= Date: Thu, 21 Oct 2021 08:40:06 +0700 Subject: [PATCH 3/3] python3-pypandoc: update to 1.6.4. --- srcpkgs/python3-pypandoc/template | 6 +++--- 1 file changed, 3 insertions(+), 3 deletions(-) diff --git a/srcpkgs/python3-pypandoc/template b/srcpkgs/python3-pypandoc/template index 1b172c843f91..f925ee43134b 100644 --- a/srcpkgs/python3-pypandoc/template +++ b/srcpkgs/python3-pypandoc/template @@ -1,7 +1,7 @@ # Template file for 'python3-pypandoc' pkgname=python3-pypandoc -version=1.6.3 -revision=2 +version=1.6.4 +revision=1 wrksrc=pypandoc-$version build_style=python3-module hostmakedepends="python3-setuptools" @@ -12,7 +12,7 @@ maintainer="Đoàn Trần Công Danh " license="MIT" homepage="https://github.com/bebraw/pypandoc" distfiles="$PYPI_SITE/p/pypandoc/pypandoc-$version.tar.gz" -checksum=95a331f5ef74adb9557e9961d784c30ba73bd0d62e7736bb5d9ce74888b9f438 +checksum=6ea03c8e92d561b0b47ff91ee9a777c50a8d3a325f3272ea4fefef4bb6562b91 post_install() { vlicense LICENSE