add support for modsettings driver instead of intel

calaos · Jan 11, 2024 · f2e5be9 · f2e5be9
1 parent f00bc0e
commit f2e5be9
Show file tree

Hide file tree

Showing 3 changed files with 38 additions and 42 deletions.
diff --git a/.github/workflows/build_docker_dev.yml b/.github/workflows/build_docker_dev.yml
@@ -7,7 +7,6 @@ on:
 env:
   REGISTRY_IMAGE: ghcr.io/calaos/calaos_home
   NAME: calaos_home
-  CALAOS_REL_URL: https://releases.calaos.fr/v4/image-dev
   IMG_TAG: dev
 
 jobs:
@@ -22,16 +21,11 @@ jobs:
       - name: Checkout code
         uses: actions/checkout@v3
 
-      - name: Fetch latest release version
-        id: fetch-latest-release
-        uses: reloc8/[email protected]
-
-      - name: Increment dev release version
-        id: bump_version
-        uses: christian-draeger/[email protected]
+      - name: Calaos Action Bump Version
+        id: calaos_version
+        uses: calaos/[email protected]
         with:
-          current-version: ${{ steps.fetch-latest-release.outputs.latest-release }}
-          version-fragment: 'alpha'
+          version_fragment: 'prerelease'
 
       - name: Docker meta
         id: meta
@@ -58,22 +52,21 @@ jobs:
         with:
           context: "{{defaultContext}}:docker"
           push: true
-          build-args: APP_VERSION=${{ steps.bump_version.outputs.next-version }}
+          build-args: APP_VERSION=${{ steps.calaos_version.outputs.version_bumped }}
           tags: |
             ${{ env.REGISTRY_IMAGE }}:${{ env.IMG_TAG }}
-            ${{ env.REGISTRY_IMAGE }}:${{ steps.bump_version.outputs.next-version }}
+            ${{ env.REGISTRY_IMAGE }}:${{ steps.calaos_version.outputs.version_bumped }}
 
       - name: Create Tag
         uses: negz/create-tag@v1
         with:
-          version: ${{ steps.bump_version.outputs.next-version }}
+          version: ${{ steps.calaos_version.outputs.version_bumped }}
           token: ${{ secrets.ACTION_DISPATCH }}
 
-      - name: update calaos release
-        uses: fjogeleit/http-request-action@v1
+      - name: Build deb
+        uses: peter-evans/repository-dispatch@v1
         with:
-          url: '${{ env.CALAOS_REL_URL }}/${{ env.NAME }}'
-          method: 'POST'
-          customHeaders: '{"Content-Type": "application/json"}'
-          bearerToken: ${{ secrets.CALAOS_REL_TOKEN }}
-          data: '{"name": "${{ env.NAME }}", "source": "${{ env.REGISTRY_IMAGE }}:${{ steps.bump_version.outputs.next-version }}", "version": "${{ steps.bump_version.outputs.next-version }}"}'
+          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 }'
diff --git a/.github/workflows/build_docker_release.yml b/.github/workflows/build_docker_release.yml
@@ -10,13 +10,13 @@ on:
         type: choice
         options:
           - major
-          - feature
-          - bug
+          - minor
+          - patch
+          - prerelease
 
 env:
   REGISTRY_IMAGE: ghcr.io/calaos/calaos_home
   NAME: calaos_home
-  CALAOS_REL_URL: https://releases.calaos.fr/v4/image
   IMG_TAG: latest
 
 jobs:
@@ -31,16 +31,11 @@ jobs:
       - name: Checkout code
         uses: actions/checkout@v3
 
-      - name: Fetch latest release version
-        id: fetch-latest-release
-        uses: reloc8/[email protected]
-
-      - name: Increment dev release version
-        id: bump_version
-        uses: christian-draeger/[email protected]
+      - name: Calaos Action Bump Version
+        id: calaos_version
+        uses: calaos/[email protected]
         with:
-          current-version: ${{ steps.fetch-latest-release.outputs.latest-release }}
-          version-fragment: ${{ github.event.inputs.vincrement }}
+          version_fragment: ${{ github.event.inputs.vincrement }}
 
       - name: Docker meta
         id: meta
@@ -67,22 +62,22 @@ jobs:
         with:
           context: "{{defaultContext}}:docker"
           push: true
-          build-args: APP_VERSION=${{ steps.bump_version.outputs.next-version }}
+          build-args: APP_VERSION=${{ steps.calaos_version.outputs.version_bumped }}
           tags: |
             ${{ env.REGISTRY_IMAGE }}:${{ env.IMG_TAG }}
-            ${{ env.REGISTRY_IMAGE }}:${{ steps.bump_version.outputs.next-version }}
+            ${{ env.REGISTRY_IMAGE }}:${{ steps.calaos_version.outputs.version_bumped }}
 
       - name: Create Tag
         uses: negz/create-tag@v1
         with:
-          version: ${{ steps.bump_version.outputs.next-version }}
+          version: ${{ steps.calaos_version.outputs.version_bumped }}
           token: ${{ secrets.ACTION_DISPATCH }}
 
-      - name: update calaos release
-        uses: fjogeleit/http-request-action@v1
+      - name: Build deb
+        uses: peter-evans/repository-dispatch@v1
         with:
-          url: '${{ env.CALAOS_REL_URL }}/${{ env.NAME }}'
-          method: 'POST'
-          customHeaders: '{"Content-Type": "application/json"}'
-          bearerToken: ${{ secrets.CALAOS_REL_TOKEN }}
-          data: '{"name": "${{ env.NAME }}", "source": "${{ env.REGISTRY_IMAGE }}:${{ steps.bump_version.outputs.next-version }}", "version": "${{ steps.bump_version.outputs.next-version }}"}'
+          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": false }'
+
diff --git a/docker/start.sh b/docker/start.sh
@@ -7,6 +7,14 @@ cleanup() {
 }
 trap 'cleanup' TERM EXIT
 
+# check if arguments --modesetting is set
+if [ "$1" = "--modesetting" ]; then
+    echo "[*] Using modesetting driver"
+
+    #remove intel driver to enable modsetting
+    rm -f /usr/lib/xorg/modules/drivers/intel_drv.so
+fi
+
 /usr/bin/startx -- vt8 -keeptty -verbose 3 -logfile /dev/null &
 pid=$!