Fix Appimage release version conflict (#1745)

* Fix Appimage release version conflict * Don't cache appimage/out
CentOS-PaaS-SIG · Jun 24, 2020 · b71b456 · b71b456
1 parent 4ccef11
commit b71b456
Show file tree

Hide file tree

Showing 2 changed files with 9 additions and 5 deletions.
diff --git a/.github/workflows/packaging.yml b/.github/workflows/packaging.yml
@@ -103,8 +103,10 @@ jobs:
         id: cache
         uses: actions/cache@v1
         with:
-          path: appimage
-          key: ${{ hashFiles('appimage/Dockerfile') }}
+          path: |
+            appimage
+            !appimage/out
+          key: ${{ hashFiles('appimage/*') }}
       - name: Build Docker image
         if: steps.cache.outputs['cache-hit'] != 'true'
         run: |
@@ -121,6 +123,8 @@ jobs:
       - id: appimage
         run: |
           cd appimage
+          sed -i "s#LINCHPIN#git+https://github.com/${{ github['repository'] }}.git@${{ github['ref'] }}#g" appimage.yml
+          sed -i "s#LVER#${{ steps.version.outputs.version }}#g" appimage.yml
           ./pkg2appimage-with-docker appimage.yml 2>&1
       - uses: actions/upload-artifact@v1
         with:

diff --git a/appimage/appimage.yml b/appimage/appimage.yml
@@ -10,8 +10,8 @@ ingredients:
 script:
   - wget -nc -q -O linchpin.png https://linchpinjobs.com/img/linchpinjobs_logo.png
   - virtualenv usr -p $(which python3.7) --always-copy
-  - ./usr/bin/pip3 install linchpin gitdb2==3.0.1 gitdb==0.6.4
-  - ./usr/bin/pip3 install linchpin[libvirt]
+  - ./usr/bin/pip3 install LINCHPIN gitdb2==3.0.1 gitdb==0.6.4
+  - ./usr/bin/pip3 install "linchpin[libvirt] @ LINCHPIN"
   - rm -rf usr/lib/python3/dist-packages/
   - ln -s ../python3.7/site-packages/ usr/lib/python3/dist-packages
   - cat > usr/bin/linchpin-wrapper <<\EOF
@@ -31,4 +31,4 @@ script:
   - StartupWMClass=linchpin
   - MimeType=text/x-python3;text/x-python3;
   - EOF
-  - usr/bin/pip3 freeze | grep "linchpin" | cut -d "=" -f 3 >> ../VERSION
+  - echo LVER >> ../VERSION