From 5ef0d84b655558c8b4c19d824c12cf0d334808e4 Mon Sep 17 00:00:00 2001 From: Roland Kaminski Date: Fri, 23 Apr 2021 17:13:59 +0200 Subject: [PATCH] update deploy scripts --- .github/pipwinmac.py | 13 ++++++++++--- .github/ppa-wip/build.sh | 2 +- .github/workflows/conda-dev.yml | 6 +++--- .github/workflows/pipsource.yml | 14 +++++++------- .github/workflows/pipwinmac-wip.yml | 7 ++++--- .github/workflows/ppa-dev.yml | 7 ++++--- 6 files changed, 29 insertions(+), 20 deletions(-) diff --git a/.github/pipwinmac.py b/.github/pipwinmac.py index 3ee9f43..f2c6282 100644 --- a/.github/pipwinmac.py +++ b/.github/pipwinmac.py @@ -44,8 +44,15 @@ def adjust_version(url): version = m.group(1) assert version is not None - with urlopen('{}/{}'.format(url, package_name)) as uh: - pip = uh.read().decode() + try: + with urlopen('{}/{}'.format(url, package_name)) as uh: + pip = uh.read().decode() + except HTTPError as err: + if err.code == 404: + pip = '\n' + else: + raise + post = 0 for m in finditer(r'{}-{}\.post([0-9]+)\.tar\.gz'.format(package_regex, escape(version)), pip): post = max(post, int(m.group(1))) @@ -78,7 +85,7 @@ def run(): adjust_version(url) if os.name == 'posix': - environ['PATH'] = '/usr/local/opt/bison/bin' + pathsep + environ["PATH"] + environ['PATH'] = '/usr/local/opt/bison/bin' + pathsep + '/usr/local/opt/bison@2.7/bin' + pathsep + environ["PATH"] environ['MACOSX_DEPLOYMENT_TARGET'] = '10.9' args = ['pip', 'wheel', '-v', '--no-deps', '-w', 'dist'] if idx is not None: diff --git a/.github/ppa-wip/build.sh b/.github/ppa-wip/build.sh index d4f2502..59de37e 100755 --- a/.github/ppa-wip/build.sh +++ b/.github/ppa-wip/build.sh @@ -64,7 +64,7 @@ for act in "${@}"; do ;; changes) VERSION="$(sed -n '/#define CLINGCON_VERSION "/s/.*"\([0-9]\+\.[0-9\+]\.[0-9]\+\)".*/\1/p' ../../libclingcon/clingcon.h)" - BUILD=$(curl -sL http://ppa.launchpad.net/potassco/${ref}/ubuntu/pool/main/c/clingcon/ | sed -n "/${rep}[0-9]\+\.dsc/s/.*${rep}\([0-9]\+\).*/\1/p" | sort -rn | head -1) + BUILD=$(curl -sL http://ppa.launchpad.net/potassco/${ref}/ubuntu/pool/main/c/clingcon/ | sed -n "/${VERSION//./\\.}-${rep}[0-9]\+\.dsc/s/.*${rep}\([0-9]\+\).*/\1/p" | sort -rn | head -1) cat > ${rep}/debian/changelog <