Merge branch 'master' into feature/copy_screenshot_to_xochitl

.github/actions/sync-repository/action.yml

@@ -22,7 +22,7 @@ runs:
         sudo apt-get update -yq
         echo "syncAptVersion=sshfs-$(apt-cache policy sshfs | grep -oP '(?<=Candidate:\s)(.+)')" >> $GITHUB_ENV
     - name: Cache Apt packages
-      uses: actions/cache@v3
+      uses: actions/cache@v4
       id: cache-apt
       with:
         path: ~/.aptcache

.github/actions/web/action.yaml

@@ -4,11 +4,11 @@ runs:
   using: composite
   steps:
     - name: Setup Python
-      uses: actions/setup-python@v3
+      uses: actions/setup-python@v5
       with:
         python-version: '3.8'
     - name: Cache Python environment
-      uses: actions/cache@v3
+      uses: actions/cache@v4
       id: cache-python
       with:
         path: web/.venv

.github/workflows/build.yml

@@ -5,6 +5,7 @@ on:
     branches:
       - master
     paths:
+      - '.github/workflows/build.yml'
       - 'applications/**'
       - 'shared/**'
       - 'assets/**'
@@ -15,6 +16,7 @@ on:
       - 'package'
   pull_request:
     paths:
+      - '.github/workflows/build.yml'
       - 'applications/**'
       - 'shared/**'
       - 'assets/**'
@@ -24,22 +26,123 @@ on:
       - 'Makefile'
       - 'package'
 jobs:
+  lint:
+    name: Lint source
+    runs-on: ubuntu-latest
+    steps:
+      - name: Cache shfmt
+        uses: actions/cache@v4
+        with:
+          path: /usr/local/bin/shfmt
+          key: 43439b996942b53dfafa9b6ff084f394555d049c98fb7ec37978f7668b43e1be
+      - name: Install shfmt
+        shell: bash
+        run: |
+          install_dir=/usr/local/bin
+          if ! [[ -f "$install_dir"/shfmt ]]; then
+              shfmt_version=v3.2.1
+              shfmt_checksum=43439b996942b53dfafa9b6ff084f394555d049c98fb7ec37978f7668b43e1be
+              sudo curl --location --silent --fail --tlsv1.2 --proto '=https' \
+                  --output "$install_dir"/shfmt \
+                  https://github.com/mvdan/sh/releases/download/"$shfmt_version"/shfmt_"$shfmt_version"_linux_amd64
+              sha256sum -c <(echo "$shfmt_checksum $install_dir/shfmt") > /dev/null 2>&1
+              sudo chmod a+x "$install_dir"/shfmt
+          fi
+      - uses: actions/checkout@v4
+      - name: Lint
+        run: make lint
   build:
     name: Build and package
     runs-on: ubuntu-latest
     steps:
-      - uses: actions/checkout@v3
+      - uses: actions/checkout@v4
       - name: Setup Python
-        uses: actions/setup-python@v4
+        uses: actions/setup-python@v5
         with:
-          python-version: 3.9
+          python-version: '3.11'
       - name: Install toltecmk
-        run: pip install toltecmk
+        run: pip install toltecmk requests==2.26.0
       - name: Build packages
         run: make package
         timeout-minutes: 15
       - name: Save packages
-        uses: actions/upload-artifact@v3
+        uses: actions/upload-artifact@v4
         with:
           name: packages
           path: release
