udpate

gagistech · Mar 18, 2024 · d3b667a · d3b667a
1 parent b32a8e1
commit d3b667a
Show file tree

Hide file tree

Showing 2 changed files with 9 additions and 11 deletions.
diff --git a/.github/workflows/ci.yml b/.github/workflows/ci.yml
@@ -67,8 +67,9 @@ jobs:
       fail-fast: false
       matrix:
         include:
-          - {os: debian, codename: bullseye, image_owner: }
-          # - {os: debian, codename: bullseye, image_owner: arm32v7/, labels: [arm,docker]}
+          - {os: debian, codename: bookworm, image_owner: }
+          - {os: debian, codename: bookworm, image_owner: arm32v7/, labels: [arm,docker]}
+          - {os: debian, codename: bookworm, image_owner: arm64v8/, labels: [arm64,docker]}
     runs-on: ${{ (matrix.labels == '' && 'ubuntu-latest') || matrix.labels }}
     container: ${{ matrix.image_owner }}${{ matrix.os }}:${{ matrix.codename }}
     name: sanitizer - ${{ matrix.image_owner }}${{ matrix.os }}:${{ matrix.codename }}
@@ -105,22 +106,19 @@ jobs:
       fail-fast: false
       matrix:
         include:
-          # - {os: debian, codename: buster, image_owner: }
-          # - {os: debian, codename: buster, image_owner: i386/, labels: [i386,docker]}
-          # - {os: debian, codename: buster, image_owner: arm32v7/, labels: [arm,docker]}
           - {os: debian, codename: bullseye, image_owner: }
           # - {os: debian, codename: bullseye, image_owner: i386/, labels: [i386,docker]}
           - {os: debian, codename: bullseye, image_owner: arm32v7/, labels: [arm,docker]}
           - {os: debian, codename: bullseye, image_owner: arm64v8/, labels: [arm64,docker]}
-          # - {os: debian, codename: bookworm, image_owner: }
+          - {os: debian, codename: bookworm, image_owner: }
           # - {os: debian, codename: bookworm, image_owner: i386/, labels: [i386,docker]}
-          # - {os: debian, codename: bookworm, image_owner: arm32v7/, labels: [arm,docker]}
-          # - {os: debian, codename: bookworm, image_owner: arm64v8/, labels: [arm64,docker]}
+          - {os: debian, codename: bookworm, image_owner: arm32v7/, labels: [arm,docker]}
+          - {os: debian, codename: bookworm, image_owner: arm64v8/, labels: [arm64,docker]}
           # - {os: ubuntu, codename: focal, image_owner: }
           - {os: ubuntu, codename: jammy, image_owner: }
           # - {os: raspbian, codename: buster, image_owner: igagis/, labels: [arm,docker]}
           - {os: raspbian, codename: bullseye, image_owner: igagis/, labels: [arm,docker]}
-          # - {os: raspbian, codename: bookworm, image_owner: igagis/, labels: [arm,docker]}
+          - {os: raspbian, codename: bookworm, image_owner: igagis/, labels: [arm,docker]}
     runs-on: ${{ (matrix.labels == '' && 'ubuntu-latest') || matrix.labels }}
     container: ${{ matrix.image_owner }}${{ matrix.os }}:${{ matrix.codename }}
     name: linux - ${{ matrix.image_owner }}${{ matrix.os }}:${{ matrix.codename }}
@@ -165,5 +163,5 @@ jobs:
       - 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/')
diff --git a/src/main.cpp b/src/main.cpp
@@ -90,7 +90,7 @@ class application : public ruisapp::application
 	}
 };
 
-const ruisapp::application_factory app_fac([](auto args) {
+const ruisapp::application_factory app_fac([](auto executbale, auto args) {
 	bool window = false;
 
 	// TODO: look in /usr/local/share/bedsidemon first?