update deploy scripts

potassco · Apr 23, 2021 · 5ef0d84 · 5ef0d84
1 parent 352b42a
commit 5ef0d84
Show file tree

Hide file tree

Showing 6 changed files with 29 additions and 20 deletions.
diff --git 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/[email protected]/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
@@ -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 <<EOF
 clingcon (${VERSION}-${rep}$[BUILD+1]) ${rep}; urgency=medium
 

diff --git a/.github/workflows/conda-dev.yml b/.github/workflows/conda-dev.yml
@@ -6,7 +6,7 @@ on:
       wip:
         description: 'Publish work in progress package.'
         required: false
-        default: true
+        default: 'true'
 
 jobs:
   build:
@@ -54,15 +54,15 @@ jobs:
         conda list
 
     - name: publish conda package (wip)
-      if: ${{ github.event.inputs.wip }}
+      if: ${{ github.event.inputs.wip == 'true' }}
       shell: pwsh
       run: |
         python .github/conda.py
       env:
         ANACONDA_API_TOKEN: ${{ secrets.ANACONDA_TOKEN }}
 
     - name: publish conda package (release)
-      if: ${{ !github.event.inputs.wip }}
+      if: ${{ github.event.inputs.wip == 'false' }}
       shell: pwsh
       run: |
         python .github/conda.py --release

diff --git a/.github/workflows/pipsource.yml b/.github/workflows/pipsource.yml
@@ -6,7 +6,7 @@ on:
       wip:
         description: 'Publish work in progress package.'
         required: false
-        default: true
+        default: 'true'
 
 jobs:
   build_packages:
@@ -22,12 +22,12 @@ jobs:
         python3 -m pip install --user --upgrade scikit-build
 
     - name: Install prerequisites (wip)
-      if: ${{ github.event.inputs.wip }}
+      if: ${{ github.event.inputs.wip == 'true' }}
       run: |
         python3 -m pip install --user --extra-index-url https://test.pypi.org/simple/ clingo-cffi
 
     - name: Install prerequisites (release)
-      if: ${{ !github.event.inputs.wip }}
+      if: ${{ github.event.inputs.wip == 'false' }}
       run: |
         python3 -m pip install --user clingo
 
@@ -37,11 +37,11 @@ jobs:
         submodules: recursive
 
     - name: Build source package (wip)
-      if: ${{ github.event.inputs.wip }}
+      if: ${{ github.event.inputs.wip == 'true' }}
       run: python3 .github/pipsource.py
 
     - name: Publish package to TestPyPI (wip)
-      if: ${{ github.event.inputs.wip }}
+      if: ${{ github.event.inputs.wip == 'true' }}
       uses: pypa/gh-action-pypi-publish@master
       with:
         user: __token__
@@ -50,11 +50,11 @@ jobs:
         repository_url: https://test.pypi.org/legacy/
 
     - name: Build source package (release)
-      if: ${{ !github.event.inputs.wip }}
+      if: ${{ github.event.inputs.wip == 'false' }}
       run: python3 .github/pipsource.py --release
 
     - name: Publish package to TestPyPI (release)
-      if: ${{ !github.event.inputs.wip }}
+      if: ${{ github.event.inputs.wip == 'false'}}
       uses: pypa/gh-action-pypi-publish@master
       with:
         user: __token__

diff --git a/.github/workflows/pipwinmac-wip.yml b/.github/workflows/pipwinmac-wip.yml
@@ -6,12 +6,13 @@ on:
       wip:
         description: 'Publish work in progress package.'
         required: false
-        default: true
+        default: 'true'
 
 jobs:
   build:
     runs-on: ${{ matrix.os }}
     strategy:
+      fail-fast: false
       matrix:
         os:
           - macos-10.15
@@ -34,7 +35,7 @@ jobs:
         pip install --user cffi scikit-build cmake ninja twine
 
     - name: Compile and upload wheels (wip)
-      if: ${{ github.event.inputs.wip }}
+      if: ${{ github.event.inputs.wip == 'true' }}
       run: python .github/pipwinmac.py
       env:
         TWINE_NON_INTERACTIVE: True
@@ -43,7 +44,7 @@ jobs:
         TWINE_PASSWORD: ${{ secrets.PYPI_API_TOKEN }}
 
     - name: Compile and upload wheels (release)
-      if: ${{ !github.event.inputs.wip }}
+      if: ${{ github.event.inputs.wip == 'false' }}
       run: python .github/pipwinmac.py --release
       env:
         TWINE_NON_INTERACTIVE: True

diff --git a/.github/workflows/ppa-dev.yml b/.github/workflows/ppa-dev.yml
@@ -6,13 +6,14 @@ on:
       wip:
         description: 'Publish work in progress package.'
         required: false
-        default: true
+        default: 'true'
 
 jobs:
   build_packages:
     runs-on: ubuntu-latest
 
     strategy:
+      fail-fast: false
       matrix:
         distribution: [focal, bionic]
 
@@ -36,13 +37,13 @@ jobs:
         POTASSCO_PPA_GPGKEY: ${{ secrets.POTASSCO_PPA_GPGKEY }}
 
     - name: Build deb and source package (wip)
-      if: ${{ github.event.inputs.wip }}
+      if: ${{ github.event.inputs.wip == 'true' }}
       run: |
         cd .github/ppa-wip
         ./build.sh wip "$distribution" create sync changes build put
 
     - name: Build deb and source package (release)
-      if: ${{ !github.event.inputs.wip }}
+      if: ${{ github.event.inputs.wip == 'false' }}
       run: |
         cd .github/ppa-wip
         ./build.sh stable "$distribution" create sync changes build put