From 7fd0b305a5d0f373de8da688b296504c1b09af0b Mon Sep 17 00:00:00 2001 From: raoulh Date: Mon, 22 Jan 2024 11:15:48 +0100 Subject: [PATCH 1/3] Add xinput_calibrator pkg --- docker/Dockerfile | 6 ++++-- 1 file changed, 4 insertions(+), 2 deletions(-) diff --git a/docker/Dockerfile b/docker/Dockerfile index 295fa61..f45dd34 100644 --- 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 \ No newline at end of file +COPY xinitrc /root/.xinitrc From 0ddbd433f9ab519a105c4225fb8e4571b6d7ce76 Mon Sep 17 00:00:00 2001 From: Raoul Hecky Date: Mon, 22 Jan 2024 14:24:22 +0100 Subject: [PATCH 2/3] update to use to action-bump --- .github/workflows/build_docker_dev.yml | 4 ++-- .github/workflows/build_docker_release.yml | 4 ++-- 2 files changed, 4 insertions(+), 4 deletions(-) diff --git a/.github/workflows/build_docker_dev.yml b/.github/workflows/build_docker_dev.yml index 2900972..8472884 100644 --- 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.0 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 }' \ No newline at end of file + 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 index 3a06edf..dc11e71 100644 --- 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.0 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 }' - \ No newline at end of file + From 4655ec4effcb46afbde9b0594694a6e0596c5c81 Mon Sep 17 00:00:00 2001 From: Raoul Hecky Date: Mon, 22 Jan 2024 14:56:02 +0100 Subject: [PATCH 3/3] update to use to action-bump --- .github/workflows/build_docker_dev.yml | 2 +- .github/workflows/build_docker_release.yml | 2 +- 2 files changed, 2 insertions(+), 2 deletions(-) diff --git a/.github/workflows/build_docker_dev.yml b/.github/workflows/build_docker_dev.yml index 8472884..1151436 100644 --- 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.1.0 + uses: calaos/action-bump-version@1.1.1 with: version_fragment: 'prerelease' diff --git a/.github/workflows/build_docker_release.yml b/.github/workflows/build_docker_release.yml index dc11e71..a0bcb92 100644 --- 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.1.0 + uses: calaos/action-bump-version@1.1.1 with: version_fragment: ${{ github.event.inputs.vincrement }}