Merge branch 'main' into b/chkupdate

.github/workflows/update-comps.yml

@@ -0,0 +1,30 @@
+name: Push comps updates
+
+on:
+  push:
+    branches:
+      - main
+    paths:
+      - comps.xml
+  workflow_dispatch:
+
+jobs:
+  update-comps:
+    runs-on: ubuntu-latest
+    container:
+      image: fedora:37
+    steps:
+      - uses: actions/checkout@v3
+      - name: Install repositories
+        run: |
+          sudo dnf install -y dnf-plugins-core
+          sudo dnf config-manager --add-repo https://github.com/andaman-common-pkgs/subatomic-repos/raw/main/terra37.repo
+      - name: Install dependencies
+        run: |
+          sudo dnf install -y subatomic-cli
+      - name: Push to subatomic
+        run: |
+          subatomic-cli upload-comps \
+            --server https://subatomic.fyralabs.com \
+            --token ${{ secrets.SUBATOMIC_TOKEN }} \
+            terra37 comps.xml

.github/workflows/update.yml

@@ -4,7 +4,7 @@
 name: Automatically check for updates
 on:
   schedule:
-    - cron: "0 */2 * * *"
+    - cron: "*/30 * * * *"
   workflow_dispatch:
 
 jobs:
@@ -25,8 +25,6 @@ jobs:
 
       - name: Run Update (Python)
         run: bash ./update.sh
-<<<<<<< Updated upstream
-=======
         env:
           GITHUB_TOKEN: ${{ secrets.GITHUB_TOKEN }}
       
@@ -34,7 +32,6 @@ jobs:
         run: anda update
         env:
           GITHUB_TOKEN: ${{ secrets.GITHUB_TOKEN }}
->>>>>>> Stashed changes
 
       - name: Save
         run: |