diff --git a/.github/workflows/continuous_integration.yml b/.github/workflows/continuous_integration.yml index d4e01fcf..3ab85068 100644 --- a/.github/workflows/continuous_integration.yml +++ b/.github/workflows/continuous_integration.yml @@ -83,7 +83,6 @@ jobs: GITHUB_TOKEN: ${{ secrets.GITHUB_TOKEN }} TX_TOKEN: ${{ secrets.TX_TOKEN }} GITHUB_REF: ${{ github.ref }} - if: ${{ github.event_name == 'release' }} steps: - name: Checkout uses: actions/checkout@v2 @@ -95,9 +94,11 @@ jobs: sudo pip install qgis-plugin-ci - name: Package libqfieldsync run: | + python3 -m pip install pip -U # https://github.com/pypa/setuptools/issues/3269 pip wheel $(grep -o -P '(https://.*.tar.gz)' requirements.txt) mv libqfieldsync-*.whl qfieldsync/libqfieldsync.whl - name: Release + if: ${{ github.event_name == 'release' }} run: | RELEASE_VERSION=${GITHUB_REF##*/} RELEASE_TAG=${GITHUB_REF##*/} @@ -109,6 +110,16 @@ jobs: --osgeo-password ${OSGEO_PASSWORD} \ --asset-path qfieldsync/libqfieldsync.whl + - name: Release + if: ${{ github.event_name == 'pull_request' }} + run: | + qgis-plugin-ci package dev \ + --asset-path qfieldsync/libqfieldsync.whl + + - uses: actions/upload-artifact@v3 + with: + name: qfieldsync-plugin + path: qfieldsync.dev.zip package: runs-on: ubuntu-22.04 env: diff --git a/requirements.txt b/requirements.txt index d2fdcdde..bbd89f4c 100644 --- a/requirements.txt +++ b/requirements.txt @@ -5,5 +5,4 @@ pytest future transifex-client -# TODO: point to a commit on master after merging https://github.com/opengisch/libqfieldsync/pull/49 -libqfieldsync @ https://github.com/opengisch/libqfieldsync/archive/master.tar.gz +libqfieldsync @ https://github.com/opengisch/libqfieldsync/archive/f3999a47f5c8394970f4fc95885a046a5b6d3a73.tar.gz