Merge branch 'master' of github.com:calaos/calaos_mobile

calaos · Jan 22, 2024 · 46aa3e0 · 46aa3e0
2 parents 0dfe881 + 4655ec4
commit 46aa3e0
Show file tree

Hide file tree

Showing 3 changed files with 8 additions and 6 deletions.
diff --git a/.github/workflows/build_docker_dev.yml b/.github/workflows/build_docker_dev.yml
@@ -23,7 +23,7 @@ jobs:
 
       - name: Calaos Action Bump Version
         id: calaos_version
-        uses: calaos/action-bump-version@1.0.1
+        uses: calaos/action-bump-version@1.1.1
         with:
           version_fragment: 'prerelease'
 
@@ -69,4 +69,4 @@ jobs:
           token: ${{ secrets.ACTION_DISPATCH }}
           repository: calaos/pkgdebs
           event-type: build_deb
-          client-payload: '{ "pkgname": "calaos-home", "version": "${{ steps.calaos_version.outputs.version_bumped }}", "image_src": "${{ env.REGISTRY_IMAGE }}:${{ steps.calaos_version.outputs.version_bumped }}", "prerelease": true }'
+          client-payload: '{ "pkgname": "calaos-home", "version": "${{ steps.calaos_version.outputs.version_bumped }}", "image_src": "${{ env.REGISTRY_IMAGE }}:${{ steps.calaos_version.outputs.version_bumped }}", "prerelease": true }'
diff --git a/.github/workflows/build_docker_release.yml b/.github/workflows/build_docker_release.yml
@@ -33,7 +33,7 @@ jobs:
 
       - name: Calaos Action Bump Version
         id: calaos_version
-        uses: calaos/action-bump-version@1.0.1
+        uses: calaos/action-bump-version@1.1.1
         with:
           version_fragment: ${{ github.event.inputs.vincrement }}
 
@@ -80,4 +80,4 @@ jobs:
           repository: calaos/pkgdebs
           event-type: build_deb
           client-payload: '{ "pkgname": "calaos-home", "version": "${{ steps.calaos_version.outputs.version_bumped }}", "image_src": "${{ env.REGISTRY_IMAGE }}:${{ steps.calaos_version.outputs.version_bumped }}", "prerelease": false }'
-
+
diff --git a/docker/Dockerfile b/docker/Dockerfile
@@ -37,7 +37,8 @@ WORKDIR /src
 COPY build/* /usr/bin
 
 RUN get_pkgbuilds.sh && \
-    build_pkg.sh "calaos-home" "" "$ARCH" "$COMMIT" "$APP_VERSION"
+    build_pkg.sh "calaos-home" "" "$ARCH" "$COMMIT" "$APP_VERSION" && \
+    build_pkg.sh "xinput_calibrator" "" "$ARCH" "$COMMIT" "$APP_VERSION"
 
 RUN sudo pacman -S --noconfirm libxinerama readline bash perl libxtst libxft texinfo libxrandr gnupg
 
@@ -61,6 +62,7 @@ RUN pacman -Syu --noconfirm
 
 COPY --from=builder /src/pkgbuilds/calaos-home/*pkg.tar.zst* /
 COPY --from=builder /src/ratpoison/*pkg.tar.zst* /
+COPY --from=builder /src/pkgbuilds/xinput_calibrator/*pkg.tar.zst* /
 
 RUN pacman -U --noconfirm /*pkg.tar.zst*
 
@@ -77,4 +79,4 @@ RUN pacman -S --noconfirm \
 
 COPY start.sh /usr/bin
 COPY ratpoisonrc /root/.ratpoisonrc
-COPY xinitrc /root/.xinitrc
+COPY xinitrc /root/.xinitrc