ci stuff

gagistech · Sep 25, 2024 · 34a2612 · 34a2612
1 parent c0e9307
commit 34a2612
Showing 1 changed file with 16 additions and 16 deletions.
diff --git a/.github/workflows/ci.yml b/.github/workflows/ci.yml
@@ -50,6 +50,8 @@ jobs:
         if: always() # even if previous steps fail, this one needs to be run
         with:
           token: ${{ secrets.CODECOV_TOKEN }}
+          # do not search for coverage files automatically, upload only specified files
+          disable_search: true
           files: cobertura.xml
           # flags: unittests # optional
           name: codecov-umbrella # optional
@@ -117,25 +119,23 @@ jobs:
     container: ${{ matrix.image_owner }}${{ matrix.os }}:${{ matrix.codename }}
     name: linux - ${{ matrix.image_owner }}${{ matrix.os }}:${{ matrix.codename }} - ${{ matrix.labels[0] }}
     steps:
+      - name: set TZ for ubuntu:focal
+        run: |
+          # configure timezone to avoid 'tzdata' package to require user interaction during installation (needed for ubuntu:focal)
+          TZ=Europe/Helsinki ln -snf /usr/share/zoneinfo/$TZ /etc/localtime && echo $TZ > /etc/timezone
       - name: add cppfw deb repo
         uses: myci-actions/add-deb-repo@master
         with:
           repo: deb https://gagis.hopto.org/repo/cppfw/${{ matrix.os }} ${{ matrix.codename }} main
           repo-name: cppfw
           keys-asc: https://gagis.hopto.org/repo/cppfw/pubkey.gpg
-          install: myci locales git
+          install: myci locales git devscripts equivs nodejs
       - name: add llvm repo (for clang-format)
         uses: myci-actions/add-deb-repo@master
         with:
           repo: deb https://apt.llvm.org/${{ matrix.codename }} llvm-toolchain-${{ matrix.codename }} main
           repo-name: llvm
           keys-asc: https://apt.llvm.org/llvm-snapshot.gpg.key
-      - name: install ci tools
-        run: |
-          # configure timezone to avoid 'tzdata' package to require user interaction during installation (needed for ubuntu:focal)
-          TZ=Europe/Helsinki ln -snf /usr/share/zoneinfo/$TZ /etc/localtime && echo $TZ > /etc/timezone
-          
-          apt --quiet install --assume-yes devscripts equivs
       - name: git clone
         uses: myci-actions/checkout@master
       - name: set PACKAGE_VERSION
@@ -146,16 +146,16 @@ jobs:
       - name: install deps
         run: myci-deb-install-build-deps.sh
       - name: build
-        run: dpkg-buildpackage --unsigned-source --unsigned-changes
-      # - name: upload binaries to artifacts
-      #   uses: actions/upload-artifact@v4
-      #   with:
-      #     name: binaries-${{ matrix.image_owner }}${{ matrix.os }}:${{ matrix.codename }}
-      #     path: |
-      #       src/out/rel/*.so.*
-      #       src/out/rel/*.a
+        run: |
+          dpkg-buildpackage --unsigned-source --unsigned-changes
+          mv ../*.*deb .
+      - name: upload deb packages to artifacts
+        uses: actions/upload-artifact@v4
+        with:
+          name: ${{ matrix.os }}_${{ matrix.codename }}_${{ matrix.labels[0] }}_debs
+          path: "*.*deb"
       - name: deploy deb packages
         run: |
           echo "${{ secrets.MYCI_REPO_SSH_KEY }}" > repo_key_rsa && chmod 600 repo_key_rsa
-          myci-deploy-apt-ssh.sh --key repo_key_rsa --server gagis.hopto.org --repo gagistech/${{ matrix.os }} --distro ${{ matrix.codename }} --component main ../*_${PACKAGE_VERSION}_*.*deb
+          myci-deploy-apt-ssh.sh --key repo_key_rsa --server gagis.hopto.org --repo gagistech/${{ matrix.os }} --distro ${{ matrix.codename }} --component main *_${PACKAGE_VERSION}_*.*deb
         if: startsWith(github.ref, 'refs/tags/')