Update gitlab-ci.yml

maksimkurb · Nov 11, 2024 · 16c9fef · 16c9fef
1 parent 54e5080
commit 16c9fef
Showing 1 changed file with 6 additions and 3 deletions.
diff --git a/.github/workflows/build-ci.yml b/.github/workflows/build-ci.yml
@@ -33,8 +33,8 @@ jobs:
           GH_TOKEN: ${{ secrets.GITHUB_TOKEN }}
         shell: bash
         run: |
-          echo "version=$(cat Makefile | grep "PKG_VERSION :=" | sed 's/PKG_VERSION := //')" >> $GITHUB_OUTPUT
-          echo "release=$(cat Makefile | grep "PKG_RELEASE :=" | sed 's/PKG_RELEASE := //')" >> $GITHUB_OUTPUT
+          echo "version=$(cat Makefile | grep "PKG_VERSION:=" | sed 's/PKG_VERSION:=//')" >> $GITHUB_OUTPUT
+          echo "release=$(cat Makefile | grep "PKG_RELEASE:=" | sed 's/PKG_RELEASE:=//')" >> $GITHUB_OUTPUT
           if [[ "${{ github.event_name }}" != "pull_request" ]]; then
             echo "sha=$(echo ${GITHUB_SHA::7})" >> $GITHUB_OUTPUT
           else
@@ -139,14 +139,17 @@ jobs:
           rm -rf keenetic-pbr || true
           mkdir keenetic-pbr
           bash -c "cp -r ./output/* keenetic-pbr"
+          bash -c "cp -r ./output/*.ipk keenetic-pbr-$VERSION-$RELEASE-$SHA-${{ matrix.arch }}-entware.ipk"
           tar -czvf keenetic-pbr-$VERSION-$RELEASE-$SHA-${{ matrix.arch }}-entware.tar.gz keenetic-pbr
 
       - name: Upload packages
         if: steps.build.outcome == 'success'
         uses: actions/upload-artifact@v4
         with:
           name: keenetic-pbr-entware-${{ matrix.arch }}
-          path: ./**/keenetic-pbr*-entware.tar.gz
+          path: |
+            ./**/keenetic-pbr*-entware.tar.gz
+            ./**/keenetic-pbr*-entware.ipk
           if-no-files-found: error
 
   pre-release: