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@v2
+      uses: actions/cache@v3
       id: cache-apt
       with:
         path: ~/.aptcache

.github/actions/web/action.yaml

@@ -4,38 +4,26 @@ runs:
   using: composite
   steps:
     - name: Setup Python
-      uses: actions/setup-python@v2
+      uses: actions/setup-python@v3
       with:
         python-version: '3.8'
     - name: Cache Python environment
-      uses: actions/cache@v2
+      uses: actions/cache@v3
       id: cache-python
       with:
         path: web/.venv
         key: web/.venv-${{ hashFiles('web/requirements.txt') }}
-    - name: Check for Apt updates
-      shell: bash
-      run: |
-        sudo apt-get update -yq
-        echo "webAptVersion=doxygen-$(apt-cache policy doxygen | grep -oP '(?<=Candidate:\s)(.+)')-graphviz-$(apt-cache policy graphviz | grep -oP '(?<=Candidate:\s)(.+)')-libgraphviz-dev-$(apt-cache policy libgraphviz-dev | grep -oP '(?<=Candidate:\s)(.+)')" >> $GITHUB_ENV
-    - name: Cache Apt packages
-      uses: actions/cache@v2
+    - name: Install base Apt packages
       id: cache-apt
+      uses: awalsh128/cache-apt-pkgs-action@latest
       with:
-        path: ~/.aptcache
-        key: ${{ env.webAptVersion }}
-    - name: Install or restore Apt packages
-      shell: bash
-      env:
-        CACHE_HIT: ${{ steps.cache-apt.outputs.cache-hit }}
-      run: |
-        if [[ "$CACHE_HIT" != 'true' ]]; then
-            sudo apt-get install -yq doxygen graphviz libgraphviz-dev
-            mkdir -p ~/.aptcache
-            sudo dpkg -L doxygen graphviz libgraphviz-dev | while IFS= read -r f; do if test -f $f; then echo $f; fi; done | xargs cp --parents --target-directory ~/.aptcache/
-        else
-            sudo cp --verbose --force --recursive ~/.aptcache/* /
-        fi
+        execute_install_scripts: true
+        packages: doxygen graphviz libgraphviz-dev librsvg2-bin pdf2svg
+        version: 1.0
+    - name: Apt-Cache-Action
+      uses: Eeems-Org/apt-cache-action@v1
+      with:
+        packages: texlive-base texlive-latex-extra
     - name: Build website
       shell: bash
       run: cd web && make prod

.github/workflows/build.yml

@@ -2,11 +2,15 @@ name: Build oxide
 
 on:
   push:
+    branches:
+      - master
     paths:
       - 'applications/**'
       - 'shared/**'
       - 'assets/**'
       - 'interfaces/**'
+      - 'qmake/**'
+      - 'oxide.pro'
       - 'Makefile'
       - 'package'
   pull_request:
@@ -15,48 +19,27 @@ on:
       - 'shared/**'
       - 'assets/**'
       - 'interfaces/**'
+      - 'qmake/**'
+      - 'oxide.pro'
       - 'Makefile'
       - 'package'
 jobs:
   build:
     name: Build and package
     runs-on: ubuntu-latest
     steps:
-      - name: Checkout toltec Git repository
-        uses: actions/checkout@v2
-        with:
-          repository: toltec-dev/toltec.git
-          ref: testing
-      - name: Cleanup
-        run: |
-          rm -rf package/oxide/*
-          mkdir package/oxide/src
-      - uses: actions/[email protected]
-        with:
-          path: package/oxide/src
+      - uses: actions/checkout@v3
       - name: Setup Python
-        uses: actions/setup-python@v2
+        uses: actions/setup-python@v4
         with:
-          python-version: '3.8'
-      - name: Setup Toltec dependencies
-        uses: ./.github/actions/setup
-      - name: Prepare build files
-        run: |
-          cd package/oxide/src
-          echo "r$(git rev-list --count HEAD).$(git rev-parse --short HEAD)" > ../version.txt
-          sed -i "s/~VERSION~/$(cat ../version.txt)/" ./package
-          mv ./package ..
-          tar --exclude='./.git' -czvf ../oxide.tar.gz .
+          python-version: 3.9
+      - name: Install toltecmk
+        run: pip install toltecmk
       - name: Build packages
-        run: |
-          make FLAGS=--verbose oxide
-          mkdir output
-          find . -name '*.ipk' | while read -r file; do
-            cp "$file" output/"$(basename $file)"
-          done
+        run: make package
         timeout-minutes: 15
       - name: Save packages
-        uses: actions/upload-artifact@v2
+        uses: actions/upload-artifact@v3
         with:
           name: packages
-          path: output
+          path: release

.github/workflows/nix.yml

@@ -0,0 +1,48 @@
+name: Build with Nix
+
+on:
+  push:
+    branches:
+      - master
+    paths:
+      - 'applications/**'
+      - 'shared/**'
+      - 'assets/**'
+      - 'interfaces/**'
+      - 'qmake/**'
+      - 'oxide.pro'
+      - 'Makefile'
+      - '*.nix'
+  pull_request:
+    paths:
+      - 'applications/**'
+      - 'shared/**'
+      - 'assets/**'
+      - 'interfaces/**'
+      - 'qmake/**'
+      - 'oxide.pro'
+      - 'Makefile'
+      - '*.nix'
+jobs:
+  nix-build:
+    runs-on: ubuntu-latest
+    steps:
+    - uses: actions/checkout@v3
+    - uses: cachix/install-nix-action@v18
+      with:
+        nix_path: nixpkgs=channel:nixos-unstable
+    - uses: cachix/cachix-action@v12
+      with:
+        name: nix-remarkable
+        authToken: '${{ secrets.CACHIX_AUTH_TOKEN }}'
+    - name: Build
+      run: nix-build --argstr system 'x86_64-linux'
+      timeout-minutes: 15
+    - run: |
+        mkdir output
+        cp -a result/. output/
+    - name: Save Artifact
+      uses: actions/upload-artifact@v3
+      with:
+        name: output
+        path: output

.github/workflows/publish.yml

@@ -15,7 +15,7 @@ jobs:
     runs-on: ubuntu-20.04
     steps:
       - name: Checkout the Git repository
-        uses: actions/checkout@v2
+        uses: actions/checkout@v3
         with:
           submodules: true
       - name: Build web

.github/workflows/web.yaml

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

.gitignore

@@ -6,3 +6,7 @@ release/
 applications/*/Makefile
 result
 *.orig
+oxide.tar.gz
+build/
+dist/
+version.txt