+      - name: Save packages
+        uses: actions/upload-artifact@v4
+        with:
+          name: build
+          path: .build/package/build/rmall/src/release
+      - name: Save repo
+        uses: actions/upload-artifact@v4
+        with:
+          name: repo
+          path: .build/package/dist/rmall
+  test:
+    name: Test packages
+    runs-on: ubuntu-latest
+    needs: [build]
+    steps:
+      - uses: actions/download-artifact@v4
+        id: download
+        with:
+          name: repo
+      - uses: Eeems-Org/run-in-remarkable-action@v1
+        with:
+          setup: |
+            set -ex
+            wget https://github.com/Eeems-Org/sysfs_preload/releases/download/1.0.0/packages.zip -O /tmp/packages.zip
+            unzip /tmp/packages.zip -d /tmp
+            opkg install /tmp/rmall/sysfs_preload_1.0.0-1_rmall.ipk
+            wget https://github.com/timower/rM2-stuff/releases/download/v0.1.2/rm2display.ipk -O /tmp/rm2display.ipk
+            opkg install /tmp/rm2display.ipk
+            echo "src/gz local-rmall file:///opt/tmp/src" > /opt/etc/opkg.conf.d/16-local.conf
+          run: |
+            set -ex
+            echo Y | toltecctl generate-opkg-conf
+            opkg update
+            opkg install oxide
+            # systemctl disable --now xochitl
+            # systemctl enable --now tarnish
+            # TODO install and run tests
+            opkg remove --force-removal-of-dependent-packages liboxide
+          path: ${{ steps.download.outputs.download-path }}
+  release:
+    needs: [build,test,lint]
+    if: ${{ github.ref == 'refs/heads/master' }}
+    runs-on: ubuntu-latest
+    steps:
+      - uses: actions/checkout@v4
+        with:
+          fetch-depth: 0
+      - uses: actions/download-artifact@v4
+        with:
+          name: build
+          path: .build
+      - name: Create Sentry release
+        uses: getsentry/action-release@v1
+        env:
+          SENTRY_AUTH_TOKEN: ${{ secrets.SENTRY_AUTH_TOKEN }}
+          SENTRY_ORG: ${{ secrets.SENTRY_ORG }}
+          SENTRY_PROJECT: ${{ secrets.SENTRY_PROJECT }}
+          SENTRY_URL: https://sentry.eeems.codes
+      - name: Setup Sentry CLI
+        uses: mathieu-bour/setup-sentry-cli@v2
+        with:
+          version: latest
+          url: https://sentry.eeems.codes
+          token:  ${{ secrets.SENTRY_AUTH_TOKEN }}
+          organization: ${{ secrets.SENTRY_ORG }}
+          project: ${{ secrets.SENTRY_PROJECT }}
+      - name: Upload debug artifacts (debug)
+        if: ${{ !runner.debug }}
+        run: sentry-cli debug-files upload --include-sources .
+        env:
+          SENTRY_LOG_LEVEL: info
+      - name: Upload debug artifacts
+        if: ${{ runner.debug }}
+        run: sentry-cli debug-files upload --include-sources .
+        env:
+          SENTRY_LOG_LEVEL: debug

.github/workflows/publish.yml

@@ -6,24 +6,36 @@ on:
     paths:
       - 'web/**'
       - 'shared/liboxide/**'
+      - '.github/workflows/publish.yml'
       - '.github/actions/web/**'
       - '.github/actions/sync-repository/**'
   workflow_dispatch:
 jobs:
-  publish:
+  build:
     name: Build and publish the website
     runs-on: ubuntu-20.04
     steps:
       - name: Checkout the Git repository
-        uses: actions/checkout@v3
+        uses: actions/checkout@v4
         with:
           submodules: true
       - name: Build web
         uses: ./.github/actions/web
-      - name: Sync website with the remote repository
-        uses: ./.github/actions/sync-repository
+      - name: Upload artifact
+        uses: actions/upload-pages-artifact@v3
         with:
-          local-path: web/dist/
-          ssh-key: ${{ secrets.SSH_PRIVATE_KEY }}
-          ssh-known-hosts: ${{ secrets.SSH_KNOWN_HOSTS }}
-          remote-path: ${{ secrets.REMOTE_SSH }}:/_web
+          path: 'web/dist/'
+  deploy:
+    needs: build
+    if: ${{ github.ref == 'refs/heads/master' }}
+    permissions:
+      pages: write
+      id-token: write
+    environment:
+      name: github-pages
+      url: ${{ steps.deployment.outputs.page_url }}
+    runs-on: ubuntu-latest
+    steps:
+      - name: Deploy to GitHub Pages
+        id: deployment
+        uses: actions/deploy-pages@v4

.github/workflows/web.yaml

@@ -22,13 +22,13 @@ jobs:
     runs-on: ubuntu-latest
     steps:
       - name: Checkout the Git repository
-        uses: actions/checkout@v3
+        uses: actions/checkout@v4
         with:
           submodules: true
       - name: Build web
         uses: ./.github/actions/web
       - name: Save web
-        uses: actions/upload-artifact@v3
+        uses: actions/upload-artifact@v4
         with:
           name: web
           path: web/dist

.gitignore

@@ -10,3 +10,4 @@ oxide.tar.gz
 build/
 dist/
 version.txt
+*.pro.user.*